LRN: Sane check for gnunet (nicer)

2 files changed, 45 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 64fefda3..90df7609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ AC_ARG_WITH(glade,
 
 if test "x$glade" == "x0" -a ! "x$lookin" == "x"
 then
+  AC_MSG_CHECKING(for Glade3 in $lookin)
   backup_LIBS="$LIBS"
   backup_CFLAGS="$CFLAGS"
   backup_CPPFLAGS="$CPPFLAGS"
@@ -238,58 +239,73 @@ AC_SUBST(GLADE_LIBS)
 
 # test for GNUnet core
 gnunet=0
+lookin=${prefix}
+GNUNET_CFLAGS=""
+GNUNET_CPPFLAGS=""
+GNUNET_LIBS=""
 AC_MSG_CHECKING(for GNUnet core)
 AC_ARG_WITH(gnunet,
    [  --with-gnunet=PFX       Base of GNUnet installation],
    [AC_MSG_RESULT([$with_gnunet])
     case $with_gnunet in
       no)
+        lookin=""
         ;;
       yes)
-        LDFLAGS="-L/usr/lib $LDFLAGS"
-        CPPFLAGS="-I/usr/include $CPPFLAGS"
-        AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-          AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-            gnunet=1))
+        lookin="${prefix}"
         ;;
       *)
-        LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
-        CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
-        AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-          AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-            EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
-            gnunet=1))
+        lookin="$with_gnunet"
         ;;
     esac
    ],
-   [AC_MSG_RESULT([--with-gnunet not specified])
-    LDFLAGS="-L/usr/lib $LDFLAGS"
-    CPPFLAGS="-I/usr/include $CPPFLAGS"
-    AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-     AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-      gnunet=1))])
+   [
+     AC_MSG_RESULT([--with-gnunet not specified])
+     PKG_CHECK_MODULES([GNUNET], [gnunetutil >= 0.9.0], gnunet=1)
+   ]
+)
 
-# if GNUnet was not found, try in /usr/local
-if test "$gnunet" != 1
+if test "x$gnunet" == "x0" -a ! "x$lookin" == "x"
 then
-AC_MSG_CHECKING(for GNUnet core in /usr/local)
-with_gnunet=/usr/local
-  LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
-  CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
+  AC_MSG_CHECKING(for GNUnet util library in $lookin)
+  backup_LIBS="$LIBS"
+  backup_CFLAGS="$CFLAGS"
+  backup_CPPFLAGS="$CPPFLAGS"
+  GNUNET_LIBS="-L${lookin}/lib"
+  GNUNET_CFLAGS="-I${lookin}/include"
+  GNUNET_CPPFLAGS="-I${lookin}/include"
+  LIBS="$GNUNET_LIBS $backup_LIBS"
+  CFLAGS="$GNUNET_CFLAGS $backup_CFLAGS"
+  CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
   AC_CHECK_HEADERS([gnunet/platform.h gnunet/gnunet_util_lib.h],
-  AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
-  EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
-  gnunet=1))
+    AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_],
+      [
+        gnunet=1
+        EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+      ]
+    )
+  )
+  LIBS="$backup_LIBS"
+  CFLAGS="$backup_CFLAGS"
+  CPPFLAGS="$backup_CPPFLAGS"
 fi
 
-if test "$gnunet" != 1
+if test "x$gnunet" == "x0"
 then
- AC_MSG_ERROR([gnunet-gtk requires GNUnet])
+  AC_MSG_ERROR([gnunet-gtk requires GNUnet])
 fi
+
+AC_SUBST(GNUNET_CFLAGS)
+AC_SUBST(GNUNET_LIBS)
+
+backup_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS"
 AC_CHECK_HEADERS([gnunet/gnunet_fs_service.h gnunet/gnunet_statistics_service.h gnunet/gnunet_core_service.h], [],
                  AC_MSG_ERROR([compiling gnunet-gtk requires GNUnet core headers]))
+CPPFLAGS="$backup_CPPFLAGS"
 
 SAVELIBS=$LIBS
+LIBS="$GNUNET_LIBS $LIBS"
 AC_CHECK_LIB(gnunetutil,GNUNET_log,,
              AC_MSG_ERROR([gnunet-gtk requires libgnunetutil]))
 AC_CHECK_LIB(gnunetfs,GNUNET_FS_uri_to_string,,
@@ -306,8 +322,6 @@ AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [],
             )
 LIBS=$SAVELIBS
 
-AC_SUBST(GNUNETGTK_CFLAGS)
-AC_SUBST(GNUNETGTK_LIBS)
 AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data])
 
 # Set PACKAGE_SOURCE_DIR in gnunet_gtk_config.h.
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d04f38d..30d1d1f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 INCLUDES = \
   -I$(top_srcdir)/ \
   @GTK_CFLAGS@ \
-  @GNUNETGTK_CFLAGS@ \
+  @GNUNET_CFLAGS@ \
   @GLADE_CFLAGS@
 
 bin_PROGRAMS = gnunet-gtk