[GNUnet-SVN] r6608 - in GNUnet: . src/setup src/setup/ncurses

[gnunet]

Author: amatus
Date: 2008-03-23 21:21:00 -0600 (Sun, 23 Mar 2008)
New Revision: 6608

Modified:
   GNUnet/configure.ac
   GNUnet/src/setup/Makefile.am
   GNUnet/src/setup/ncurses/Makefile.am
   GNUnet/src/setup/ncurses/mconf.c
   GNUnet/src/setup/ncurses/wizard_curs.c
Log:
Some fixes for FreeBSD cdialog package, it actually works now

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2008-03-23 20:41:16 UTC (rev 6607)
+++ GNUnet/configure.ac 2008-03-24 03:21:00 UTC (rev 6608)
@@ -463,6 +463,10 @@
       AC_CHECK_LIB([dialog], [dlg_menu],
           dialog=1))])
 
+AM_CONDITIONAL(HAVE_DIALOG, test x$dialog = x1)
+AC_DEFINE_UNQUOTED([HAVE_DIALOG], $dialog, [We have dialog])
+
+cdialog=0
 AC_ARG_WITH(cdialog,
    [  --with-cdialog=PFX    Base of cdialog installation],
    [AC_MSG_RESULT([$with_cdialog])
@@ -472,7 +476,7 @@
       yes)
         AC_CHECK_HEADERS(cdialog/dialog.h,
           AC_CHECK_LIB([cdialog], [dlg_menu],
-            dialog=1))
+            cdialog=1))
         ;;
       *)
         LDFLAGS="-L$with_cdialog/lib $LDFLAGS"
@@ -480,17 +484,17 @@
         AC_CHECK_HEADERS(cdialog/dialog.h,
           AC_CHECK_LIB([cdialog], [dlg_menu],
             EXT_LIB_PATH="-L$with_cdialog/lib $EXT_LIB_PATH"
-              dialog=1))
+              cdialog=1))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-cdialog not specified])
     AC_CHECK_HEADERS(cdialog/dialog.h,
       AC_CHECK_LIB([cdialog], [dlg_menu],
-          dialog=1))])
+          cdialog=1))])
 
-AM_CONDITIONAL(HAVE_DIALOG, test x$dialog = x1)
-AC_DEFINE_UNQUOTED([HAVE_DIALOG], $dialog, [We have dialog])
+AM_CONDITIONAL(HAVE_CDIALOG, test x$cdialog = x1)
+AC_DEFINE_UNQUOTED([HAVE_CDIALOG], $cdialog, [We have cdialog])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -944,7 +948,7 @@
 fi
 
 
-if test "$dialog" != 1
+if test "$dialog" != 1 -a "$cdialog" != 1
 then
  AC_MSG_NOTICE([NOTICE: curses based gnunet-setup frontends will not be 
installed.])
 fi

Modified: GNUnet/src/setup/Makefile.am
===================================================================
--- GNUnet/src/setup/Makefile.am        2008-03-23 20:41:16 UTC (rev 6607)
+++ GNUnet/src/setup/Makefile.am        2008-03-24 03:21:00 UTC (rev 6608)
@@ -9,6 +9,9 @@
 if HAVE_DIALOG
  curses_dir = ncurses
 endif
+if HAVE_CDIALOG
+ curses_dir = ncurses
+endif
 
 if !MINGW
 if HAVE_GUILE

Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am        2008-03-23 20:41:16 UTC (rev 
6607)
+++ GNUnet/src/setup/ncurses/Makefile.am        2008-03-24 03:21:00 UTC (rev 
6608)
@@ -19,8 +19,16 @@
  $(GUILE_SRC) \
  wizard_curs.c wizard_curs.h
 
+if HAVE_DIALOG
+DIALOG_LIBS = -ldialog
+endif
+
+if HAVE_CDIALOG
+DIALOG_LIBS = -lcdialog
+endif
+
 libgnunetsetup_curses_la_LDFLAGS = \
- -lncursesw -ldialog -lm \
+ -lncursesw $(DIALOG_LIBS) -lm \
  -export-dynamic -avoid-version -module
 
 libgnunetsetup_curses_la_LIBADD = \

Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c    2008-03-23 20:41:16 UTC (rev 6607)
+++ GNUnet/src/setup/ncurses/mconf.c    2008-03-24 03:21:00 UTC (rev 6608)
@@ -24,11 +24,21 @@
  * @author Christian Grothoff
  */
 
-#include <dialog.h>
+#include "platform.h"
 
-#undef _
+
+#ifdef HAVE_CDIALOG_DIALOG_H
+# undef PACKAGE
+# undef _
+# include <cdialog/dialog.h>
+#else
+# ifdef HAVE_DIALOG_H
+#  include <dialog.h>
+# endif
+#endif
+
+
 #undef GNUNET_OK
-#include "platform.h"
 #include "gnunet_util.h"
 #include "gnunet_setup_lib.h"
 

Modified: GNUnet/src/setup/ncurses/wizard_curs.c
===================================================================
--- GNUnet/src/setup/ncurses/wizard_curs.c      2008-03-23 20:41:16 UTC (rev 
6607)
+++ GNUnet/src/setup/ncurses/wizard_curs.c      2008-03-24 03:21:00 UTC (rev 
6608)
@@ -31,11 +31,19 @@
  * - share helper functions with mconf.c (refactoring)
  */
 
-#include <dialog.h>
+#include "platform.h"
 
-#undef _
+#ifdef HAVE_CDIALOG_DIALOG_H
+# undef PACKAGE
+# undef _
+# include <cdialog/dialog.h>
+#else
+# ifdef HAVE_DIALOG_H
+#  include <dialog.h>
+# endif
+#endif
+
 #undef GNUNET_OK
-#include "platform.h"
 #include "gnunet_util.h"
 #include "gnunet_setup_lib.h"