gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-363-gee0eaa9)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ee0eaa9c885db7022b9cb5ef4ddf50b459fd92fc (commit)
      from  c13d8d0cee5f8d6695b5a8a6592a144bbacf86a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/configure.ac   |   30 ++++++++++--------------------
 gschem/configure.ac.in |    4 ++--
 2 files changed, 12 insertions(+), 22 deletions(-)


=================
 Commit Messages
=================

commit ee0eaa9c885db7022b9cb5ef4ddf50b459fd92fc
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Dec 11 14:49:40 2008 +0000

    gattrib: Bump GTK and GLIB version requirements to match gschem (2.8.x)
    
    Also remove a remaining 2.4 comment from the gschem configure.ac.in

:100644 100644 4a1848b... 373b709... M	gattrib/configure.ac
:100644 100644 4e36ffd... d00700c... M	gschem/configure.ac.in

=========
 Changes
=========

commit ee0eaa9c885db7022b9cb5ef4ddf50b459fd92fc
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Dec 11 14:49:40 2008 +0000

    gattrib: Bump GTK and GLIB version requirements to match gschem (2.8.x)
    
    Also remove a remaining 2.4 comment from the gschem configure.ac.in

diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 4a1848b..373b709 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -190,28 +190,22 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
 
 
 ############################################################################
-##  This is looks for GTK2.4.
+##  This is looks for GTK
 #                                                                                      
-# Search for gtk+ 2.4.x 
-PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
+# Search for gtk+ 2.8.x
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0, GTK="yes", no_GTK="yes")
 
 # This next bit of code figures out what gtk we need to use.
-if test "$GTK24" = "yes" 
+if test "$GTK" = "yes"
 then
-
-   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(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
-   if test "$GLIB24" != "yes"
+   PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.0, GLIB="yes", no_GLIB="yes")
+   if test "$GLIB" != "yes"
    then
-       AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.])
+       AC_MSG_ERROR([Cannot find glib 2.8.0 or later, please install it and rerun ./configure.])
    fi
-   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
@@ -227,19 +221,15 @@ else
    GTK_VERSION=""
 fi
 
-                                                                                      
 if test "$GTK_VERSION" = ""
 then
-   AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
+   AC_MSG_ERROR([Cannot find gtk+ 2.8.0 or later, please install it and rerun ./configure.])
 fi
 
-##  These tell Makefile.am which package to compile
-AM_CONDITIONAL(GTK24_SOURCE, test "$GLIB24" = "yes")
-                                                                                      
 #
-# Check for gtk+ 2.4 end
+# Check for gtk+ end
 ############################################################################
-                                                                                      
+
 
 ############################################################################
 # Check for libgeda start
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 4e36ffd..d00700c 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -256,7 +256,7 @@ fi
 ############################################################################
 
 ############################################################################
-# Check for gtk+ 2.4 start
+# Check for gtk+ start
 # 
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0, GTK="yes", no_GTK="yes")
@@ -291,7 +291,7 @@ then
 fi
 
 # 
-# Check for gtk+ 2.4 end
+# Check for gtk+ end
 ############################################################################
 
 ############################################################################




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs