[GNUnet-SVN] r3791 - GNUnet

[grothoff]

Author: grothoff
Date: 2006-11-16 14:35:45 -0800 (Thu, 16 Nov 2006)
New Revision: 3791

Modified:
   GNUnet/configure.ac
Log:
ncursesw needs to be detected before trying dialog

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2006-11-16 21:55:21 UTC (rev 3790)
+++ GNUnet/configure.ac 2006-11-16 22:35:45 UTC (rev 3791)
@@ -377,6 +377,7 @@
 
 # GNUnet Setup
 dialog=0
+AC_CHECK_LIB([ncursesw],[wmove])
 AC_MSG_CHECKING([for dialog 1.0-20051207])
 AC_ARG_WITH(dialog,
    [  --with-dialog=PFX    Base of dialog installation],
@@ -386,26 +387,23 @@
         ;;
       yes)
         AC_CHECK_HEADERS(dialog.h,
-          AC_CHECK_LIB([ncursesw], [wmove], 
-            AC_CHECK_LIB([dialog], [dialog_menu],
-              dialog=1)))
+          AC_CHECK_LIB([dialog], [dialog_menu],
+            dialog=1))
         ;;
       *)
         LDFLAGS="-L$with_dialog/lib $LDFLAGS"
         CPPFLAGS="-I$with_dialog/include $CPPFLAGS"
         AC_CHECK_HEADERS(dialog.h,
-          AC_CHECK_LIB([ncursesw], [wmove], 
-            AC_CHECK_LIB([dialog], [dialog_menu],
-              EXT_LIB_PATH="-L$with_dialog/lib $EXT_LIB_PATH"
-              dialog=1)))
+          AC_CHECK_LIB([dialog], [dialog_menu],
+            EXT_LIB_PATH="-L$with_dialog/lib $EXT_LIB_PATH"
+              dialog=1))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-dialog not specified])
     AC_CHECK_HEADERS(dialog.h,
-      AC_CHECK_LIB([ncursesw], [wmove], 
-        AC_CHECK_LIB([dialog], [dialog_menu],
-          dialog=1)))])
+      AC_CHECK_LIB([dialog], [dialog_menu],
+          dialog=1))])
 
 AM_CONDITIONAL(HAVE_DIALOG, test x$dialog = x1)
 AC_DEFINE_UNQUOTED([HAVE_DIALOG], $dialog, [We have dialog])