[GNUnet-SVN] r4087 - in GNUnet: . src/util src/util/string

[grothoff]

Author: grothoff
Date: 2006-12-28 19:45:36 -0800 (Thu, 28 Dec 2006)
New Revision: 4087

Modified:
   GNUnet/ChangeLog
   GNUnet/configure.ac
   GNUnet/src/util/Makefile.am
   GNUnet/src/util/string/string.c
   GNUnet/todo
Log:
fixing iconv problems (hopefully)

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2006-12-29 03:27:56 UTC (rev 4086)
+++ GNUnet/ChangeLog    2006-12-29 03:45:36 UTC (rev 4087)
@@ -1,3 +1,7 @@
+Thu Dec 28 20:44:45 MST 2006
+       Hopefully fixing build problems on certain systems with
+       unusual installation of iconv.
+
 Tue Dec 26 20:54:03 MST 2006
        Added additional gnunet-gtk options to client configuration
        specification file.

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-12-29 03:27:56 UTC (rev 4086)
+++ GNUnet/configure.ac 2006-12-29 03:45:36 UTC (rev 4087)
@@ -136,16 +136,7 @@
 AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd")
 AC_MSG_RESULT([$build_target])
 
-# We define the paths here, because MinGW/GCC expands paths
-# passed through the command line ("-DGNDATADIR=..."). This would
-# lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
-# not contain the actual GNUnet installation. GNUnet usually lives in
-# "C:\Program Files\GNU\GNUnet\bin".
-#AC_DEFINE_DIR([GNDATADIR], [datadir/GNUnet/], [The directory for 
-#installing read-only architecture-independent data])
-#AC_DEFINE_DIR([LOCALEDIR], [datadir/locale/], [gettext catalogs])
 
-
 CHECK_PTHREAD
 LIBS="$PTHREAD_LIBS $LIBS"
 
@@ -424,7 +415,11 @@
 AM_GNU_GETTEXT_VERSION(0.13)
 AM_GNU_GETTEXT([external])
 
+# check for iconv
+AM_ICONV
 
+
+
 # Checks for standard header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -433,7 +428,7 @@
 AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h 
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX 
headers files]))
 
 # Checks for headers that are only required on some systems or opional (and 
where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/vfs.h 
arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h 
sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h])
+AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/vfs.h 
arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h 
sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h 
iconv.h])
 
 # Check for GMP header (and abort if not present)
 AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Compiling GNUnet requires gmp.h (from 
the GNU MP library, libgmp)]))
@@ -531,7 +526,6 @@
 fi
 AM_CONDITIONAL(HAVE_GUILE, test x$guile = x1)
 
-
 AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
 Makefile
 contrib/Makefile

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2006-12-29 03:27:56 UTC (rev 4086)
+++ GNUnet/src/util/Makefile.am 2006-12-29 03:45:36 UTC (rev 4087)
@@ -14,7 +14,7 @@
   -DPLUGIN_PATH="\"${plugindir}\"" -DPREFIX_PATH="\"${prefix}\""
 
 # GNU Gettext support
-LIBS = @LIBINTL@ @LIBS@
+LIBS = @LIBINTL@ @LIBICONV@ @LIBS@
 
 if SOLARIS
  SOLFLAGS = -lrt

Modified: GNUnet/src/util/string/string.c
===================================================================
--- GNUnet/src/util/string/string.c     2006-12-29 03:27:56 UTC (rev 4086)
+++ GNUnet/src/util/string/string.c     2006-12-29 03:45:36 UTC (rev 4087)
@@ -27,7 +27,9 @@
 
 #include "gnunet_util_string.h"
 #include "platform.h"
+#if HAVE_ICONV_H
 #include <iconv.h>
+#endif
 
 
 int SNPRINTF(char * buf,
@@ -192,7 +194,7 @@
                            size_t len,
                            const char * charset) {
   char * ret;
-#if ENABLE_NLS
+#if ENABLE_NLS && HAVE_ICONV
   size_t tmpSize;
   size_t finSize;
   char * tmp;

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-12-29 03:27:56 UTC (rev 4086)
+++ GNUnet/todo 2006-12-29 03:45:36 UTC (rev 4087)
@@ -20,12 +20,6 @@
   Ran the current svn over 10 times under gdb (serializetest2)
   One time it exited with status=1 and said
   "Download suspended but search reference not set correctly."
-  DexterF reports:
-  gcc -fno-strict-aliasing -Wall -Os -march=i686 -mmmx -msse -m3dnow -o 
.libs/gnunet-setup gnunet-setup.o  ../../src/setup/lib/.libs/libgnunetsetup.so 
../../src/util/.libs/libgnunetutil.so 
../../src/util/loggers/.libs/libgnunetutil_logging.so 
../../src/util/config_impl/.libs/libgnunetutil_config.so /usr/lib/libguile.so 
-lm -lnsl -lpthread 
-  ../../src/util/.libs/libgnunetutil.so: undefined reference to 
`libiconv_open' 
-  ../../src/util/.libs/libgnunetutil.so: undefined reference to 
`libiconv_close' 
-  ../../src/util/.libs/libgnunetutil.so: undefined reference to `libiconv' 
-  collect2: ld returned 1 exit status 
 
 
 0.7.2 [3'07]: