[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-170-g1645fda)
The branch, master has been updated
via 1645fda42758a837c7ccf1efd32fd3b484e22421 (commit)
from 51c7b2770c01b851f4f7bd0624eed0533c69c376 (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
=========
gnetlist/configure.ac | 39 ---------------------------------------
gsymcheck/configure.ac | 40 ----------------------------------------
utils/configure.ac | 41 +----------------------------------------
3 files changed, 1 insertions(+), 119 deletions(-)
=================
Commit Messages
=================
commit 1645fda42758a837c7ccf1efd32fd3b484e22421
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 22:17:44 2009 +0000
Remove unused GTK dependencies from text-based tools
:100644 100644 a8ee8e1... 99b912b... M gnetlist/configure.ac
:100644 100644 7cf10d1... 6faddb1... M gsymcheck/configure.ac
:100644 100644 788e6a8... c41ecfb... M utils/configure.ac
=========
Changes
=========
commit 1645fda42758a837c7ccf1efd32fd3b484e22421
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 22:17:44 2009 +0000
Remove unused GTK dependencies from text-based tools
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index a8ee8e1..99b912b 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -232,44 +232,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
############################################################################
############################################################################
-# Check for gtk+ 2.4 start
-#
-
-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 "$GTK24" = "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"
- then
- AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.])
- fi
- GLIB_CFLAGS=$GLIB24_CFLAGS
- GLIB_LIBS=$GLIB24_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
-else
- GTK_VERSION=""
-fi
-
-if test "$GTK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
-fi
-
-#
-# Check for gtk+ 2.4 end
-############################################################################
-
-############################################################################
# Check for libgeda start
#
PKG_CHECK_MODULES(LIBGEDA, libgeda >= $DATE_VERSION, LIBGEDA="yes",
@@ -523,7 +485,6 @@ expandedPCBM4DIR=`eval "echo $PCBM4DIR"`
AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
- GTK+ library version: $GTK_VERSION
libgeda library version: $LIBGEDA_VERSION
mingw build: $MINGW
data directory: $expandedGEDADATADIR
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index 7cf10d1..6faddb1 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -141,45 +141,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
# Check for mics things start
############################################################################
-
-############################################################################
-# Check for gtk+ 2.4 start
-#
-
-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 "$GTK24" = "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"
- then
- AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.])
- fi
- GLIB_CFLAGS=$GLIB24_CFLAGS
- GLIB_LIBS=$GLIB24_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
-else
- GTK_VERSION=""
-fi
-
-if test "$GTK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
-fi
-
-#
-# Check for gtk+ 2.4 end
-############################################################################
-
############################################################################
# Check for libgeda start
#
@@ -322,7 +283,6 @@ expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
- GTK+ library version: $GTK_VERSION
libgeda library version: $LIBGEDA_VERSION
mingw build: $MINGW
data directory: $expandedGEDADATADIR
diff --git a/utils/configure.ac b/utils/configure.ac
index 788e6a8..c41ecfb 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -194,44 +194,6 @@ fi
############################################################################
############################################################################
-# Check for gtk+ 2.4 start
-#
-
-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 "$GTK24" = "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"
- then
- AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.])
- fi
- GLIB_CFLAGS=$GLIB24_CFLAGS
- GLIB_LIBS=$GLIB24_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
-else
- GTK_VERSION=""
-fi
-
-if test "$GTK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
-fi
-
-#
-# Check for gtk+ 2.4 end
-############################################################################
-
-############################################################################
# Check for glib 2.4 start
#
@@ -448,7 +410,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
GSCHLAS_CFLAGS="$LIBGEDA_CFLAGS"
-GSCHLAS_LDFLAGS="$LIBGEDA_LIBS $GTK_LIBS"
+GSCHLAS_LDFLAGS="$LIBGEDA_LIBS"
CONVERT_SYM_CFLAGS="$LIBGEDA_CFLAGS"
SARLACC_SCHEM_CFLAGS="$LIBGEDA_CFLAGS"
GMK_SYM_CFLASG=""
@@ -508,7 +470,6 @@ expandedPCBLIBPATH=`eval "echo $PCBLIBPATH"`
AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
- GTK+ library version: $GTK_VERSION
GLIB library version: $GLIB_VERSION
libgeda library version: $LIBGEDA_VERSION
mingw build: $MINGW
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs