[GNUnet-SVN] r10504 - in GNUnet: . m4

[gnunet]

Author: durner
Date: 2010-03-05 23:07:38 +0100 (Fri, 05 Mar 2010)
New Revision: 10504

Modified:
   GNUnet/configure.ac
   GNUnet/m4/libltdl-external.m4
Log:
fix libltdl check, patch from LRN on #gnunet

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2010-03-05 20:33:52 UTC (rev 10503)
+++ GNUnet/configure.ac 2010-03-05 22:07:38 UTC (rev 10504)
@@ -897,7 +897,7 @@
         AC_CHECK_HEADERS(libguile.h,
           AC_CHECK_LIB([guile], [scm_c_define_gsubr],
             guile=1, [],
-            -lgmp $LIBLTDL))
+            -lgmp $LTDLLIB))
         ;;
       *)
         LDFLAGS="-L$with_guile/lib $LDFLAGS"
@@ -906,19 +906,19 @@
           AC_CHECK_LIB([guile], [scm_c_define_gsubr],
             EXT_LIB_PATH="-L$with_guile/lib $EXT_LIB_PATH"
             guile=1, [],
-            -lgmp $LIBLTDL))
+            -lgmp $LTDLLIB))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-guile not specified])
     AC_CHECK_HEADERS(libguile.h,
      AC_CHECK_LIB([guile], [scm_c_define_gsubr],
-      guile=1, [], -lgmp $LIBLTDL))])
+      guile=1, [], -lgmp $LTDLLIB))])
 
 if test "$guile" = 1
 then
  AC_CHECK_LIB([guile], [scm_init_guile], [],
-       AC_MSG_ERROR([Guile doesn't provide scm_init_guile(). Please report to 
address@hidden), -lgmp $LIBLTDL)
+       AC_MSG_ERROR([Guile doesn't provide scm_init_guile(). Please report to 
address@hidden), -lgmp $LTDLLIB)
  AC_DEFINE_UNQUOTED([HAVE_GUILE], 1, [We have GUILE])
 else
  AC_DEFINE_UNQUOTED([HAVE_GUILE], 0, [We do NOT have GUILE])

Modified: GNUnet/m4/libltdl-external.m4
===================================================================
--- GNUnet/m4/libltdl-external.m4       2010-03-05 20:33:52 UTC (rev 10503)
+++ GNUnet/m4/libltdl-external.m4       2010-03-05 22:07:38 UTC (rev 10504)
@@ -19,15 +19,18 @@
      libltdl_prefix="$withval", libltdl_prefix="")
   ltdl_save_CPPFLAGS="$CPPFLAGS"
   ltdl_save_LDFLAGS="$LDFLAGS"
+  ltdl_save_LIBS="$LIBS"
   if test x$libltdl_prefix != x ; then
     CPPFLAGS="-I$libltdl_prefix/include $CPPFLAGS"
-    LDFLAGS="-L$libltdl_prefix/lib -lltdl $LDFLAGS"
+    LDFLAGS="-L$libltdl_prefix/lib $LDFLAGS"
+    LIBS="-lltdl $LIBS"
   else
     if test x"$LIBLTDL" = x ; then
-      LIBLTDL="-lltdl"
+      LTDLLIB="-lltdl"
     fi
     CPPFLAGS="$LTDLINCL $CPPFLAGS"
-    LDFLAGS="$LIBLTDL $LDFLAGS"
+    LDFLAGS="$LTDLLDF $LDFLAGS"
+    LIBS="$LTDLLIB $LIBS"
   fi
 
   symbols_to_check=ifelse([$1], ,"ltdl_dlopen","$1")
@@ -51,14 +54,17 @@
 
   if test x$libltdl_prefix != x ; then
     LTDLINCL="-I$libltdl_prefix/include"
-    LIBLTDL="-L$libltdl_prefix/lib -lltdl"
+    LTDLLDF="-L$libltdl_prefix/lib"
+    LTDLLIB="-lltdl"
   else
-    if test x"$LIBLTDL" = x ; then
-      LIBLTDL="-lltdl"
+    if test x"$LTDLLIB" = x ; then
+      LTDLLIB="-lltdl"
+      LTDLLDF=""
     fi
   fi
   CPPFLAGS="$ltdl_save_CPPFLAGS"
   LDFLAGS="$ltdl_save_LDFLAGS"
+  LIBS="$ltdl_save_LIBS"
 
   AC_MSG_CHECKING(for libltdl with symbols $symbols_to_check)
   if test $ltdl_found = yes; then
@@ -66,10 +72,12 @@
     ifelse([$2], , :, [$2])
   else
     LTDLINCL=""
-    LIBLTDL=""
+    LTDLLIB=""
+    LTDLLDF=""
     AC_MSG_RESULT(no)
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(LTDLINCL)
-  AC_SUBST(LIBLTDL)
+  AC_SUBST(LTDLLIB)
+  AC_SUBST(LTDLLDF)
 ])