[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: ChangeLog
User: ahvezda
Date: 05/03/13 22:43:11
Modified: . ChangeLog configure.ac
Log:
Removed gtk+ 1.2.x tests from configure.ac files. Minor symbol tweaks.
Revision Changes Path
1.28 +4 -0 eda/geda/devel/gattrib/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gattrib/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ChangeLog 11 Mar 2005 17:50:56 -0000 1.27
+++ ChangeLog 14 Mar 2005 03:43:11 -0000 1.28
@@ -1,3 +1,7 @@
+2005-03-13 Ales Hvezda <ahvezda@xxxxxxxxxxxxx>
+
+ * configure.ac: Removed all tests for gtk+ 1.2.x and fixed error message if gtk+ 2.2.x is not found.
+
2005-03-11 12:30 Stuart Brorson <sdb@xxxxxxxxxx>
* src/gtksheet*.c: Incorporated definitions of default_border*
as suggested by Carlos. A couple other possible bugfixes also.
1.9 +12 -42 eda/geda/devel/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/devel/gattrib/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- configure.ac 9 Mar 2005 04:06:16 -0000 1.8
+++ configure.ac 14 Mar 2005 03:43:11 -0000 1.9
@@ -28,9 +28,6 @@
# Change default location for rc files
AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
-# Force a specific version of gtk+
-AC_ARG_WITH(gtk12, [ --with-gtk12 Force the use of gtk+ 1.2.x], [opt_gtkver=1.2])
-
#
# Command line flags end
#########################################################################
@@ -83,10 +80,7 @@
############################################################################
-## This is supposed to first look for GTK2.2 and then for GTK1.2. Right now,
-## gattrib doesn't work with GTK2.X, therefore, most of this is commented out.
-## Reconfigure this when GTK-2.X actually works with gattrib.
-## Copied from configure.ac in geda.
+## This is looks for GTK2.2.
#
# Check for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -94,14 +88,11 @@
AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
-# Search for gtk+ 2.2.x first (only if we are not forcing the gtk+ to 1.2)
-if test "$opt_gtkver" != "1.2"
-then
- PKG_CHECK_MODULES(GTK22, gtk+-2.0 >= 2.2.0, GTK22="yes", no_GTK22="yes")
-fi
+# Search for gtk+ 2.2.x
+PKG_CHECK_MODULES(GTK22, gtk+-2.0 >= 2.2.0, GTK22="yes", no_GTK22="yes")
# This next bit of code figures out what gtk we need to use.
-if test "$GTK22" = "yes" -a "$opt_gtkver" != "1.2"
+if test "$GTK22" = "yes"
then
AC_DEFINE(HAS_GTK22, 1, [If gtk+ 2.2.x has been installed, define this])
@@ -122,41 +113,20 @@
## GTKITEMENTRY_SOURCE=gtkitementry_2_2.c gtkitementry_2_2.h
else
-
- # Search for gtk+ 1.2 now
- PKG_CHECK_MODULES(GTK12, gtk+ >= 1.2, GTK12="yes", no_GTK12="yes")
-
- AC_DEFINE(HAS_GTK12, 1, [If gtk+ 1.2.x has been installed, define this])
- GTK_CFLAGS=$GTK12_CFLAGS
- GTK_LIBS=$GTK12_LIBS
- GTK_VERSION=`$PKG_CONFIG gtk+ --modversion`
-
- # Search for glib
- PKG_CHECK_MODULES(GLIB12, glib >= 1.2, GLIB12="yes", no_GLIB12="yes")
- if test "$GLIB12" != "yes"
- then
- AC_MSG_ERROR([Cannot find glib >= 1.2, install it and rerun ./configure.])
- fi
- GLIB_CFLAGS=$GLIB12_CFLAGS
- GLIB_LIBS=$GLIB12_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib --modversion`
-
-## GTKITEMENTRY_SOURCE=gtkitementry_1_2.c gtkitementry_1_2.h
-
+ GTK_VERSION=""
fi
if test "$GTK_VERSION" = ""
then
- AC_MSG_ERROR([Cannot find gtk+ 2.2.x or gtk+ 1.2.x, install one of them.])
+ AC_MSG_ERROR([Cannot find gtk+ 2.2.x or later, please install gtk+.])
fi
## These tell Makefile.am which package to compile
-AM_CONDITIONAL(GTK12_SOURCE, test "$GLIB12" = "yes")
-AM_CONDITIONAL(GTK22_SOURCE, test "$GLIB22" = "yes" -a "$opt_gtkver" != "1.2")
+AM_CONDITIONAL(GTK22_SOURCE, test "$GLIB22" = "yes")
#
-# Check for gtk+ 1.2 and 2.2 end
+# Check for gtk+ 2.2 end
############################################################################