[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-80-gf936d29

[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  f936d2902dbe22547ba185af9d5d2a52e0c9bba0 (commit)
       via  8c1399346bddef87dae5451d31f621a35c8553ca (commit)
      from  c6a4b34ff43f2dd1e2091f532e327e628e447b86 (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 f936d2902dbe22547ba185af9d5d2a52e0c9bba0
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Mar 26 15:47:21 2010 +0100

    Append a newline after a warning message.

diff --git a/myserver/src/conf/vhost/vhost.cpp 
b/myserver/src/conf/vhost/vhost.cpp
index ff69c18..4cb9fb7 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -389,7 +389,7 @@ Vhost::warningsLogWrite (const char* fmt, ...)
   va_list argptr;
   va_start (argptr, fmt);
   int ret = logManager->log (this, warningLogType, MYSERVER_LOG_MSG_INFO, true,
-                             false, fmt, argptr);
+                             true, fmt, argptr);
   va_end (argptr);
   return ret;
 }



commit 8c1399346bddef87dae5451d31f621a35c8553ca
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Mar 26 14:54:46 2010 +0100

    Use libtool to build mscgi examples.

diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am 
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index e72617d..68806f8 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -15,24 +15,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for math_sum
+
 AM_CXXFLAGS="-I$(top_srcdir)/lib"
-lib_LIBRARIES = libmath_sum.a
-libmath_sum_a_SOURCES = math_sum.cpp
+lib_LTLIBRARIES = libmath_sum.la
+libmath_sum_la_SOURCES = math_sum.cpp
+libmath_sum_la_LDFLAGS = -avoid-version -module -shared
+libmath_sum_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
+SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; 
s/^.*="\(.*\)"/\1/'`
 
 all : all-am math_sum.mscgi
-       cp math_sum.mscgi ../../cgi-bin/
-
-
-math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
-       -rm -f math_sum.mscgi
-       $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a  
../../../../lib/libgnu.a \
-        $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) 
$(DL_LIB) $(ZLIB_LIB)\
-        $(XML_LIBS) $(INTLLIBS) $(LDFLAGS) -o math_sum.mscgi -shared 
$(CXXFLAGS) $(XML_CFLAGS)
-
-install : math_sum.mscgi
-       $(INSTALL) -D 'math_sum.mscgi' 
'$(DESTDIR)$(prefix)/var/web/cgi-bin/math_sum.mscgi'
+       cp libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
 
+math_sum.mscgi:
+       $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) 
\
+               $(INSTALL_STRIP_FLAG) libmath_sum.la $(abs_builddir)
 
 clean-local:
-       rm -f math_sum.mscgi
-       rm -f *.o
+       test \! -e libmath_sum.la || \
+       $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall 
libmath_sum.la
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am 
b/myserver/binaries/web/cgi-src/post/Makefile.am
index 3c13919..5170515 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -15,24 +15,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for post
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
-lib_LIBRARIES = libpost.a
-libpost_a_SOURCES = post.cpp
-
-all : all-am post.mscgi
-       cp post.mscgi ../../cgi-bin/
 
+AM_CXXFLAGS="-I$(top_srcdir)/lib"
+lib_LTLIBRARIES = libpost.la
+libpost_la_SOURCES = post.cpp
+libpost_la_LDFLAGS = -avoid-version -module -shared
+libpost_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
+SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; 
s/^.*="\(.*\)"/\1/'`
 
-post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
-       -rm -f post.mscgi
-       $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a  
../../../../lib/libgnu.a \
-        $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) 
$(ZLIB_LIB)\
-        $(XML_LIBS) $(INTLLIBS) $(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) 
$(XML_CFLAGS)
-
-install : post.mscgi
-       $(INSTALL) -D 'post.mscgi' 
'$(DESTDIR)$(prefix)/var/web/cgi-bin/post.mscgi'
+all: all-am post.mscgi
+       cp libpost$(SO_EXT) ../../cgi-bin/post.mscgi
 
+post.mscgi:
+       $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) 
\
+               $(INSTALL_STRIP_FLAG) libpost.la $(abs_builddir)
 
 clean-local:
-       rm -f post.mscgi
-       rm -f *.o
+       test \! -e libpost.la || \
+       $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall 
libpost.la
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 336196e..cd6834a 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -35,9 +35,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LIBTOOL
 
 gl_EARLY
 
+AC_ENABLE_SHARED
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_USE_SYSTEM_EXTENSIONS

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

Summary of changes:
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |   27 ++++++++----------
 myserver/binaries/web/cgi-src/post/Makefile.am     |   29 +++++++++-----------
 myserver/configure.ac                              |    3 ++
 myserver/src/conf/vhost/vhost.cpp                  |    2 +-
 4 files changed, 29 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
GNU MyServer