head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.40 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.38 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.36 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.22 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.20 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.18 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.16 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.14 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.12 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.10 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.8 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.3 date 2005.07.23.21.50.06; author wiz; state dead; branches; next 1.2; 1.2 date 2002.10.02.21.21.47; author wiz; state Exp; branches; next 1.1; 1.1 date 2002.05.25.11.31.30; author rh; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.05.25.11.31.30; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.43.57; author jlam; state Exp; branches; next ; desc @@ 1.3 log @Remove devel/bonobo-conf -- its last dependency (evolution12) was removed. @ text @$NetBSD: patch-ab,v 1.2 2002/10/02 21:21:47 wiz Exp $ --- aclocal.m4.orig Tue May 14 18:26:28 2002 +++ aclocal.m4 Tue May 14 18:27:19 2002 @@@@ -4944,3 +4944,170 @@@@ fi fi]) +# 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 +#include +#include +#include + +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 +#include +], [ 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 +]) + @ 1.2 log @Add RCS Id. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Properly include gdk-pixbuf using buildlink. Fix provided by Julio Merino in PR pkg/16815. @ text @d1 2 @ 1.1.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 18:43:57 +0000 @ text @d1 173 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 173 --- aclocal.m4.orig Tue May 14 18:26:28 2002 +++ aclocal.m4 Tue May 14 18:27:19 2002 @@@@ -4944,3 +4944,170 @@@@ fi fi]) +# 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 +#include +#include +#include + +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 +#include +], [ 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 +]) + @