From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFkaA-0004Rl-GZ for garchives@archives.gentoo.org; Fri, 29 Apr 2011 10:05:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 911481C059; Fri, 29 Apr 2011 10:05:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C1231C059 for ; Fri, 29 Apr 2011 10:05:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D8991B408A for ; Fri, 29 Apr 2011 10:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A160E80504 for ; Fri, 29 Apr 2011 10:05:45 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1c8a1fdbc046a0feb2460af9d212ae9e7e98f7fb.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/files/9999-gsl.patch sci-chemistry/coot/files/9999-openmp.patch sci-chemistry/coot/files/9999-rappermc.patch sci-chemistry/coot/files/fix-namespace-error.patch sci-chemistry/coot/files/glib.m4 sci-chemistry/coot/files/gtk.m4 X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1c8a1fdbc046a0feb2460af9d212ae9e7e98f7fb Date: Fri, 29 Apr 2011 10:05:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 009c086d5ede922a01f3b3b45ce3101d commit: 1c8a1fdbc046a0feb2460af9d212ae9e7e98f7fb Author: Justin Lecher gentoo org> AuthorDate: Thu Apr 28 08:10:39 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Apr 28 08:10:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D1c8a1fdb Cleaned old patches (Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/coot/ChangeLog | 5 + sci-chemistry/coot/files/9999-gsl.patch | 14 -- sci-chemistry/coot/files/9999-openmp.patch | 28 --- sci-chemistry/coot/files/9999-rappermc.patch | 15 -- sci-chemistry/coot/files/fix-namespace-error.patch | 52 ----- sci-chemistry/coot/files/glib.m4 | 196 --------------= ----- sci-chemistry/coot/files/gtk.m4 | 199 --------------= ------ 7 files changed, 5 insertions(+), 504 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index edb77b6..c44d9a6 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 28 Apr 2011; Justin Lecher -files/9999-gsl.patch, + -files/9999-openmp.patch, -files/9999-rappermc.patch, + -files/fix-namespace-error.patch, -files/glib.m4, -files/gtk.m4: + Cleaned old patches + 07 Mar 2011; Justin Lecher coot-9999.ebuild: Correct Slots for gtk 3 introduction to tree =20 diff --git a/sci-chemistry/coot/files/9999-gsl.patch b/sci-chemistry/coot= /files/9999-gsl.patch deleted file mode 100644 index af7a405..0000000 --- a/sci-chemistry/coot/files/9999-gsl.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: coot-utils/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- coot-utils/Makefile.am (revision 3299) -+++ coot-utils/Makefile.am (working copy) -@@ -90,7 +90,8 @@ - $(top_builddir)/mini-mol/libcoot-mini-mol.la \ - libcoot-map-utils.la \ - libcoot-coord-utils.la \ -- $(top_builddir)/utils/libcoot-utils.la -+ $(top_builddir)/utils/libcoot-utils.la \ -+ $(GSL_LIBS) -=20 -=20 - noinst_PROGRAMS =3D test-h-bonds testshelxreader testcootutils diff --git a/sci-chemistry/coot/files/9999-openmp.patch b/sci-chemistry/c= oot/files/9999-openmp.patch deleted file mode 100644 index a239c1f..0000000 --- a/sci-chemistry/coot/files/9999-openmp.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: surface/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- surface/Makefile.am (revision 3299) -+++ surface/Makefile.am (working copy) -@@ -1,7 +1,7 @@ -=20 - INCLUDES =3D -I$(top_srcdir)/coot-utils $(MMDB_CXXFLAGS) $(CLIPPER_CXXF= LAGS) $(FFTW_CXXFLAGS) -=20 --AM_CPPFLAGS =3D $(OPENMP_CFLAGS) -+AM_CXXFLAGS =3D $(OPENMP_CFLAGS) -=20 - lib_LTLIBRARIES =3D libccp4mg-surface.la -=20 -Index: src/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- src/Makefile.am (revision 3299) -+++ src/Makefile.am (working copy) -@@ -417,8 +417,8 @@ - # coot_real_LDFLAGS =3D -static -lstdc++ - coot_real_LDFLAGS =3D -=20 --coot_real_LDADD =3D $(OPENMP_CFLAGS) \ -- $(COOT_EXTRA_LIBS) \ -+coot_real_LDADD =3D \ -+ $(COOT_EXTRA_LIBS) \ - $(GUILE_GTK_LIBS) \ - $(GUILE_LDFLAGS) \ - $(CLIPPER_LIBS) \ diff --git a/sci-chemistry/coot/files/9999-rappermc.patch b/sci-chemistry= /coot/files/9999-rappermc.patch deleted file mode 100644 index 7b8ba03..0000000 --- a/sci-chemistry/coot/files/9999-rappermc.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: python/a_rapper_gui.py -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- python/a_rapper_gui.py (revision 2425) -+++ python/a_rapper_gui.py (working copy) -@@ -20,8 +20,8 @@ - home_dir =3D os.getenv('COOT_HOME') - else: - home_dir =3D os.getenv('HOME') --rapper_dir =3D os.path.join(os.path.normpath(home_dir), "rappermc") --rapper_command =3D "rapper" -+rapper_dir =3D "/usr/share/rapper" -+rapper_command =3D "rappermc" -=20 - def rapper_process(): - #needed? diff --git a/sci-chemistry/coot/files/fix-namespace-error.patch b/sci-che= mistry/coot/files/fix-namespace-error.patch deleted file mode 100644 index 5bf8a2d..0000000 --- a/sci-chemistry/coot/files/fix-namespace-error.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- coot-utils/coot-coord-utils.cc.orig 2007-11-14 09:38:31.000000000 -0= 800 -+++ coot-utils/coot-coord-utils.cc 2007-11-14 09:44:50.000000000 -0800 -@@ -395,28 +395,30 @@ - return SelHnd; - } -=20 --std::ostream& coot::operator<< (std::ostream& s, const coot::atom_spec_= t &spec) { -+namespace coot { -+ std::ostream& operator<< (std::ostream& s, const atom_spec_t &spec) = { -=20 -- s << "[spec: "; -- s << "\""; -- s << spec.chain; -- s << "\" "; -- s << spec.resno; -- s << " "; -- s << "\""; -- s << spec.insertion_code; -- s << "\""; -- s << " "; -- s << "\""; -- s << spec.atom_name; -- s << "\""; -- s << " "; -- s << "\""; -- s << spec.alt_conf; -- s << "\"]"; -+ s << "[spec: "; -+ s << "\""; -+ s << spec.chain; -+ s << "\" "; -+ s << spec.resno; -+ s << " "; -+ s << "\""; -+ s << spec.insertion_code; -+ s << "\""; -+ s << " "; -+ s << "\""; -+ s << spec.atom_name; -+ s << "\""; -+ s << " "; -+ s << "\""; -+ s << spec.alt_conf; -+ s << "\"]"; -=20 -- return s; -+ return s; -=20 -+ } - } -=20 -=20 diff --git a/sci-chemistry/coot/files/glib.m4 b/sci-chemistry/coot/files/= glib.m4 deleted file mode 100644 index b3c632b..0000000 --- a/sci-chemistry/coot/files/glib.m4 +++ /dev/null @@ -1,196 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOU= ND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or= =20 -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN([AM_PATH_GLIB], -[dnl=20 -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=3DPFX Prefix where GLIB = is installed (optional)], - glib_config_prefix=3D"$withval", glib_config_prefix=3D"") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=3DPFX Exec prefi= x where GLIB is installed (optional)], - glib_config_exec_prefix=3D"$withval", glib_config_exec_prefi= x=3D"") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compil= e and run a test GLIB program], - , enable_glibtest=3Dyes) - - if test x$glib_config_exec_prefix !=3D x ; then - glib_config_args=3D"$glib_config_args --exec-prefix=3D$glib_config_= exec_prefix" - if test x${GLIB_CONFIG+set} !=3D xset ; then - GLIB_CONFIG=3D$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix !=3D x ; then - glib_config_args=3D"$glib_config_args --prefix=3D$glib_config_prefi= x" - if test x${GLIB_CONFIG+set} !=3D xset ; then - GLIB_CONFIG=3D$glib_config_prefix/bin/glib-config - fi - fi - - for module in . $4 - do - case "$module" in - gmodule)=20 - glib_config_args=3D"$glib_config_args gmodule" - ;; - gthread)=20 - glib_config_args=3D"$glib_config_args gthread" - ;; - esac - done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=3Difelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >=3D $min_glib_version) - no_glib=3D"" - if test "$GLIB_CONFIG" =3D "no" ; then - no_glib=3Dyes - else - GLIB_CFLAGS=3D`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=3D`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=3D`$GLIB_CONFIG $glib_config_args --versio= n | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=3D`$GLIB_CONFIG $glib_config_args --versio= n | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=3D`$GLIB_CONFIG $glib_config_args --versio= n | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" =3D "xyes" ; then - ac_save_CFLAGS=3D"$CFLAGS" - ac_save_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $GLIB_CFLAGS" - LIBS=3D"$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int=20 -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version =3D g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) !=3D 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version !=3D $glib_config_major_version) || - (glib_minor_version !=3D $glib_config_minor_version) || - (glib_micro_version !=3D $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB = (%d.%d.%d)\n",=20 - $glib_config_major_version, $glib_config_minor_version, $gl= ib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version)= ; - printf ("*** was found! If glib-config was correct, then it is bes= t\n"); - printf ("*** to remove the old version of GLIB. You may also be ab= le to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable,= or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if th= at is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable= GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remov= e the file config.cache\n"); - printf("*** before re-running configure\n"); - }=20 - else if ((glib_major_version !=3D GLIB_MAJOR_VERSION) || - (glib_minor_version !=3D GLIB_MINOR_VERSION) || - (glib_micro_version !=3D GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version =3D=3D major) && (glib_minor_version > mino= r)) || - ((glib_major_version =3D=3D major) && (glib_minor_version =3D=3D= minor) && (glib_micro_version >=3D micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_versio= n); - printf("*** You need a version of GLIB newer than %d.%d.%d. The = latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n")= ; - printf("***\n"); - printf("*** If you have already installed a sufficiently new ver= sion, this error\n"); - printf("*** probably means that the wrong copy of the glib-confi= g shell script is\n"); - printf("*** being found. The easiest way to fix this is to remov= e the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG enviro= nment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will= have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or = edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time)= )\n"); - } - } - return 1; -} -],, no_glib=3Dyes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS=3D"$ac_save_CFLAGS" - LIBS=3D"$ac_save_LIBS" - fi - fi - if test "x$no_glib" =3D x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) =20 - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" =3D "no" ; then - echo "*** The glib-config script installed by GLIB could not be f= ound" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin i= s in" - echo "*** your path, or set the GLIB_CONFIG environment variable = to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS=3D"$CFLAGS $GLIB_CFLAGS" - LIBS=3D"$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_= micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usu= ally means" - echo "*** that the run-time linker is not finding GLIB or find= ing the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll n= eed to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/l= d.so.conf to point" - echo "*** to the installed location Also, make sure you have = run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to = remove it, although" - echo "*** you may also be able to get things to work by modify= ing LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove t= he GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the = file config.log for the" - echo "*** exact error that occured. This usually means GLIB wa= s incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. = In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFI= G" ]) - CFLAGS=3D"$ac_save_CFLAGS" - LIBS=3D"$ac_save_LIBS" - fi - fi - GLIB_CFLAGS=3D"" - GLIB_LIBS=3D"" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) diff --git a/sci-chemistry/coot/files/gtk.m4 b/sci-chemistry/coot/files/g= tk.m4 deleted file mode 100644 index beb1859..0000000 --- a/sci-chemistry/coot/files/gtk.m4 +++ /dev/null @@ -1,199 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 97-11-3 -AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP], -[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], - [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -$1 -AC_DIVERT_POP()])])]) -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUN= D [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN([AM_PATH_GTK], -[dnl=20 -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=3DPFX Prefix where GTK is = installed (optional)], - gtk_config_prefix=3D"$withval", gtk_config_prefix=3D"") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=3DPFX Exec prefix = where GTK is installed (optional)], - gtk_config_exec_prefix=3D"$withval", gtk_config_exec_prefix=3D= "") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile = and run a test GTK program], - , enable_gtktest=3Dyes) - - for module in . $4 - do - case "$module" in - gthread)=20 - gtk_config_args=3D"$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix !=3D x ; then - gtk_config_args=3D"$gtk_config_args --exec-prefix=3D$gtk_config_exe= c_prefix" - if test x${GTK_CONFIG+set} !=3D xset ; then - GTK_CONFIG=3D$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix !=3D x ; then - gtk_config_args=3D"$gtk_config_args --prefix=3D$gtk_config_prefix" - if test x${GTK_CONFIG+set} !=3D xset ; then - GTK_CONFIG=3D$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=3Difelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >=3D $min_gtk_version) - no_gtk=3D"" - if test "$GTK_CONFIG" =3D "no" ; then - no_gtk=3Dyes - else - GTK_CFLAGS=3D`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=3D`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=3D`$GTK_CONFIG $gtk_config_args --version |= \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=3D`$GTK_CONFIG $gtk_config_args --version |= \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=3D`$GTK_CONFIG $gtk_config_args --version |= \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" =3D "xyes" ; then - ac_save_CFLAGS=3D"$CFLAGS" - ac_save_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $GTK_CFLAGS" - LIBS=3D"$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int=20 -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version =3D g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) !=3D 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version !=3D $gtk_config_major_version) || - (gtk_minor_version !=3D $gtk_config_minor_version) || - (gtk_micro_version !=3D $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (= %d.%d.%d)\n",=20 - $gtk_config_major_version, $gtk_config_minor_version, $gtk_= config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best= \n"); - printf ("*** to remove the old version of GTK+. You may also be ab= le to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable,= or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if th= at is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable = GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove= the file config.cache\n"); - printf("*** before re-running configure\n"); - }=20 -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && define= d (GTK_MICRO_VERSION) - else if ((gtk_major_version !=3D GTK_MAJOR_VERSION) || - (gtk_minor_version !=3D GTK_MINOR_VERSION) || - (gtk_micro_version !=3D GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version =3D=3D major) && (gtk_minor_version > minor)= ) || - ((gtk_major_version =3D=3D major) && (gtk_minor_version =3D=3D m= inor) && (gtk_micro_version >=3D micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The = latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n")= ; - printf("***\n"); - printf("*** If you have already installed a sufficiently new ver= sion, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config= shell script is\n"); - printf("*** being found. The easiest way to fix this is to remov= e the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environ= ment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will = have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or = edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time)= )\n"); - } - } - return 1; -} -],, no_gtk=3Dyes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS=3D"$ac_save_CFLAGS" - LIBS=3D"$ac_save_LIBS" - fi - fi - if test "x$no_gtk" =3D x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) =20 - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" =3D "no" ; then - echo "*** The gtk-config script installed by GTK could not be fou= nd" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is= in" - echo "*** your path, or set the GTK_CONFIG environment variable t= o the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS=3D"$CFLAGS $GTK_CFLAGS" - LIBS=3D"$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_mic= ro_version)); ], - [ echo "*** The test program compiled, but did not run. This usu= ally means" - echo "*** that the run-time linker is not finding GTK or findi= ng the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll nee= d to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/l= d.so.conf to point" - echo "*** to the installed location Also, make sure you have = run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to = remove it, although" - echo "*** you may also be able to get things to work by modify= ing LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove t= he GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the = file config.log for the" - echo "*** exact error that occured. This usually means GTK was= incorrectly installed" - echo "*** or that you have moved GTK since it was installed. I= n the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG"= ]) - CFLAGS=3D"$ac_save_CFLAGS" - LIBS=3D"$ac_save_LIBS" - fi - fi - GTK_CFLAGS=3D"" - GTK_LIBS=3D"" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -])