LRN: compile against libgladeui-1 or 2

4 files changed, 69 insertions, 33 deletions

diff --git a/configure.ac b/configure.ac
index 5c9ad937..16ad763f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,6 @@ then
  CFLAGS="-fno-strict-aliasing $CFLAGS"
 fi
 
-
 # Check system type
 case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
@@ -161,42 +160,76 @@ AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h],,AC_MSG_ERROR([gnunet-gtk requires
 
 # test for Glade
 glade=0
+lookin=${prefix}
+GLADE_CPPFLAGS=""
+GLADE_LDFLAGS=""
+GLADE_CFLAGS=""
 AC_MSG_CHECKING(for Glade core)
 AC_ARG_WITH(glade,
-   [  --with-glade=PFX       Base of Glade installation],
+   [  --with-glade=PFX       Base of Glade installation (found with pkg-config if omitted)],
    [AC_MSG_RESULT([$with_glade])
     case $with_glade in
       no)
+        lookin=""
         ;;
       yes)
-        LDFLAGS="-L/usr/lib $LDFLAGS"
-        CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
-        AC_CHECK_HEADERS(gladeui/glade.h,
-          AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
-            glade=1))
+        lookin="${prefix}"
         ;;
       *)
-        LDFLAGS="-L$with_glade/lib $LDFLAGS"
-        CPPFLAGS="-I$with_glade/include/libgladeui-2.0 $CPPFLAGS"
-        AC_CHECK_HEADERS(gladeui/glade.h,
-          AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
-            EXT_LIB_PATH="-L$with_glade/lib $EXT_LIB_PATH"
-            glade=1))
+        lookin="$with_glade"
         ;;
     esac
    ],
-   [AC_MSG_RESULT([--with-glade not specified])
-    LDFLAGS="-L/usr/glade/lib $LDFLAGS"
-    CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
+   [
+     AC_MSG_RESULT([--with-glade not specified])
+     PKG_CHECK_MODULES([GLADE], [gladeui-1.0 >= 3.8.0], glade=1,
+       [
+       PKG_CHECK_MODULES([GLADE], [gladeui-2.0 >= 3.10.0], glade=2)
+       ]
+     )
+   ]
+)
+
+if test "x$glade" == "x0" -a ! "x$lookin" == "x"
+then
+  backup_LIBS="$LIBS"
+  backup_CFLAGS="$CFLAGS"
+  GLADE_LIBS="-L${lookin}/lib"
+  GLADE_CFLAGS="-I${lookin}/include/libgladeui-1.0"
+  LIBS="$GLADE_LIBS $backup_LIBS"
+  CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
+  AC_CHECK_HEADERS(gladeui/glade.h,
+    AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+      [glade=1]
+    )
+  )
+  if test "x$glade" == "x0"
+  then
+    GLADE_LIBS="-L${lookin}/lib"
+    GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0"
+    LIBS="$GLADE_LIBS $backup_LIBS"
+    CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
     AC_CHECK_HEADERS(gladeui/glade.h,
-     AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
-      glade=1))])
+      AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
+        glade=2)
+    )
+  fi
+  if test ! "x$glade" == "x0"
+  then
+    EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
+  fi
+  LIBS="$backup_LIBS"
+  CFLAGS="$backup_CFLAGS"
+fi
 
-if test "$glade" != 1
+if test "x$glade" == "x0"
 then
- AC_MSG_ERROR([gnunet-gtk requires Glade3 (library and headers)])
+  AC_MSG_ERROR([gnunet-gtk requires Glade3 (library and headers)])
 fi
 
+AC_SUBST(GLADE_CFLAGS)
+AC_SUBST(GLADE_LIBS)
+
 # test for GNUnet core
 gnunet=0
 AC_MSG_CHECKING(for GNUnet core)
@@ -247,7 +280,7 @@ if test "$gnunet" != 1
 then
  AC_MSG_ERROR([gnunet-gtk requires GNUnet])
 fi
-AC_CHECK_HEADERS([gnunet/gnunet_fs_service.h gnunet/gnunet_statistics_service.h gnunet/gnunet_core_service.h],,
+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]))
 
 SAVELIBS=$LIBS
@@ -259,8 +292,12 @@ AC_CHECK_LIB(gnunetstatistics,GNUNET_STATISTICS_get,,
              AC_MSG_ERROR([gnunet-gtk requires STATISTICS]))
 AC_CHECK_LIB(gnunetcore,GNUNET_CORE_connect,,
              AC_MSG_ERROR([gnunet-gtk requires CORE]))
-AC_CHECK_LIB(gladeui-2,glade_xml_node_new,,
-             AC_MSG_ERROR([gnunet-gtk requires glade3]))
+AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [],
+             [
+             AC_CHECK_LIB(gladeui-2,glade_xml_node_new,,
+                          AC_MSG_ERROR([gnunet-gtk requires glade3]))
+             ]
+            )
 LIBS=$SAVELIBS
 
 AC_SUBST(GNUNETGTK_CFLAGS)
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 134921a5..ee9970f6 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -157,7 +157,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
diff --git a/gnunet_gtk_config.h.in b/gnunet_gtk_config.h.in
index 1e1447e0..cbd21e92 100644
--- a/gnunet_gtk_config.h.in
+++ b/gnunet_gtk_config.h.in
@@ -15,14 +15,6 @@
 /* Define to 1 if you have the <argz.h> header file. */
 #undef HAVE_ARGZ_H
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
@@ -224,3 +216,9 @@
 
 /* This is a Windows system */
 #undef _WIN32
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
diff --git a/src/Makefile.am b/src/Makefile.am
index 480432f8..5d04f38d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = .
 INCLUDES = \
   -I$(top_srcdir)/ \
   @GTK_CFLAGS@ \
-  @GNUNETGTK_CFLAGS@
+  @GNUNETGTK_CFLAGS@ \
+  @GLADE_CFLAGS@
 
 bin_PROGRAMS = gnunet-gtk
 
@@ -26,6 +27,7 @@ gnunet_gtk_SOURCES = \
   peerinfo.c peerinfo.h
 gnunet_gtk_LDADD = \
   @GTK_LIBS@ \
+  @GLADE_LIBS@ \
   -lextractor \
   -lgnunetutil \
   -lgnunetpeerinfo \