LRN: also use CPPFLAGS

3 files changed, 14 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 16ad763f..64fefda3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,10 +194,13 @@ if test "x$glade" == "x0" -a ! "x$lookin" == "x"
 then
   backup_LIBS="$LIBS"
   backup_CFLAGS="$CFLAGS"
+  backup_CPPFLAGS="$CPPFLAGS"
   GLADE_LIBS="-L${lookin}/lib"
   GLADE_CFLAGS="-I${lookin}/include/libgladeui-1.0"
+  GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-1.0"
   LIBS="$GLADE_LIBS $backup_LIBS"
   CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
+  CPPFLAGS="$GLADE_CPPFLAGS $backup_CPPFLAGS"
   AC_CHECK_HEADERS(gladeui/glade.h,
     AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
       [glade=1]
@@ -207,8 +210,10 @@ then
   then
     GLADE_LIBS="-L${lookin}/lib"
     GLADE_CFLAGS="-I${lookin}/include/libgladeui-2.0"
+    GLADE_CPPFLAGS="-I${lookin}/include/libgladeui-2.0"
     LIBS="$GLADE_LIBS $backup_LIBS"
     CFLAGS="$GLADE_CFLAGS $backup_CFLAGS"
+    CPPFLAGS="$GLADE_CPPFLAGS $backup_CPPFLAGS"
     AC_CHECK_HEADERS(gladeui/glade.h,
       AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
         glade=2)
@@ -220,6 +225,7 @@ then
   fi
   LIBS="$backup_LIBS"
   CFLAGS="$backup_CFLAGS"
+  CPPFLAGS="$backup_CPPFLAGS"
 fi
 
 if test "x$glade" == "x0"
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index ee9970f6..d42999f1 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -44,8 +44,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
         $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
         $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
         $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -144,6 +145,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLADE_CFLAGS = @GLADE_CFLAGS@
+GLADE_LIBS = @GLADE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
diff --git a/gnunet_gtk_config.h.in b/gnunet_gtk_config.h.in
index cbd21e92..37a2a5bc 100644
--- a/gnunet_gtk_config.h.in
+++ b/gnunet_gtk_config.h.in
@@ -74,6 +74,9 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
+/* Define to 1 if you have the `gladeui-1' library (-lgladeui-1). */
+#undef HAVE_LIBGLADEUI_1
+
 /* Define to 1 if you have the `gladeui-2' library (-lgladeui-2). */
 #undef HAVE_LIBGLADEUI_2