diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-01 17:03:34 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-01 17:03:34 +0000 |
commit | 95727940ab8a61bad85f33266d96dc768bd0e47c (patch) | |
tree | 4ca6a928fd21e12087c2e23e382b7a2d93bba331 /x11-libs | |
parent | Marked ppc stable for bug #99688. (diff) | |
download | historical-95727940ab8a61bad85f33266d96dc768bd0e47c.tar.gz historical-95727940ab8a61bad85f33266d96dc768bd0e47c.tar.bz2 historical-95727940ab8a61bad85f33266d96dc768bd0e47c.zip |
Make aclocal work for systems without gdk-pixbuf already installed.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/xosd/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/xosd/Manifest | 11 | ||||
-rw-r--r-- | x11-libs/xosd/files/m4/gdk-pixbuf.m4 | 166 | ||||
-rw-r--r-- | x11-libs/xosd/xosd-2.2.14.ebuild | 4 |
4 files changed, 179 insertions, 8 deletions
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog index 1b86a250a831..5de5830f79cb 100644 --- a/x11-libs/xosd/ChangeLog +++ b/x11-libs/xosd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/xosd # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.47 2005/07/27 11:02:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.48 2005/08/01 17:03:34 eradicator Exp $ + + 01 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> + +files/m4/gdk-pixbuf.m4, xosd-2.2.14.ebuild: + Make aclocal work for systems without gdk-pixbuf already installed. 27 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> xosd-2.2.14.ebuild: Properly run auto*. diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest index da9e3c294e35..76d4e1005b13 100644 --- a/x11-libs/xosd/Manifest +++ b/x11-libs/xosd/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 884198dc7668ae0ecb8b21a90bf39144 ChangeLog 6209 +MD5 b308f73e887113f8a7a3667c8f19bc57 ChangeLog 6384 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253 MD5 3f2b043bcd5292c5f5834acdbb62d0a4 xosd-2.2.10.ebuild 1038 MD5 10956efe64cdc5b4c856238685592839 xosd-2.2.8-r1.ebuild 1033 -MD5 2ea64d42dde6a0d433b92737b36003f6 xosd-2.2.14.ebuild 1470 +MD5 3827e13c8d7047aa1e88e87da40a9d14 xosd-2.2.14.ebuild 1488 MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403 MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64 @@ -13,10 +13,11 @@ MD5 dc6cccd80375fbcc480c1dbfdc651681 files/digest-xosd-2.2.14 132 MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242 MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63 MD5 7a327614154b7eb25a641f0ad4bdec90 files/xosd-2.2.14-bmp-fixes.patch 11472 +MD5 f081f8eb69df2ec6f097cfece3f356b8 files/m4/gdk-pixbuf.m4 6732 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFC52nlArHZZzCEUG0RAuPkAJ9gSCLjwXB1QRjcqxra9mG768cZlACfZu7J -nebvTykKdOv3X6Ru+YwnXjE= -=vAsf +iD8DBQFC7lYMArHZZzCEUG0RAtTeAJ9J0wEJsfPvx2nB8TF6LgrMG5cy1QCdG4q8 +Wxr6vDxd2oTdUdxUB/5izjI= +=IpRi -----END PGP SIGNATURE----- diff --git a/x11-libs/xosd/files/m4/gdk-pixbuf.m4 b/x11-libs/xosd/files/m4/gdk-pixbuf.m4 new file mode 100644 index 000000000000..581903e082d8 --- /dev/null +++ b/x11-libs/xosd/files/m4/gdk-pixbuf.m4 @@ -0,0 +1,166 @@ +# Configure paths for gdk-pixbuf +# Elliot Lee 2000-01-10 +# stolen from Raph Levien 98-11-18 +# stolen from Manish Singh 98-9-30 +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS +dnl +AC_DEFUN([AM_PATH_GDK_PIXBUF], +[dnl +dnl Get the cflags and libraries from the gdk-pixbuf-config script +dnl +AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], + gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") +AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], + gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") +AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], + , enable_gdk_pixbuftest=yes) + + if test x$gdk_pixbuf_exec_prefix != x ; then + gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" + if test x${GDK_PIXBUF_CONFIG+set} = xset ; then + GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config + fi + fi + if test x$gdk_pixbuf_prefix != x ; then + gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" + if test x${GDK_PIXBUF_CONFIG+set} = xset ; then + GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config + fi + fi + + AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) + min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) + AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) + no_gdk_pixbuf="" + if test "$GDK_PIXBUF_CONFIG" = "no" ; then + no_gdk_pixbuf=yes + else + GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` + GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` + + gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gdk_pixbuftest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + LIBS="$LIBS $GDK_PIXBUF_LIBS" +dnl +dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity +dnl checks the results of gdk-pixbuf-config to some extent +dnl + rm -f conf.gdk_pixbuftest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <gdk-pixbuf/gdk-pixbuf.h> + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gdk_pixbuftest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_gdk_pixbuf_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); + exit(1); + } + + if (($gdk_pixbuf_major_version > major) || + (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || + (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); + printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); + printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gdk_pixbuf" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GDK_PIXBUF_CONFIG" = "no" ; then + echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" + echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" + echo "*** full path to gdk-pixbuf-config." + else + if test -f conf.gdk_pixbuftest ; then + : + else + echo "*** Could not run GDK_PIXBUF test program, checking why..." + CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + LIBS="$LIBS $GDK_PIXBUF_LIBS" + AC_TRY_LINK([ +#include <stdio.h> +#include <gdk-pixbuf/gdk-pixbuf.h> +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" + echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.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 modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" + echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" + echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GDK_PIXBUF_CFLAGS="" + GDK_PIXBUF_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GDK_PIXBUF_CFLAGS) + AC_SUBST(GDK_PIXBUF_LIBS) + rm -f conf.gdk_pixbuftest +]) diff --git a/x11-libs/xosd/xosd-2.2.14.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild index 9f7a566ada24..b6a90b7b609f 100644 --- a/x11-libs/xosd/xosd-2.2.14.ebuild +++ b/x11-libs/xosd/xosd-2.2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.4 2005/07/27 11:02:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.5 2005/08/01 17:03:34 eradicator Exp $ inherit eutils @@ -38,7 +38,7 @@ src_unpack() { export WANT_AUTOMAKE=1.8 export WANT_AUTOCONF=2.5 libtoolize --force --copy || die - aclocal || die + aclocal -I ${FILESDIR}/m4 || die automake -a -f -c || die autoconf || die } |