[myserver-commit] [SCM] GNU MyServer branch, master, updated. b1b88f01adff53a3d7dd78d8ccc1cc6459410291

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  b1b88f01adff53a3d7dd78d8ccc1cc6459410291 (commit)
       via  8dd889cda728730411151df0297fe1611f603cbc (commit)
      from  2ada0449424827d1a1a445cd4578c0ae49a6a738 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit b1b88f01adff53a3d7dd78d8ccc1cc6459410291
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jul 19 20:41:33 2009 +0200

    Do not install static temporary libraries.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 3fdce61..f4603c6 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = languages logs system web certificates plugins
 EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
                                                 virtualhosts.default.xml
 
-configdir = $(root_prefix)/etc/myserver
+configdir = $(DESTDIR)/etc/myserver
 
 install: install-recursive
        $(install_sh_DATA) MIMEtypes.default.xml $(configdir)/MIMEtypes.xml
diff --git a/myserver/binaries/certificates/Makefile.am 
b/myserver/binaries/certificates/Makefile.am
index d98e7b2..69501f5 100644
--- a/myserver/binaries/certificates/Makefile.am
+++ b/myserver/binaries/certificates/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = how_create_certificates.txt
 install :
-       $(INSTALL) -d '$(root_prefix)/etc/myserver/certificates'
-       $(INSTALL) 'how_create_certificates.txt' 
'$(root_prefix)/etc/myserver/certificates/how_create_certificates.txt'
+       $(INSTALL) -d '$(DESTDIR)/etc/myserver/certificates'
+       $(INSTALL) 'how_create_certificates.txt' 
'$(DESTDIR)/etc/myserver/certificates/how_create_certificates.txt'
diff --git a/myserver/binaries/logs/Makefile.am 
b/myserver/binaries/logs/Makefile.am
index cb7874b..1bc56a5 100644
--- a/myserver/binaries/logs/Makefile.am
+++ b/myserver/binaries/logs/Makefile.am
@@ -1,3 +1,2 @@
 install :
-       $(INSTALL) -d $(root_prefix)/var/log/myserver
-
+       $(INSTALL) -d $(DESTDIR)/var/log/myserver
diff --git a/myserver/binaries/web/Makefile.am 
b/myserver/binaries/web/Makefile.am
index 900ccc5..b2e9ad6 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -1,9 +1,9 @@
 if BUILD_MSCGI
-CGI_SRC = cgi-src
+       CGI_SRC = cgi-src
 endif
 
 SUBDIRS = cgi-bin $(CGI_SRC) downloads
 
-myserverdatadir = $(root_prefix)/var/web
+myserverdatadir = $(DESTDIR)/var/web
 
 dist_myserverdata_DATA = logo.png goto.png default.html link.html
diff --git a/myserver/binaries/web/cgi-bin/Makefile.am 
b/myserver/binaries/web/cgi-bin/Makefile.am
index 559e6af..9eca560 100644
--- a/myserver/binaries/web/cgi-bin/Makefile.am
+++ b/myserver/binaries/web/cgi-bin/Makefile.am
@@ -1,4 +1,4 @@
-myserverdatadir = $(root_prefix)/var/web/cgi-bin
+myserverdatadir = $(DESTDIR)/var/web/cgi-bin
 
 dist_myserverdata_DATA = counter.html default.html counter.readme
 
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am 
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 5d42b8b..bc8f1a6 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -12,7 +12,7 @@ math_sum.mscgi : $(libmath_sum_a_OBJECTS) 
$(libmath_sum_a_DEPENDENCIES)
        $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : math_sum.mscgi
-       $(INSTALL) -D 'math_sum.mscgi' 
'$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'
+       $(INSTALL) -D 'math_sum.mscgi' 
'$(DESTDIR)/var/web/cgi-bin/math_sum.mscgi'
 
 
 clean :
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am 
b/myserver/binaries/web/cgi-src/post/Makefile.am
index 1561e25..301c2f8 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -13,7 +13,7 @@ post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
        $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi -shared 
$(CXXFLAGS) $(XML_CFLAGS)
 
 install : post.mscgi
-       $(INSTALL) -D 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'
+       $(INSTALL) -D 'post.mscgi' '$(DESTDIR)/var/web/cgi-bin/post.mscgi'
 
 clean :
        rm -f post.mscgi
diff --git a/myserver/binaries/web/downloads/Makefile.am 
b/myserver/binaries/web/downloads/Makefile.am
index 5ada5f4..f88e79d 100644
--- a/myserver/binaries/web/downloads/Makefile.am
+++ b/myserver/binaries/web/downloads/Makefile.am
@@ -1,5 +1,4 @@
-
-myserverdatadir = $(root_prefix)/var/web/downloads
+myserverdatadir = $(DESTDIR)/var/web/downloads
 
 dist_myserverdata_DATA = hello.php script.sh file1.txt file2.txt
 
diff --git a/myserver/configure.in b/myserver/configure.in
index 0ae2208..001a09a 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -60,18 +60,7 @@ CFLAGS="$CFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 CXXFLAGS="$CXXFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 LDFLAGS="$LDFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
 
-AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix 
variable for files to be placed in the root], root_prefix=$withval, 
root_prefix="\$(DESTDIR)")
-
-AC_ARG_ENABLE([ipv6], [  --enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")
-
-root_bindir='${root_prefix}/bin'
-root_sbindir='${root_prefix}/sbin'
-root_sysconfdir='${root_prefix}/etc'
-
-AC_SUBST(root_prefix)
-AC_SUBST(root_bindir)
-AC_SUBST(root_sbindir)
-AC_SUBST(root_sysconfdir)
+AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")
 
 dnl Looking for argp.h
 AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1, [Define if GNU argp tools are 
available]))
@@ -145,9 +134,8 @@ esac
 
 AC_SUBST(DL_LIB)
 
-
 if test x$PTHREAD_LIB != x; then
-   AC_DEFINE(HAVE_PTHREAD, 1, [POSIX threads required for MyServer in a 
non-windows environment])
+   AC_DEFINE(HAVE_PTHREAD, 1, [POSIX threads])
 fi
 
 dnl See if we need -lxnet for arpa
@@ -319,7 +307,6 @@ AC_TYPE_UID_T
 AC_TYPE_GETGROUPS
 
 AM_CONDITIONAL(BUILD_TESTS, test "$MAKE_TESTS" = "yes")
-
 AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
 AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
 
diff --git a/myserver/include/Makefile.am b/myserver/include/Makefile.am
index 2c51c28..7adb216 100644
--- a/myserver/include/Makefile.am
+++ b/myserver/include/Makefile.am
@@ -2,3 +2,5 @@ includeincludedir=$(includedir)/myserver/include/find_data
 includeinclude_HEADERS =
 SUBDIRS = base conf connection connections_scheduler filter http_handler log 
plugin protocol server
 
+install:
+# Do not do anything.
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 81a6fb7..aa8e6f4 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -3,3 +3,5 @@ libbase_a_SOURCES = utility.cpp
 SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map 
home_dir md5 mem_buff multicast pipe process regex safetime slab socket 
socket_pair ssl string sync thread xml unix_socket
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/conf/Makefile.am b/myserver/src/conf/Makefile.am
index 119d6f6..daf1b1e 100644
--- a/myserver/src/conf/Makefile.am
+++ b/myserver/src/conf/Makefile.am
@@ -2,3 +2,6 @@ lib_LIBRARIES = libconf.a
 libconf_a_SOURCES = nodetree.cpp xml_conf.cpp
 SUBDIRS = mime security vhost
 INCLUDES = $(all_includes)
+
+install:
+# Do not do anything.
diff --git a/myserver/src/connection/Makefile.am 
b/myserver/src/connection/Makefile.am
index 31b5d78..62368ae 100644
--- a/myserver/src/connection/Makefile.am
+++ b/myserver/src/connection/Makefile.am
@@ -3,3 +3,5 @@ libconnection_a_SOURCES = connection.cpp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/connections_scheduler/Makefile.am 
b/myserver/src/connections_scheduler/Makefile.am
index 60a727c..5fde48a 100644
--- a/myserver/src/connections_scheduler/Makefile.am
+++ b/myserver/src/connections_scheduler/Makefile.am
@@ -3,3 +3,5 @@ libconnections_scheduler_a_SOURCES = connections_scheduler.cpp 
listen_threads.cp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/filter/Makefile.am b/myserver/src/filter/Makefile.am
index b89a36d..f877709 100644
--- a/myserver/src/filter/Makefile.am
+++ b/myserver/src/filter/Makefile.am
@@ -4,3 +4,5 @@ libfilter_a_SOURCES = filter.cpp filters_chain.cpp 
filters_factory.cpp memory_st
 SUBDIRS = gzip
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/http_handler/Makefile.am 
b/myserver/src/http_handler/Makefile.am
index 156427b..88924f6 100644
--- a/myserver/src/http_handler/Makefile.am
+++ b/myserver/src/http_handler/Makefile.am
@@ -3,3 +3,5 @@ libhttp_handler_a_SOURCES =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/log/Makefile.am b/myserver/src/log/Makefile.am
index 260b9e8..d151f4b 100644
--- a/myserver/src/log/Makefile.am
+++ b/myserver/src/log/Makefile.am
@@ -2,3 +2,6 @@ lib_LIBRARIES = liblog.a
 liblog_a_SOURCES = log_manager.cpp
 SUBDIRS = stream
 INCLUDES = $(all_includes)
+
+install:
+# Do not do anything.
diff --git a/myserver/src/plugin/Makefile.am b/myserver/src/plugin/Makefile.am
index c0bc45a..b14f28b 100644
--- a/myserver/src/plugin/Makefile.am
+++ b/myserver/src/plugin/Makefile.am
@@ -2,3 +2,5 @@ lib_LIBRARIES = libplugin.a
 libplugin_a_SOURCES =  plugin.cpp plugin_info.cpp plugins_manager.cpp 
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/protocol/Makefile.am 
b/myserver/src/protocol/Makefile.am
index 1d5a94f..6ff0348 100644
--- a/myserver/src/protocol/Makefile.am
+++ b/myserver/src/protocol/Makefile.am
@@ -3,3 +3,5 @@ libprotocol_a_SOURCES = protocol_buffer.cpp protocol.cpp 
protocols_manager.cpp u
 SUBDIRS = control ftp http https
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index 7c4041a..fba8cf5 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -3,3 +3,5 @@ libserver_a_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
 INCLUDES = $(all_includes)
 
+install:
+# Do not do anything.



commit 8dd889cda728730411151df0297fe1611f603cbc
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jul 19 17:41:05 2009 +0200

    Do not install the tests_suite program.

diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index f410b98..b4b07a9 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -13,3 +13,6 @@ test_socket.cpp test_socket_pair.cpp 
test_socket_stream_creator.cpp test_ssl_soc
 test_url.cpp test_utility.cpp test_validator.cpp test_validator_factory.cpp 
test_xml.cpp test_xml_validator.cpp test_nodetree.cpp
 
 tests_suite_LDADD = ../src/libmyserver.a $(CPPUNIT_LDFLAGS) $(PTHREAD_LIB) 
$(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) 
$(XML_LIBS) $(LDFLAGS)
+
+
+install:

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/Makefile.am                      |    2 +-
 myserver/binaries/certificates/Makefile.am         |    4 ++--
 myserver/binaries/logs/Makefile.am                 |    3 +--
 myserver/binaries/web/Makefile.am                  |    4 ++--
 myserver/binaries/web/cgi-bin/Makefile.am          |    2 +-
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    2 +-
 myserver/binaries/web/cgi-src/post/Makefile.am     |    2 +-
 myserver/binaries/web/downloads/Makefile.am        |    3 +--
 myserver/configure.in                              |   17 ++---------------
 myserver/include/Makefile.am                       |    2 ++
 myserver/src/base/Makefile.am                      |    2 ++
 myserver/src/conf/Makefile.am                      |    3 +++
 myserver/src/connection/Makefile.am                |    2 ++
 myserver/src/connections_scheduler/Makefile.am     |    2 ++
 myserver/src/filter/Makefile.am                    |    2 ++
 myserver/src/http_handler/Makefile.am              |    2 ++
 myserver/src/log/Makefile.am                       |    3 +++
 myserver/src/plugin/Makefile.am                    |    2 ++
 myserver/src/protocol/Makefile.am                  |    2 ++
 myserver/src/server/Makefile.am                    |    2 ++
 myserver/tests/Makefile.am                         |    3 +++
 21 files changed, 39 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
GNU MyServer