[GNUnet-SVN] r3073 - gnunet-gtk

[moon]

Author: moon
Date: 2006-06-28 09:51:34 -0700 (Wed, 28 Jun 2006)
New Revision: 3073

Modified:
   gnunet-gtk/configure.ac
Log:
cleared libgksu2 handling in configure
if GNUnet core isn't found, configure will now look to /usr/local before 
failing



Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2006-06-28 04:45:03 UTC (rev 3072)
+++ gnunet-gtk/configure.ac     2006-06-28 16:51:34 UTC (rev 3073)
@@ -180,8 +180,22 @@
     AC_CHECK_HEADERS(gnunet_util.h,
      AC_CHECK_LIB([GNUnet/gnunet_util.h], [initUtil],
       gnunet=1))])
+
+# if GNUnet was not found, try in /usr/local
 if test "$gnunet" != 1
 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_CHECK_HEADERS(GNUnet/gnunet_util.h,
+  AC_CHECK_LIB([gnunetutil], [initUtil],
+  EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
+  gnunet=1))
+fi
+
+if test "$gnunet" != 1
+then
  AC_MSG_ERROR([gnunet-gtk requires GNUnet])
 fi
 AC_CHECK_HEADERS([GNUnet/gnunet_ecrs_lib.h GNUnet/gnunet_fsui_lib.h 
GNUnet/gnunet_stats_lib.h GNUnet/gnunet_getoption_lib.h],,
@@ -289,38 +303,17 @@
     PKG_CHECK_MODULES(LIBGKSU2, libgksu2, have_libgksu2=yes, have_libgksu2=no)
     if test x$enable_libgksu2 = xauto ; then
         if test x$have_libgksu2 = xno ; then
-                AC_MSG_RESULT([not found, won't be enabled])
+                AC_MSG_RESULT([library or headers not found, won't be enabled])
         fi
     else 
         if test x$have_libgksu2 = xno ; then
-                AC_MSG_ERROR([libgksu2 explicitly required, and libgksu2 
library not found])
+                AC_MSG_ERROR([libgksu2 explicitly required, and libgksu2 
library or headers not found])
         fi
     fi
 fi
 AM_CONDITIONAL(HAVE_LIBGKSU2, test x$have_libgksu2 = xyes)
 if test x$have_libgksu2 = xyes ; then
-    # Find out the version of LIBGKSU2 we're using
-    libgksu2_version=`pkg-config --modversion libgksu2`
-    LIBGKSU2_VERSION_MAJOR=`echo $libgksu2_version | awk -F. '{print $1}'`
-    LIBGKSU2_VERSION_MINOR=`echo $libgksu2_version | awk -F. '{print $2}'`
-    LLIBGKSU2_VERSION_MICRO=`echo $libgksu2_version | awk -F. '{print $3}'`
-    if test "z$LIBGKSU2_VERSION_MAJOR" = "z"; then
-        LIBGKSU2_VERSION_MAJOR="0"
-    fi
-    if test "z$LIBGKSU2_VERSION_MINOR" = "z"; then
-        LIBGKSU2_VERSION_MINOR="0"
-    fi
-    if test "z$LIBGKSU2_VERSION_MICRO" = "z"; then
-        LIBGKSU2_VERSION_MICRO="0"
-    fi
-    echo "Your libgksu2 version is 
$LIBGKSU2_VERSION_MAJOR.$LIBGKSU2_VERSION_MINOR.$LIBGKSU2_VERSION_MICRO."
-    LIBGKSU2_CFLAGS="$LIBGKSU2_CFLAGS 
-DLIBGKSU2_VERSION_MAJOR=$LIBGKSU2_VERSION_MAJOR"
-    LIBGKSU2_CFLAGS="$LIBGKSU2_CFLAGS 
-DLIBGKSU2_VERSION_MINOR=$LIBGKSU2_VERSION_MINOR"
-    LIBGKSU2_CFLAGS="$LIBGKSU2_CFLAGS 
-DLIBGKSU2_VERSION_MICRO=$LIBGKSU2_VERSION_MICRO"
-    AC_SUBST([LIBGKSU2_CFLAGS])
-    AC_SUBST([LIBGKSU2_LIBS])
-
-    AC_DEFINE(WITH_LIBGKSU2,1,[Define if libgksu2 is enabled])
+    AC_DEFINE(WITH_LIBGKSU2,1,[Define whether libgksu2 is enabled])
 fi