[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-193-ga85d470)
The branch, master has been updated
via a85d470427b905a5079ed1515034410fc3875ceb (commit)
from ff6ea4955d0490d6436bc74d840325e76098304f (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
=========
Makefile.am | 5 +++-
configure.ac | 2 +
m4/geda-gattrib.m4 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 1 deletions(-)
create mode 100644 m4/geda-gattrib.m4
=================
Commit Messages
=================
commit a85d470427b905a5079ed1515034410fc3875ceb
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Check for versions of gtk that are too new for gattrib.
Since gattrib currently doesn't build with the most recent version of
gtk, add a check for max allowed gtk version. If the installed gtk
is too recent then error out and suggest the use of --disable-gattrib.
Implement --disable-gattrib to go along with the above check. Long
term we need to fix gattrib, but that is more involved and this allows
the rest of gEDA/gaf to still be build on the newest of systems.
:100644 100644 8e112f4... d728ee6... M Makefile.am
:100644 100644 73783d8... c6cdccf... M configure.ac
:000000 100644 0000000... aaa20a8... A m4/geda-gattrib.m4
=========
Changes
=========
commit a85d470427b905a5079ed1515034410fc3875ceb
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Check for versions of gtk that are too new for gattrib.
Since gattrib currently doesn't build with the most recent version of
gtk, add a check for max allowed gtk version. If the installed gtk
is too recent then error out and suggest the use of --disable-gattrib.
Implement --disable-gattrib to go along with the above check. Long
term we need to fix gattrib, but that is more involved and this allows
the rest of gEDA/gaf to still be build on the newest of systems.
diff --git a/Makefile.am b/Makefile.am
index 8e112f4..d728ee6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = intl libgeda gschem gattrib gsymcheck gnetlist utils symbols docs \
+if ENABLE_GATTRIB
+GATTRIB_DIR=gattrib
+endif
+SUBDIRS = intl libgeda gschem ${GATTRIB_DIR} gsymcheck gnetlist utils symbols docs \
examples
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 73783d8..c6cdccf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,8 @@ AX_OPTION_KDE3_DATA
AX_OPTION_XDG_DB
# libstroke support
AX_OPTION_STROKE
+# gattrib
+AX_OPTION_GATTRIB
#####################################################################
# Tool-specific setup
diff --git a/m4/geda-gattrib.m4 b/m4/geda-gattrib.m4
new file mode 100644
index 0000000..aaa20a8
--- /dev/null
+++ b/m4/geda-gattrib.m4
@@ -0,0 +1,59 @@
+# geda-gattrib.m4 -*-Autoconf-*-
+# serial 1.0
+
+dnl Optionally disable assertions
+dnl Copyright (C) 2009 Dan McMahill <dan@xxxxxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+# Check if gattrib should be disabled
+AC_DEFUN([AX_OPTION_GATTRIB],
+[
+ AC_PREREQ([2.60])dnl
+
+ AC_MSG_CHECKING([whether to enable gattrib])
+ AC_ARG_ENABLE([gattrib],
+ [AS_HELP_STRING([--disable-gattrib], [turn off building and installing gattrib])],
+ [], [enable_gattrib="yes"])
+
+ if test "X$enable_gattrib" = "Xyes"; then
+ AC_MSG_RESULT([yes])
+ # currently (2009-08-16) gattrib will not build with gtk version 2.17.4 and
+ # newer. This is because gattrib accesses some internal private gtk variables
+ # that changed. It will probably take a fair amount of rewriting of
+ # gattrib to fix this.
+ AC_MSG_CHECKING([if the installed version of gtk is compatible with gattrib])
+
+ _max_gtk_version=2.17.3
+ $PKG_CONFIG --max-version=${_max_gtk_version} gtk+-2.0
+ _gtk_ok=$?
+
+ if test ${_gtk_ok} -eq 0 ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _GTK_VER="`${PKG_CONFIG} --modversion gtk+-2.0`"
+ AC_MSG_ERROR([Currently gattrib is not compatible with gtk versions newer than
+${_max_gtk_version}. It appears that you have ${_GTK_VER} installed. Either
+downgrade your gtk installation or configure with --disable-gattrib])
+ fi
+
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ AM_CONDITIONAL([ENABLE_GATTRIB], test "X$enable_gattrib" = "Xyes")
+
+])dnl AX_OPTION_GATTRIB
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs