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

[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  e9c335399e11d7b0fe9006ae908bd3ad392cb20d (commit)
      from  b1b88f01adff53a3d7dd78d8ccc1cc6459410291 (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 e9c335399e11d7b0fe9006ae908bd3ad392cb20d
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Jul 19 21:22:38 2009 +0200

    Compile MSCGI examples under Windows.

diff --git a/myserver/binaries/web/Makefile.am 
b/myserver/binaries/web/Makefile.am
index b2e9ad6..cf26f49 100644
--- a/myserver/binaries/web/Makefile.am
+++ b/myserver/binaries/web/Makefile.am
@@ -1,5 +1,6 @@
+
 if BUILD_MSCGI
-       CGI_SRC = cgi-src
+CGI_SRC = cgi-src
 endif
 
 SUBDIRS = cgi-bin $(CGI_SRC) downloads
diff --git a/myserver/configure.in b/myserver/configure.in
index 001a09a..92ac4e5 100644
--- a/myserver/configure.in
+++ b/myserver/configure.in
@@ -100,7 +100,8 @@ AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 
1, [Define if the gcr
 
 case "${host}" in
     *-*-mingw32*)
-     LDFLAGS="$LDFLAGS -lwsock32 -lgdi32 -lole32  -luuid -luserenv"
+     LDFLAGS="-lwsock32 -lgdi32 -lole32  -luuid -luserenv $LDFLAGS"
+     MAKE_MSCGI=yes
      ;;
   *)
      dnl Looking for pthreads
@@ -124,7 +125,6 @@ case "${host}" in
                 *** MSCGI support will not function
                     ])
          DL_LIB=""
-         MAKE_MSCGI=no
    fi
 
 
@@ -310,6 +310,10 @@ AM_CONDITIONAL(BUILD_TESTS, test "$MAKE_TESTS" = "yes")
 AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
 AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
 
+AC_SUBST(BUILD_TESTS)
+AC_SUBST(BUILD_DOC)
+AC_SUBST(BUILD_MSCGI)
+
 dnl AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([
     Makefile
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 730671c..2e93e63 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -23,13 +23,23 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 extern "C"
 {
 #if GCRY_CONTROL
-#include <errno.h>
-#include <gcrypt.h>
+
+# include <errno.h>
+
+# ifdef WIN32
+#  undef socklen_t
+# endif
+
+# include <gcrypt.h>
+
+# ifdef HAVE_PTHREAD
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# endif
+
 #endif
 
 #ifdef HAVE_PTHREAD
-#include <pthread.h>
+# include <pthread.h>
 #endif
 }
 
@@ -99,7 +109,7 @@ void initializeSSL ()
 
   if (!initialized)
   {
-#if GCRY_CONTROL
+#if GCRY_CONTROL && HAVE_PTHREAD
     gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #endif
     gnutls_global_init ();

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

Summary of changes:
 myserver/binaries/web/Makefile.am |    3 ++-
 myserver/configure.in             |    8 ++++++--
 myserver/src/base/ssl/ssl.cpp     |   18 ++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer