[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:25
Modified: . ChangeLog configure.ac
Log:
Removed gtk+ 1.2.x tests from configure.ac files. Minor symbol tweaks.
Revision Changes Path
1.265 +5 -0 eda/geda/devel/libgeda/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- ChangeLog 12 Mar 2005 23:28:56 -0000 1.264
+++ ChangeLog 14 Mar 2005 03:43:24 -0000 1.265
@@ -1,3 +1,8 @@
+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 Patrick Bernaud <b-patrick@xxxxxxxxxx>
* noweb/g_rc.nw (g_rc_map_font_character_to_file): Adapted for the
1.22 +13 -45 eda/geda/devel/libgeda/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/libgeda/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- configure.ac 9 Mar 2005 04:07:12 -0000 1.21
+++ configure.ac 14 Mar 2005 03:43:24 -0000 1.22
@@ -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
#########################################################################
@@ -204,7 +201,7 @@
############################################################################
############################################################################
-# Check for gtk+ 1.2 and 2.2 start
+# Check for gtk+ 2.2 start
#
# Check for pkg-config
@@ -213,14 +210,10 @@
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
+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])
@@ -239,37 +232,20 @@
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
else
-
- # Search for gtk+ 1.2 now
- PKG_CHECK_MODULES(GTK12, gtk+ >= 1.2.3, 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.3, GLIB12="yes", no_GLIB12="yes")
- if test "$GLIB12" != "yes"
- then
- AC_MSG_ERROR([Cannot find glib >= 1.2.3, install it and rerun ./configure.])
- fi
- GLIB_CFLAGS=$GLIB12_CFLAGS
- GLIB_LIBS=$GLIB12_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib --modversion`
+ 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
#
-# Check for gtk+ 1.2 and 2.2 end
+# Check for gtk+ 2.2 end
############################################################################
############################################################################
-# Check for gdk
+# Check for gdk 2.2 or later
#
# Check for pkg-config
@@ -278,14 +254,10 @@
AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
-# Search for gdk (only if we are not forcing the gtk+ to 1.2)
-if test "$opt_gtkver" != "1.2"
-then
- PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.2.0, GDK="yes", no_GDK="yes")
-fi
+PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.2.0, GDK="yes", no_GDK="yes")
# This next bit of code figures out what gtk we need to use.
-if test "$GDK" = "yes" -a "$opt_gtkver" != "1.2"
+if test "$GDK" = "yes"
then
AC_DEFINE(HAS_GDK, 1, [If gdk has been installed, define this])
@@ -297,7 +269,7 @@
if test "$GDK_VERSION" = ""
then
- AC_MSG_ERROR([Cannot find gdk.])
+ AC_MSG_ERROR([Cannot find gdk, please make sure it is installed.])
fi
#
@@ -314,14 +286,10 @@
AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
-# Search for gdk-pixbuf (only if we are not forcing the gtk+ to 1.2)
-if test "$opt_gtkver" != "1.2"
-then
- PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 0.15.0, GDK_PIXBUF="yes", no_GDK_PIXBUF="yes")
-fi
+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 0.15.0, GDK_PIXBUF="yes", no_GDK_PIXBUF="yes")
# This next bit of code figures out what gtk we need to use.
-if test "$GDK_PIXBUF" = "yes" -a "$opt_gtkver" != "1.2"
+if test "$GDK_PIXBUF" = "yes"
then
AC_DEFINE(HAS_GDK_PIXBUF, 1, [If gdk-pixbuf has been installed, define this])
@@ -333,7 +301,7 @@
if test "$GDK_PIXBUF_VERSION" = ""
then
- AC_MSG_ERROR([Cannot find gdk-pixbuf.])
+ AC_MSG_ERROR([Cannot find gdk-pixbuf, please make sure it is installed.])
fi
#