[GNUnet-SVN] r5931 - in GNUnet/src: . setup setup/gtk setup/lib setup/ncurses

[gnunet]

Author: durner
Date: 2007-12-16 05:20:15 -0700 (Sun, 16 Dec 2007)
New Revision: 5931

Modified:
   GNUnet/src/Makefile.am
   GNUnet/src/setup/Makefile.am
   GNUnet/src/setup/gnunet-setup.c
   GNUnet/src/setup/gtk/Makefile.am
   GNUnet/src/setup/gtk/wizard_gtk.c
   GNUnet/src/setup/lib/Makefile.am
   GNUnet/src/setup/ncurses/Makefile.am
Log:
build wizard-* on systems that lack Guile

Modified: GNUnet/src/Makefile.am
===================================================================
--- GNUnet/src/Makefile.am      2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/Makefile.am      2007-12-16 12:20:15 UTC (rev 5931)
@@ -1,7 +1,3 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
-if HAVE_GUILE
- setup_dir = setup
-endif
-
-SUBDIRS        = include util $(setup_dir) server applications transports
+SUBDIRS        = include util setup server applications transports

Modified: GNUnet/src/setup/Makefile.am
===================================================================
--- GNUnet/src/setup/Makefile.am        2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/setup/Makefile.am        2007-12-16 12:20:15 UTC (rev 5931)
@@ -11,8 +11,10 @@
 endif
 
 if !MINGW
+if HAVE_GUILE
  textdir=text
 endif
+endif
 
 SUBDIRS = lib $(textdir) . $(curses_dir) $(gtk_dir) $(qt_dir) .
 

Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c     2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/setup/gnunet-setup.c     2007-12-16 12:20:15 UTC (rev 5931)
@@ -44,7 +44,9 @@
 
 static struct GNUNET_GC_Configuration *cfg;
 
+#if HAVE_GUILE
 static struct GNUNET_GNS_Context *gns;
+#endif
 
 static char *cfgFilename;
 
@@ -118,6 +120,7 @@
   GNUNET_COMMAND_LINE_OPTION_END,
 };
 
+#if HAVE_GUILE
 static void
 gns2cfg (struct GNUNET_GNS_TreeNode *pos)
 {
@@ -150,6 +153,7 @@
         }
     }
 }
+#endif
 
 static int
 dyn_config (const char *module,
@@ -158,7 +162,7 @@
 {
   ConfigurationPluginMain mptr;
   struct GNUNET_PluginHandle *library;
-
+/*
 #ifdef MINGW
   if (strcmp (module, "setup_qt") == 0)
     {
@@ -171,7 +175,7 @@
       return system (sz) != -1 ? GNUNET_YES : GNUNET_NO;
     }
 #endif
-
+*/
   library = GNUNET_plugin_load (ectx, "libgnunet", module);
   if (!library)
     return GNUNET_SYSERR;
@@ -181,7 +185,13 @@
       GNUNET_plugin_unload (library);
       return GNUNET_SYSERR;
     }
-  mptr (argc, argv, library, ectx, cfg, gns, filename, config_daemon);
+  mptr (argc, argv, library, ectx, cfg,
+#if HAVE_GUILE
+   gns,
+#else
+   NULL,
+#endif
+    filename, config_daemon);
   GNUNET_plugin_unload (library);
   return GNUNET_YES;
 }
@@ -314,6 +324,7 @@
     GNUNET_GC_parse_configuration (cfg, cfgFilename);
   dirname = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
   GNUNET_GE_ASSERT (ectx, dirname != NULL);
+#if HAVE_GUILE
   specname =
     GNUNET_malloc (strlen (dirname) + strlen ("config-daemon.scm") + 1);
   strcpy (specname, dirname);
@@ -332,6 +343,7 @@
       return -1;
     }
   gns2cfg (GNUNET_GNS_get_tree_root (gns));
+#endif
   if (option_processing)
     {
       done = 0;
@@ -374,7 +386,9 @@
             done = 1;
           GNUNET_free (set_option);
         }
+#if HAVE_GUILE
       GNUNET_GNS_free_specification (gns);
+#endif
       GNUNET_GC_free (cfg);
       GNUNET_GE_free_context (ectx);
       GNUNET_free (cfgFilename);
@@ -396,7 +410,9 @@
                                  GNUNET_GE_FATAL | GNUNET_GE_USER |
                                  GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
                                  _("`%s' is not available."), operation);
+#if HAVE_GUILE
                   GNUNET_GNS_free_specification (gns);
+#endif
                   GNUNET_GC_free (cfg);
                   GNUNET_GE_free_context (ectx);
                   GNUNET_free (cfgFilename);
@@ -415,12 +431,16 @@
     {
       fprintf (stderr, _("Unknown operation `%s'\n"), operation);
       fprintf (stderr, _("Use --help to get a list of options.\n"));
+#if HAVE_GUILE
       GNUNET_GNS_free_specification (gns);
+#endif
       GNUNET_GC_free (cfg);
       GNUNET_GE_free_context (ectx);
       return 1;
     }
+#if HAVE_GUILE
   GNUNET_GNS_free_specification (gns);
+#endif
   GNUNET_GC_free (cfg);
   GNUNET_GE_free_context (ectx);
   return 0;

Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am    2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/setup/gtk/Makefile.am    2007-12-16 12:20:15 UTC (rev 5931)
@@ -16,9 +16,14 @@
 EXTRA_DIST = \
        $(pkgdata_DATA)
 
+if HAVE_GUILE
+       GUILE_SRC = \
+        about.c \
+        ngconf.c gconf.h
+endif
+
 libgnunetsetup_gtk_la_SOURCES = \
- about.c \
- ngconf.c gconf.h \
+ $(GUILE_SRC) \
  glade_support.h glade_support.c \
  wizard_gtk.c wizard_gtk.h
 

Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c   2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/setup/gtk/wizard_gtk.c   2007-12-16 12:20:15 UTC (rev 5931)
@@ -716,8 +716,10 @@
   gtk_main ();
   gdk_threads_leave ();
   destroyMainXML ();
+#if HAVE_GUILE
   if (doOpenEnhConfigurator)
     gconf_main_post_init (self, ectx, cfg, gns, filename, is_daemon);
+#endif
   GNUNET_free_non_null (user_name);
   GNUNET_free_non_null (group_name);
   setLibrary (NULL);

Modified: GNUnet/src/setup/lib/Makefile.am
===================================================================
--- GNUnet/src/setup/lib/Makefile.am    2007-12-16 12:18:28 UTC (rev 5930)
+++ GNUnet/src/setup/lib/Makefile.am    2007-12-16 12:20:15 UTC (rev 5931)
@@ -9,9 +9,14 @@
 
 lib_LTLIBRARIES = libgnunetsetup.la
 
+if HAVE_GUILE
+       GUILE_SRC = \
+         gns.c \
+         tree.c tree.h
+endif
+
 libgnunetsetup_la_SOURCES = \
-  gns.c \
-  tree.c tree.h \
+       $(GUILE_SRC) \
   wizard_util.c wizard_util.h
 
 libgnunetsetup_la_LIBADD = \

Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am        2007-12-16 12:18:28 UTC (rev 
5930)
+++ GNUnet/src/setup/ncurses/Makefile.am        2007-12-16 12:20:15 UTC (rev 
5931)
@@ -8,8 +8,13 @@
 plugin_LTLIBRARIES = \
  libgnunetsetup_curses.la
 
+if HAVE_GUILE
+       GUILE_SRC = \
+        mconf.c mconf.h
+endif
+
 libgnunetsetup_curses_la_SOURCES = \
- mconf.c mconf.h \
+ $(GUILE_SRC) \
  wizard_curs.c wizard_curs.h
 
 libgnunetsetup_curses_la_LDFLAGS = \