[GNUnet-SVN] r397 - in GNUnet: . m4 src/applications/sqstore_mysql src/applications/sqstore_sqlite src/transports src/util

[grothoff]

Author: grothoff
Date: 2005-03-06 16:46:16 -0800 (Sun, 06 Mar 2005)
New Revision: 397

Modified:
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/sqstore_mysql/Makefile.am
   GNUnet/src/applications/sqstore_sqlite/Makefile.am
   GNUnet/src/transports/tcp6.c
   GNUnet/src/util/Makefile.am
Log:
configure bugfixes

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-03-06 23:33:18 UTC (rev 396)
+++ GNUnet/configure.ac 2005-03-07 00:46:16 UTC (rev 397)
@@ -124,20 +124,35 @@
 ;;
 esac
 
+AC_MSG_CHECKING([for build target])
+AM_CONDITIONAL(CYGWIN,  test "$build_target" = "cygwin")
+AM_CONDITIONAL(MINGW,   test "$build_target" = "mingw")
+AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
+AC_MSG_RESULT([$build_target])
+
+
+
 CHECK_PTHREAD
 LIBS="$PTHREAD_LIBS $LIBS"
-CPPFLAGS="$PTHREAD_CPPFLAGS $CPPFLAGS $LTDLINCL"
-LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS"
 
+
+# some other checks for standard libs
+AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(m, log)
+AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg 
supported]))
+
+# 'save' libs; only those libs found so far will be
+# linked against _everywhere_.  For the others, we
+# will be more selective!
+SAVE_LIBS=$LIBS
+
+AC_CHECK_LIB(gmp, __gmpz_import,, AC_MSG_ERROR([GNUnet requires the GNU MP 
library (libgmp)]))
+
 # pthread_t is a struct since 11/2004
 AC_CHECK_MEMBER(pthread_t.p, AC_DEFINE(HAVE_NEW_PTHREAD_T, 1,
   [Define if you have a post 11/2004 pthread library]), , [#include 
<pthread.h>])
 
-AC_MSG_CHECKING([for build target])
-AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin")
-AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
-AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")
-AC_MSG_RESULT([$build_target])
 
 # We have two choices for the crypto stuff.  
 # 1) By default we use whatever is present (OpenSSL or gcrypt)
@@ -195,18 +210,6 @@
 fi
 fi
 
-if test $gcrypt = 1
-then
-  if test "x$LIBGCRYPT_LIBS" != "x"
-  then
-    LDFLAGS="$LDFLAGS $LIBGCRYPT_LIBS"
-  fi
-  if test "x$LIBGCRYPT_CFLAGS" != "x"
-  then
-    CPPFLAGS="$CPPFLAGS $LIBGCRYPT_CFLAGS"
-  fi
-fi  
-
 AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = x1)
 AC_DEFINE_UNQUOTED(USE_GCRYPT, $gcrypt, [gcrypt available])
 
@@ -225,7 +228,7 @@
 AC_MSG_CHECKING(for libextractor)
 AC_ARG_WITH(extractor,
    [  --with-extractor=PFX    Base of libextractor installation],
-   [AC_MSG_RESULT("$with_extractor")
+   [AC_MSG_RESULT([$with_extractor])
     case $with_extractor in
       no)
         ;;
@@ -248,8 +251,6 @@
     AC_CHECK_HEADERS(extractor.h,
      AC_CHECK_LIB([extractor], [EXTRACTOR_loadDefaultLibraries],
       extractor=1))])
-AM_CONDITIONAL(USE_LIBEXTRACTOR, test x$extractor = x1)
-AC_DEFINE_UNQUOTED(USE_LIBEXTRACTOR, $extractor, [libextractor available])
 if test "$extractor" != 1
 then
  AC_MSG_ERROR([GNUnet requires libextractor])
@@ -270,31 +271,41 @@
      sqlite=true)
      ;;
    *)
+    SAVE_LDFLAGS=$LDFLAGS
+    SAVE_CPPFLGAS=$CPPFLAGS
     LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
     CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
     AC_CHECK_HEADERS(sqlite3.h,
      EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH"
+     SQLITE_LDFLAGS="-L$with_sqlite/lib"
+     SQLITE_CPPFLGAS="-I$with_sqlite/include"
      sqlite=true)
+    LDFLAGS=$SAVE_LDFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
     ;;
    esac
   ],
   [AC_MSG_RESULT([--with-sqlite not specified])
     AC_CHECK_HEADERS(sqlite3.h, sqlite=true)])
 AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue)
+AC_SUBST(SQLITE_CPPFLAGS)
+AC_SUBST(SQLITE_LDFLAGS)
 
 
 # test for libz (maybe required for linking mysql)
-saveLIBS=$LIBS
 zlib=1
 AC_CHECK_LIB(z, compress,,zlib=0)
-ZLIBS=$LIBS
-LIBS=$saveLIBS
 AM_CONDITIONAL(HAVE_ZLIB, test x$zlib = x1)
 
 # mysql & windows
 AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
 AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
 
+if test "$build_target" = "mingw"
+then
+  CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>"
+fi
+
 # test for mysql
 mysql=false
 mysqlfail=false
@@ -304,28 +315,41 @@
   [AC_MSG_RESULT("$with_mysql")
    if test "$with_mysql" != "no"
    then
+    SAVE_LDFLAGS=$LDFLAGS
+    SAVE_CPPFLGAS=$CPPFLAGS
     LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
     CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
     AC_CHECK_HEADERS(mysql/mysql.h,
      AC_CHECK_LIB(mysqlclient, mysql_init,
-      EXT_LIB_PATH="-L$with_mysql/lib -L$with_mysql/lib/mysql $EXT_LIB_PATH"
-      mysql=true), [], [#include <my_global.h>])
+      MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
+      MYSQL_CPPFLAGS="-I$with_mysql/include"
+
+      mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+    LDFLAGS=$SAVE_LDFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
    fi
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
+   SAFE_LDFLAGS=$LDFLAGS
    LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
    AC_CHECK_LIB(mysqlclient, mysql_init,
     [AC_CHECK_HEADERS(mysql/mysql.h,
-      EXT_LIB_PATH="-L/usr/lib/mysql $EXT_LIB_PATH"
+      MYSQL_LDFLAGS="-L/usr/lib/mysql"
       mysql=true
-     , [], [#include <my_global.h>])])])
+      
+     , [], [$CYGWIN_MYSQL_MAGIC])])
+   LDFLAGS=$SAVE_LDFLAGS
+  ])
 
+AC_SUBST(MYSQL_LDFLAGS)
+AC_SUBST(MYSQL_CPPFLAGS)
+
 # additional version check for mysql
 if test "$mysql" = "true"
 then
   AC_MSG_CHECKING(mysql version)
   AC_RUN_IFELSE([AC_LANG_PROGRAM(
-    [[#include <mysql/my_global.h>
+    [[$CYGWIN_MYSQL_MAGIC
       #include <mysql/mysql.h>]],
     [[if (MYSQL_VERSION_ID < 40100)
         return(-1);
@@ -351,24 +375,14 @@
  [AC_CHECK_HEADER([curses.h], AC_DEFINE([CURSES_LOC], [<curses.h>]),
  [AC_CHECK_HEADER([ncurses/curses.h], AC_DEFINE([CURSES_LOC], 
[<ncurses/curses.h>]),
  curses=0)])])])
-saveLIBS=$LIBS
 AC_CHECK_LIB(ncurses, scrollok,,curses=0)
-LIBS=$saveLIBS
 AC_DEFINE_UNQUOTED([HAVE_CURSES], $curses, [We have curses])
 AM_CONDITIONAL(HAVE_CURSES, test x$curses = x1)
 
-# some other checks for standard libs
-
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(m, log)
-AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg 
supported]))
-AC_CHECK_LIB(gmp, __gmpz_import,, AC_MSG_ERROR([GNUnet requires the GNU MP 
library (libgmp)]))
-
 # check for gtk >= 2.4.0 
-AC_MSG_CHECKING(for gtk)
-AM_PATH_GTK_2_0(2.4.0,without_gtk=false,without_gtk=true)
-AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
+# AC_MSG_CHECKING(for gtk)
+# AM_PATH_GTK_2_0(2.4.0,without_gtk=false,without_gtk=true)
+# AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
 
 # check for gettext
 AM_GNU_GETTEXT_VERSION(0.14)
@@ -414,6 +428,9 @@
 AC_TYPE_UID_T
 AC_CHECK_FUNCS([floor gethostname memmove rmdir strncasecmp strrchr strtol 
atoll dup2 fdatasync ftruncate gethostbyname gettimeofday memset mkdir mkfifo 
select socket strcasecmp strchr strdup strerror strstr clock_gettime getrusage 
rand uname setlocale getcwd mktime])
 
+# restore LIBS
+LIBS=$SAVE_LIBS
+
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)
@@ -583,10 +600,10 @@
   AC_MSG_NOTICE([NOTICE: IPv6 support will NOT be compiled.])
 fi
 
-if test "$without_gtk" = "true"
-then 
-  AC_MSG_NOTICE([NOTICE: gnunet-gtk user interface will NOT be compiled.])
-fi
+#if test "$without_gtk" = "true"
+#then 
+#  AC_MSG_NOTICE([NOTICE: gnunet-gtk user interface will NOT be compiled.])
+#fi
 
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: 
$sqlite])
 

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2005-03-06 23:33:18 UTC (rev 396)
+++ GNUnet/m4/Makefile.in       2005-03-07 00:46:16 UTC (rev 397)
@@ -38,12 +38,12 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-       $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/guile.m4 \
-       $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-       $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-       $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
-       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/guile.m4 $(top_srcdir)/m4/iconv.m4 \
+       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+       $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+       $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -90,15 +90,11 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_TOOLS = @GUILE_TOOLS@
 HAVE_CURSES_FALSE = @HAVE_CURSES_FALSE@
 HAVE_CURSES_TRUE = @HAVE_CURSES_TRUE@
-HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
-HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
 HAVE_GUILE_FALSE = @HAVE_GUILE_FALSE@
 HAVE_GUILE_TRUE = @HAVE_GUILE_TRUE@
 HAVE_IPV6_FALSE = @HAVE_IPV6_FALSE@
@@ -138,6 +134,8 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
+MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -147,18 +145,17 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
 SOLARIS_TRUE = @SOLARIS_TRUE@
+SQLITE_CPPFLAGS = @SQLITE_CPPFLAGS@
+SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
 STRIP = @STRIP@
 USE_GCRYPT_FALSE = @USE_GCRYPT_FALSE@
 USE_GCRYPT_TRUE = @USE_GCRYPT_TRUE@
-USE_LIBEXTRACTOR_FALSE = @USE_LIBEXTRACTOR_FALSE@
-USE_LIBEXTRACTOR_TRUE = @USE_LIBEXTRACTOR_TRUE@
 USE_NLS = @USE_NLS@
 USE_OPENSSL_FALSE = @USE_OPENSSL_FALSE@
 USE_OPENSSL_TRUE = @USE_OPENSSL_TRUE@

Modified: GNUnet/src/applications/sqstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_mysql/Makefile.am   2005-03-06 23:33:18 UTC 
(rev 396)
+++ GNUnet/src/applications/sqstore_mysql/Makefile.am   2005-03-07 00:46:16 UTC 
(rev 397)
@@ -13,14 +13,20 @@
 
 TESTS = $(check_PROGRAMS)
 
+if HAVE_ZLIB
+ ZLIB_LNK = -lz
+endif
 
+AM_CPPFLAGS = $(CPPFLAGS) $(MYSQL_CPPFLAGS)
+
 libgnunetmodule_sqstore_mysql_la_SOURCES = \
   mysql.c 
 libgnunetmodule_sqstore_mysql_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  -export-dynamic -avoid-version -module \
+  $(MYSQL_LDFLAGS)
 libgnunetmodule_sqstore_mysql_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lmysqlclient -lz
+ -lmysqlclient $(ZLIB_LNK)
 
 
 mysqltest_SOURCES = \

Modified: GNUnet/src/applications/sqstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/Makefile.am  2005-03-06 23:33:18 UTC 
(rev 396)
+++ GNUnet/src/applications/sqstore_sqlite/Makefile.am  2005-03-07 00:46:16 UTC 
(rev 397)
@@ -13,11 +13,13 @@
 
 TESTS = $(check_PROGRAMS)
 
+AM_CPPFLAGS = $(CPPFLAGS) $(SQLITE_CPPFLAGS)
 
 libgnunetmodule_sqstore_sqlite_la_SOURCES = \
   sqlite.c 
 libgnunetmodule_sqstore_sqlite_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  -export-dynamic -avoid-version -module \
+  $(SQLITE_LDFLAGS)
 libgnunetmodule_sqstore_sqlite_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lsqlite3

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2005-03-06 23:33:18 UTC (rev 396)
+++ GNUnet/src/transports/tcp6.c        2005-03-07 00:46:16 UTC (rev 397)
@@ -787,7 +787,8 @@
                          void * mp,
                          unsigned int ssize) {
   int ok;
-  int ret, success;
+  int ret;
+  int success;
 
   if (tcp6Session->sock == -1) {
 #if DEBUG_TCP6
@@ -809,16 +810,16 @@
   if (tcp6Session->wpos > 0) {
     ret = 0;
   } else {
-    sucess = SEND_NONBLOCKING(tcp6Session->sock,
+    success = SEND_NONBLOCKING(tcp6Session->sock,
                               mp,
                               ssize,
                               &ret);
-       if (success == SYSERR) {
-         LOG_STRERROR(LOG_INFO, "send");
-         MUTEX_UNLOCK(&tcp6lock);
-         return SYSERR;
-       } else if (success == NO)
-         ret = 0;
+    if (success == SYSERR) {
+      LOG_STRERROR(LOG_INFO, "send");
+      MUTEX_UNLOCK(&tcp6lock);
+      return SYSERR;
+    } else if (success == NO)
+      ret = 0;
   }
   if ((unsigned int) ret <= ssize) { /* some bytes send or blocked */
     if ((unsigned int)ret < ssize) {

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2005-03-06 23:33:18 UTC (rev 396)
+++ GNUnet/src/util/Makefile.am 2005-03-07 00:46:16 UTC (rev 397)
@@ -33,7 +33,8 @@
  CRYPTLIB = -lcrypto
 else
  cryptofiles = hostkey_gcrypt.c symcipher_gcrypt.c locking_gcrypt.c 
locking_gcrypt.h random_gcrypt.c
- CRYPTLIB = -lgcrypt
+ CRYPTLIB = $(LIBGCRYPT_LIBS)
+ AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
 endif
 
 libgnunetutil_la_LIBADD = $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD)