[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15453 - gnunet-gtk
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15453 - gnunet-gtk |
Date: |
Tue, 7 Jun 2011 12:54:14 +0200 |
Author: grothoff
Date: 2011-06-07 12:54:14 +0200 (Tue, 07 Jun 2011)
New Revision: 15453
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/ltmain.sh
Log:
fixing build issues
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2011-06-07 10:49:53 UTC (rev 15452)
+++ gnunet-gtk/configure.ac 2011-06-07 10:54:14 UTC (rev 15453)
@@ -149,13 +149,15 @@
then
AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
else
- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)
+ AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?)
fi
+CFLAGS="$CFLAGS $GTK_CFLAGS"
+CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+LIBS="$LIBS $GTK_LIBS"
+AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h],,AC_MSG_ERROR([gnunet-gtk
requires GTK]))
-AC_CHECK_HEADERS([glib.h gmodule.h gtk/gtk.h])
-
# test for Glade
glade=0
AC_MSG_CHECKING(for Glade core)
@@ -167,16 +169,16 @@
;;
yes)
LDFLAGS="-L/usr/lib $LDFLAGS"
- CPPFLAGS="-I/usr/include/libgladeui-1.0 $CPPFLAGS"
+ CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
AC_CHECK_HEADERS(gladeui/glade.h,
- AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+ AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
glade=1))
;;
*)
LDFLAGS="-L$with_glade/lib $LDFLAGS"
- CPPFLAGS="-I$with_glade/include/libgladeui-1.0 $CPPFLAGS"
+ CPPFLAGS="-I$with_glade/include/libgladeui-2.0 $CPPFLAGS"
AC_CHECK_HEADERS(gladeui/glade.h,
- AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+ AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
EXT_LIB_PATH="-L$with_glade/lib $EXT_LIB_PATH"
glade=1))
;;
@@ -184,11 +186,16 @@
],
[AC_MSG_RESULT([--with-glade not specified])
LDFLAGS="-L/usr/glade/lib $LDFLAGS"
- CPPFLAGS="-I/usr/include/libgladeui-1.0 $CPPFLAGS"
+ CPPFLAGS="-I/usr/include/libgladeui-2.0 $CPPFLAGS"
AC_CHECK_HEADERS(gladeui/glade.h,
- AC_CHECK_LIB([gladeui-1], [glade_xml_node_new],
+ AC_CHECK_LIB([gladeui-2], [glade_xml_node_new],
glade=1))])
+if test "$glade" != 1
+then
+ AC_MSG_ERROR([gnunet-gtk requires Glade3 (library and headers)])
+fi
+
# test for GNUnet core
gnunet=0
AC_MSG_CHECKING(for GNUnet core)
Modified: gnunet-gtk/ltmain.sh
===================================================================
--- gnunet-gtk/ltmain.sh 2011-06-07 10:49:53 UTC (rev 15452)
+++ gnunet-gtk/ltmain.sh 2011-06-07 10:54:14 UTC (rev 15453)
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
TIMESTAMP=""
package_revision=1.3017
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15453 - gnunet-gtk,
gnunet <=