[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: ChangeLog
User: ahvezda
Date: 06/08/31 21:05:00
Modified: . ChangeLog configure.ac
Log:
Updated all configure.ac files to test for gtk+ 2.4.x which is the min
requirement now.
Revision Changes Path
1.49 +4 -0 eda/geda/gaf/gattrib/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- ChangeLog 22 Aug 2006 18:20:43 -0000 1.48
+++ ChangeLog 1 Sep 2006 01:05:00 -0000 1.49
@@ -1,3 +1,7 @@
+2006-08-31 Ales Hvezda <ahvezda@xxxxxxxxxxxxx>
+
+ * configure.ac: Updated gtk+ tests to look for 2.4.x or greater.
+
2006-08-21 SDB <sdb@xxxxxxxxxx>
* include/prototype.h, src/s_table.c, src/s_toplevel.c: Fixed
1.17 +15 -15 eda/geda/gaf/gattrib/configure.ac
(In the diff below, changes in quantity of whitespace are not shown.)
Index: configure.ac
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- configure.ac 25 Aug 2006 01:00:06 -0000 1.16
+++ configure.ac 1 Sep 2006 01:05:00 -0000 1.17
@@ -80,7 +80,7 @@
############################################################################
-## This is looks for GTK2.2.
+## This is looks for GTK2.4.
#
# Check for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -88,26 +88,26 @@
AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
-# Search for gtk+ 2.2.x
-PKG_CHECK_MODULES(GTK22, gtk+-2.0 >= 2.2.0, GTK22="yes", no_GTK22="yes")
+# Search for gtk+ 2.4.x
+PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
# This next bit of code figures out what gtk we need to use.
-if test "$GTK22" = "yes"
+if test "$GTK24" = "yes"
then
- AC_DEFINE(HAS_GTK22, 1, [If gtk+ 2.2.x has been installed, define this])
- GTK_CFLAGS=$GTK22_CFLAGS
- GTK_LIBS=$GTK22_LIBS
+ AC_DEFINE(HAS_GTK24, 1, [If gtk+ 2.4.x has been installed, define this])
+ GTK_CFLAGS=$GTK24_CFLAGS
+ GTK_LIBS=$GTK24_LIBS
GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
# Search for glib
- PKG_CHECK_MODULES(GLIB22, glib-2.0 >= 2.2.0, GLIB22="yes", no_GLIB22="yes")
- if test "$GLIB22" != "yes"
+ PKG_CHECK_MODULES(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
+ if test "$GLIB24" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.2.x, install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.])
fi
- GLIB_CFLAGS=$GLIB22_CFLAGS
- GLIB_LIBS=$GLIB22_LIBS
+ GLIB_CFLAGS=$GLIB24_CFLAGS
+ GLIB_LIBS=$GLIB24_LIBS
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
## GTKITEMENTRY_SOURCE=gtkitementry_2_2.c gtkitementry_2_2.h
@@ -119,14 +119,14 @@
if test "$GTK_VERSION" = ""
then
- AC_MSG_ERROR([Cannot find gtk+ 2.2.x or later, please install gtk+.])
+ AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
fi
## These tell Makefile.am which package to compile
-AM_CONDITIONAL(GTK22_SOURCE, test "$GLIB22" = "yes")
+AM_CONDITIONAL(GTK24_SOURCE, test "$GLIB24" = "yes")
#
-# Check for gtk+ 2.2 end
+# Check for gtk+ 2.4 end
############################################################################
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs