gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r28928 - in gnunet: . src/multicast src/scalarproduct src/u


From: gnunet
Subject: [GNUnet-SVN] r28928 - in gnunet: . src/multicast src/scalarproduct src/util
Date: Sat, 31 Aug 2013 21:21:03 +0200

Author: grothoff
Date: 2013-08-31 21:21:03 +0200 (Sat, 31 Aug 2013)
New Revision: 28928

Modified:
   gnunet/configure.ac
   gnunet/src/multicast/Makefile
   gnunet/src/multicast/Makefile.in
   gnunet/src/scalarproduct/Makefile.am
   gnunet/src/util/Makefile.am
Log:
trying to fix #3006, libltdl detection on FreeBSD

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-08-30 18:11:02 UTC (rev 28927)
+++ gnunet/configure.ac 2013-08-31 19:21:03 UTC (rev 28928)
@@ -43,10 +43,6 @@
 AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 LT_INIT([disable-static dlopen win32-dll])
-LT_CONFIG_LTDL_DIR([libltdl])
-LTDL_INIT
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
 AC_SUBST(MKDIR_P)
 
 # large file support
@@ -473,6 +469,41 @@
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# Check for libltdl header (#2999)
+ltdl=0
+AC_MSG_CHECKING(for libltdl)
+AC_ARG_WITH(ltdl,
+   [  --with-ltdl=PFX    base of libltdl installation],
+   [AC_MSG_RESULT([$with_ltdl])
+    case $with_ltdl in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            ltdl=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_ltdl/lib $LDFLAGS"
+        CPPFLAGS="-I$with_ltdl/include $CPPFLAGS"
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
+            ltdl=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-ltdl not specified])
+    AC_CHECK_HEADERS(ltdl.h,
+     AC_CHECK_LIB([ltdl], [lt_dlopenext],
+      ltdl=1))])
+if test "$ltdl" != 1
+then
+ AC_MSG_ERROR([GNUnet requires libltdl (from GNU libtool), try installing 
libltdl-dev])
+fi
+# restore LIBS
+LIBS=$SAVE_LIBS
+
 # test for libunistring
 gl_LIBUNISTRING
 if test $HAVE_LIBUNISTRING != yes; then
@@ -494,8 +525,6 @@
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h 
string.h unistd.h stdarg.h signal.h locale.h sys/stat.h 
sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers 
files]))
 
 
-# Check for libltdl header (#2999)
-AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNUnet requires libltdl 
headers (try installing libltdl-dev)]))
 
 # 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([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h 
sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h 
fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.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 ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h 
argz.h ucred.h endian.h sys/endian.h execinfo.h])

Modified: gnunet/src/multicast/Makefile
===================================================================
--- gnunet/src/multicast/Makefile       2013-08-30 18:11:02 UTC (rev 28927)
+++ gnunet/src/multicast/Makefile       2013-08-31 19:21:03 UTC (rev 28928)
@@ -62,12 +62,11 @@
        $(srcdir)/multicast.conf.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
-       $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \
-       $(top_srcdir)/m4/gettext.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/libcurl.m4 \
-       $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
+       $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/gettext.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/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
@@ -187,7 +186,6 @@
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 0
 AR = ar
-ARGZ_H = 
 AS = as
 AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoconf
 AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet/missing --run autoheader
@@ -195,13 +193,13 @@
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -fno-strict-aliasing -Wall -g -O0 -Wall -I/home/grothoff/include
+CFLAGS = -fno-strict-aliasing -Wall -g -Wall -O0 -I/home/grothoff/include
 CPP = gcc -E
 CPPFLAGS = -I/home/grothoff//include -I/home/grothoff//include 
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O0 -Wall
+CXXFLAGS = -g -Wall -O0
 CYGPATH_W = echo
 DEFAULT_INTERFACE = "eth0"
 DEFS = -DHAVE_CONFIG_H
@@ -230,7 +228,6 @@
 GN_USER_HOME_DIR = ~/.gnunet
 GREP = /bin/grep
 HAVE_LIBUNISTRING = yes
-INCLTDL = 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
@@ -241,35 +238,24 @@
 JAVAPORT = #
 LD = /usr/bin/ld -m elf_x86_64
 LDFLAGS = -L/home/grothoff//lib -L/home/grothoff//lib 
-LIBADD_DL = -ldl 
-LIBADD_DLD_LINK = 
-LIBADD_DLOPEN = -ldl
-LIBADD_SHL_LOAD = 
-LIBCURL = -L/home/grothoff/lib -lcurl -L/usr/lib
-LIBCURL_CPPFLAGS = -I/home/grothoff/include
+LIBCURL = -L/usr/lib/x86_64-linux-gnu -lcurl
+LIBCURL_CPPFLAGS = 
 LIBGCRYPT_CFLAGS = -I/home/grothoff/include
-LIBGCRYPT_CONFIG = /home/grothoff/bin//libgcrypt-config
+LIBGCRYPT_CONFIG = /home/grothoff/bin/libgcrypt-config
 LIBGCRYPT_LIBS = -L/home/grothoff/lib -lgcrypt -lgpg-error
 LIBICONV = 
 LIBINTL = 
-LIBLTDL = -lltdl
 LIBOBJS = 
 LIBPREFIX = 
-LIBS = -lm -ldl 
+LIBS = -lm 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIBUNISTRING = -lunistring
 LIPO = 
 LN_S = ln -s
-LTDLDEPS = 
-LTDLINCL = 
-LTDLOPEN = libltdl
 LTLIBICONV = 
 LTLIBINTL = 
 LTLIBOBJS = 
 LTLIBUNISTRING = -lunistring
-LT_CONFIG_H = gnunet_config.h
-LT_DLLOADERS =  libltdl/dlopen.la
-LT_DLPREOPEN = -dlpreopen libltdl/dlopen.la 
 MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet/missing --run makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /bin/mkdir -p
@@ -367,8 +353,6 @@
 libexecdir = $(pkglibdir)/libexec/
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-ltdl_LIBOBJS =  lt__strl.o
-ltdl_LTLIBOBJS =  lt__strl.lo
 mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
@@ -383,9 +367,7 @@
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
-subdirs =  libltdl
 svnversioncommand = /usr/bin/svnversion
-sys_symbol_underscore = no
 sysconfdir = ${prefix}/etc
 target = x86_64-unknown-linux-gnu
 target_alias = 

Modified: gnunet/src/multicast/Makefile.in
===================================================================
--- gnunet/src/multicast/Makefile.in    2013-08-30 18:11:02 UTC (rev 28927)
+++ gnunet/src/multicast/Makefile.in    2013-08-31 19:21:03 UTC (rev 28928)
@@ -62,12 +62,11 @@
        $(srcdir)/multicast.conf.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \
-       $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \
-       $(top_srcdir)/m4/gettext.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/libcurl.m4 \
-       $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \
+       $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/gettext.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/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
@@ -187,7 +186,6 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ARGZ_H = @ARGZ_H@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -230,7 +228,6 @@
 GN_USER_HOME_DIR = @GN_USER_HOME_DIR@
 GREP = @GREP@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
-INCLTDL = @INCLTDL@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -241,10 +238,6 @@
 JAVAPORT = @JAVAPORT@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBADD_DL = @LIBADD_DL@
-LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
-LIBADD_DLOPEN = @LIBADD_DLOPEN@
-LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
 LIBCURL = @LIBCURL@
 LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
@@ -252,7 +245,6 @@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBPREFIX = @LIBPREFIX@
 LIBS = @LIBS@
@@ -260,16 +252,10 @@
 LIBUNISTRING = @LIBUNISTRING@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTDLDEPS = @LTDLDEPS@
-LTDLINCL = @LTDLINCL@
-LTDLOPEN = @LTDLOPEN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBUNISTRING = @LTLIBUNISTRING@
-LT_CONFIG_H = @LT_CONFIG_H@
-LT_DLLOADERS = @LT_DLLOADERS@
-LT_DLPREOPEN = @LT_DLPREOPEN@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -367,8 +353,6 @@
 libexecdir = $(pkglibdir)/libexec/
 localedir = @localedir@
 localstatedir = @localstatedir@
-ltdl_LIBOBJS = @ltdl_LIBOBJS@
-ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -383,9 +367,7 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 svnversioncommand = @svnversioncommand@
-sys_symbol_underscore = @sys_symbol_underscore@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@

Modified: gnunet/src/scalarproduct/Makefile.am
===================================================================
--- gnunet/src/scalarproduct/Makefile.am        2013-08-30 18:11:02 UTC (rev 
28927)
+++ gnunet/src/scalarproduct/Makefile.am        2013-08-31 19:21:03 UTC (rev 
28928)
@@ -64,13 +64,6 @@
   TESTS = $(check_PROGRAMS)
 endif
 
-test_consensus_api_SOURCES = \
- test_consensus_api.c
-test_consensus_api_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la
-
 test_scalarproduct_api_SOURCES = \
   test_scalarproduct_api.c
 test_scalarproduct_api_LDADD = \

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2013-08-30 18:11:02 UTC (rev 28927)
+++ gnunet/src/util/Makefile.am 2013-08-31 19:21:03 UTC (rev 28928)
@@ -108,15 +108,12 @@
   time.c \
   speedup.c
 
-libgnunetutil_la_CPPFLAGS = \
-  $(LTDLINCL)
-
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
+  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]