[GNUnet-SVN] r3644 - GNUnet

[durner]

Author: durner
Date: 2006-11-04 10:17:51 -0800 (Sat, 04 Nov 2006)
New Revision: 3644

Modified:
   GNUnet/configure.ac
Log:
more flexible guile detection

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-11-04 17:31:35 UTC (rev 3643)
+++ GNUnet/configure.ac 2006-11-04 18:17:51 UTC (rev 3644)
@@ -464,7 +464,37 @@
 AC_DEFINE_UNQUOTED(USE_IPV6, $ipv6, [IPV6 available])
 
 # check for guile
-GUILE_FLAGS
+guile=0
+AC_MSG_CHECKING(for guile 1.8)
+AC_ARG_WITH(guile,
+   [  --with-guile=PFX    Base of guile installation],
+   [AC_MSG_RESULT([$with_guile])
+    case $with_guile in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(libguile.h,
+          AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+            guile=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_guile/lib $LDFLAGS"
+        CPPFLAGS="-I$with_guile/include $CPPFLAGS"
+        AC_CHECK_HEADERS(libguile.h,
+          AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+            EXT_LIB_PATH="-L$with_guile/lib $EXT_LIB_PATH"
+            guile=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-guile not specified])
+    AC_CHECK_HEADERS(libguile.h,
+     AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
+      guile=1))])
+if test "$guile" != 1
+then
+ AC_MSG_ERROR([GNUnet requires libguile 1.8])
+fi
 
 AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
 Makefile