[GNUnet-SVN] r3984 - in GNUnet: . m4 src

[grothoff]

Author: grothoff
Date: 2006-12-19 17:19:10 -0800 (Tue, 19 Dec 2006)
New Revision: 3984

Modified:
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/Makefile.am
Log:
warn only if guile was not found

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-12-20 00:53:19 UTC (rev 3983)
+++ GNUnet/configure.ac 2006-12-20 01:19:10 UTC (rev 3984)
@@ -520,13 +520,17 @@
     AC_CHECK_HEADERS(libguile.h,
      AC_CHECK_LIB([guile], [scm_sigaction_for_thread],
       guile=1))])
-if test "$guile" != 1
+
+if test "$guile" == 1
 then
- AC_MSG_ERROR([GNUnet requires libguile 1.8])
+ AC_CHECK_LIB([guile], [scm_init_guile], [],
+       AC_MSG_ERROR([Guile doesn't provide scm_init_guile(). Please report to 
address@hidden))
+ AC_DEFINE_UNQUOTED([HAVE_GUILE], 1, [We have GUILE])
+else
+ AC_DEFINE_UNQUOTED([HAVE_GUILE], 0, [We do NOT have GUILE])
 fi
+AM_CONDITIONAL(HAVE_GUILE, test x$guile = x1)
 
-AC_CHECK_LIB([guile], [scm_init_guile], [],
-       AC_MSG_ERROR([Guile doesn't provide scm_init_guile(). Please report to 
address@hidden))
 
 AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
 Makefile
@@ -607,12 +611,6 @@
   AC_MSG_NOTICE([NOTICE: MySQL found, but too old. MySQL support will not be 
compiled.])
 fi
 
-# guile
-if test "x$guile" = "x0"
-then
-  AC_MSG_NOTICE([NOTICE: Guile not found, gnunet-download-manager will not be 
installed.])
-fi
-
 if test "$dialog" != 1
 then
  AC_MSG_NOTICE([NOTICE: curses based gnunet-setup frontends will not be 
installed.])
@@ -624,3 +622,15 @@
 fi
 
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: 
$sqlite])
+
+# guile
+if test "x$guile" = "x0"
+then
+  AC_MSG_NOTICE([NOTICE: Guile not found, gnunet-download-manager will not be 
installed.])
+fi
+
+if test "$guile" != 1
+then
+ AC_MSG_NOTICE([WARNING: Guile not found, gnunet-setup will not be installed.])
+fi
+

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2006-12-20 00:53:19 UTC (rev 3983)
+++ GNUnet/m4/Makefile.in       2006-12-20 01:19:10 UTC (rev 3984)
@@ -100,6 +100,8 @@
 HAVE_DIALOG_TRUE = @HAVE_DIALOG_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@
 HAVE_IPV6_TRUE = @HAVE_IPV6_TRUE@
 HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@

Modified: GNUnet/src/Makefile.am
===================================================================
--- GNUnet/src/Makefile.am      2006-12-20 00:53:19 UTC (rev 3983)
+++ GNUnet/src/Makefile.am      2006-12-20 01:19:10 UTC (rev 3984)
@@ -1,2 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
-SUBDIRS        = include util setup server applications transports
+
+if HAVE_GUILE
+ setup_dir = setup
+endif
+
+SUBDIRS        = include util $(setup_dir) server applications transports