diff --git a/ChangeLog b/ChangeLog index 1d9de54e3b..2c8472bd48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-01-27 Manish Singh + + * configure.in: use AM_PATH_GIMPPRINT to get some additional + sanity checks. + + * acinclude.m4: define AM_PATH_GIMPPRINT here, so we don't have + add a new autogen dependency. + + * plug-ins/print/Makefile.am: Use GIMPPRINT_{CFLAGS,LIBS} + 2004-01-28 Simon Budig Argh, this is getting silly. diff --git a/acinclude.m4 b/acinclude.m4 index 77ac2dbc20..09de0b9dca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -27,3 +27,193 @@ $1],dnl $2]) CPPFLAGS="$save_CPPFLAGS" ]) + +# Configure paths for gimp-print +# Roger Leigh -- Sat, 10 Feb 2001 +# (based on gimpprint.m4 by Owen Taylor 97-11-3) + +dnl AM_PATH_GIMPPRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GIMP-PRINT, and define GIMPPRINT_CFLAGS and GIMPPRINT_LIBS +dnl +AC_DEFUN([AM_PATH_GIMPPRINT], +[dnl +dnl Get the cflags and libraries from the gimpprint-config script +dnl +AC_ARG_WITH(gimpprint-prefix,[ --with-gimpprint-prefix=PFX Prefix where GIMP-PRINT is installed (optional)], + gimpprint_config_prefix="$withval", gimpprint_config_prefix="") +AC_ARG_WITH(gimpprint-exec-prefix,[ --with-gimpprint-exec-prefix=PFX Exec prefix where GIMP-PRINT is installed + (optional)], + gimpprint_config_exec_prefix="$withval", gimpprint_config_exec_prefix="") +AC_ARG_ENABLE(gimpprinttest, [ --disable-gimpprinttest Do not try to compile and run a test GIMP-PRINT + program], + , enable_gimpprinttest=yes) + + if test x$gimpprint_config_exec_prefix != x ; then + gimpprint_config_args="$gimpprint_config_args --exec-prefix=$gimpprint_config_exec_prefix" + if test x${GIMPPRINT_CONFIG+set} != xset ; then + GIMPPRINT_CONFIG=$gimpprint_config_exec_prefix/bin/gimpprint-config + fi + fi + if test x$gimpprint_config_prefix != x ; then + gimpprint_config_args="$gimpprint_config_args --prefix=$gimpprint_config_prefix" + if test x${GIMPPRINT_CONFIG+set} != xset ; then + GIMPPRINT_CONFIG=$gimpprint_config_prefix/bin/gimpprint-config + fi + fi + + AC_PATH_PROG(GIMPPRINT_CONFIG, gimpprint-config, no) + min_gimpprint_version=ifelse([$1], ,4.1.4,$1) + AC_MSG_CHECKING(for GIMP-PRINT - version >= $min_gimpprint_version) + no_gimpprint="" + if test "$GIMPPRINT_CONFIG" = "no" ; then + no_gimpprint=yes + else + GIMPPRINT_CFLAGS=`$GIMPPRINT_CONFIG $gimpprint_config_args --cflags` + GIMPPRINT_LIBS=`$GIMPPRINT_CONFIG $gimpprint_config_args --libs` + gimpprint_config_major_version=`$GIMPPRINT_CONFIG $gimpprint_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gimpprint_config_minor_version=`$GIMPPRINT_CONFIG $gimpprint_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gimpprint_config_micro_version=`$GIMPPRINT_CONFIG $gimpprint_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gimpprinttest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GIMPPRINT_CFLAGS" + LIBS="$GIMPPRINT_LIBS $LIBS" +dnl +dnl Now check if the installed GIMP-PRINT is sufficiently new. (Also sanity +dnl checks the results of gimpprint-config to some extent +dnl + rm -f conf.gimpprinttest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gimpprinttest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = strdup("$min_gimpprint_version"); + if (!tmp_version) { + exit(1); + } + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gimpprint_version"); + exit(1); + } + + if ((gimpprint_major_version != $gimpprint_config_major_version) || + (gimpprint_minor_version != $gimpprint_config_minor_version) || + (gimpprint_micro_version != $gimpprint_config_micro_version)) + { + printf("\n*** 'gimpprint-config --version' returned %d.%d.%d, but GIMP-PRINT (%d.%d.%d)\n", + $gimpprint_config_major_version, $gimpprint_config_minor_version, $gimpprint_config_micro_version, + gimpprint_major_version, gimpprint_minor_version, gimpprint_micro_version); + printf ("*** was found! If gimpprint-config was correct, then it is best\n"); + printf ("*** to remove the old version of GIMP-PRINT. You may also be able to fix the\n"); + printf("*** error by modifying your LD_LIBRARY_PATH enviroment variable, or by\n"); + printf("*** editing /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gimpprint-config was wrong, set the environment variable GIMPPRINT_CONFIG\n"); + printf("*** to point to the correct copy of gimpprint-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + } +#if defined (GIMPPRINT_MAJOR_VERSION) && defined (GIMPPRINT_MINOR_VERSION) && defined (GIMPPRINT_MICRO_VERSION) + else if ((gimpprint_major_version != GIMPPRINT_MAJOR_VERSION) || + (gimpprint_minor_version != GIMPPRINT_MINOR_VERSION) || + (gimpprint_micro_version != GIMPPRINT_MICRO_VERSION)) + { + printf("\n*** GIMP-PRINT header files (version %d.%d.%d) do not match\n", + GIMPPRINT_MAJOR_VERSION, GIMPPRINT_MINOR_VERSION, GIMPPRINT_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gimpprint_major_version, gimpprint_minor_version, gimpprint_micro_version); + } +#endif /* defined (GIMPPRINT_MAJOR_VERSION) ... */ + else + { + if ((gimpprint_major_version > major) || + ((gimpprint_major_version == major) && (gimpprint_minor_version > minor)) || + ((gimpprint_major_version == major) && (gimpprint_minor_version == minor) && (gimpprint_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GIMP-PRINT (%d.%d.%d) was found.\n", + gimpprint_major_version, gimpprint_minor_version, gimpprint_micro_version); + printf("*** You need a version of GIMP-PRINT newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GIMP-PRINT is always available from\n"); + printf("*** http://sourceforge.net/project/showfiles.php?group_id=1537.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gimpprint-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GIMP-PRINT, but you can also set the GIMPPRINT_CONFIG environment to\n"); + printf("*** point to the correct copy of gimpprint-config. (In this case, you will have\n"); + printf("*** to 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_gimpprint=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gimpprint" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GIMPPRINT_CONFIG" = "no" ; then + echo "*** The gimpprint-config script installed by GIMP-PRINT could not be found" + echo "*** If GIMP-PRINT was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GIMPPRINT_CONFIG environment variable to the" + echo "*** full path to gimpprint-config." + else + if test -f conf.gimpprinttest ; then + : + else + echo "*** Could not run GIMP-PRINT test program, checking why..." + CFLAGS="$CFLAGS $GIMPPRINT_CFLAGS" + LIBS="$LIBS $GIMPPRINT_LIBS" + AC_TRY_LINK([ +#include +#include +#include +], [ return ((gimpprint_major_version) || (gimpprint_minor_version) || (gimpprint_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GIMP-PRINT or finding the wrong" + echo "*** version of GIMP-PRINT. If it is not finding GIMP-PRINT, you'll need to set" + echo "*** your 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 GIMP-PRINT was incorrectly" + echo "*** installed or that you have moved GIMP-PRINT since it was installed. In the" + echo "*** latter case, you may want to edit the gimpprint-config script:" + echo "*** $GIMPPRINT_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GIMPPRINT_CFLAGS="" + GIMPPRINT_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GIMPPRINT_CFLAGS) + AC_SUBST(GIMPPRINT_LIBS) + rm -f conf.gimpprinttest +]) diff --git a/configure.in b/configure.in index 62f38b7a3b..486727056f 100644 --- a/configure.in +++ b/configure.in @@ -1048,30 +1048,21 @@ AC_SUBST(LIBSVG) ###################### AC_ARG_ENABLE(print, [ --disable-print build without print support (requires libgimpprint)]) - if test "x$enable_print" != "xno"; then - AC_PATH_PROG(PRINT_CONFIG, gimpprint-config, no) - if test "x$PRINT_CONFIG" != "xno"; then - AC_MSG_CHECKING(for appropriate gimpprint library) - print_version=`$PRINT_CONFIG --version` - if expr $print_version \>= gimpprint_required_version >/dev/null; then - if expr $print_version \< gimpprint_toonew_version >/dev/null; then - AC_MSG_RESULT([yes (version $print_version)]) - have_gimp_print=yes - PRINT_LIBS=`$PRINT_CONFIG --libs` - PRINT_CFLAGS=`$PRINT_CONFIG --cflags` - else - AC_MSG_WARN([ + +have_gimp_print=no +if test "x$enable_print" != "xno"; then + AM_PATH_GIMPPRINT(gimpprint_required_version, + [print_version=`$GIMPPRINT_CONFIG --version` + if expr $print_version \>= gimpprint_toonew_version >/dev/null; then + AC_MSG_WARN([ *** libgimpprint version $print_version is too new. *** It is likely an unstable development version. *** You need a version before gimpprint_toonew_version.]) - fi else - AC_MSG_WARN([ -*** libgimpprint version $print_version is too old. -*** You need at least version gimpprint_required_version.]) + have_gimp_print=yes fi - fi - fi + ]) +fi if test x$enable_print != xno && test x$have_gimp_print != xyes; then AC_MSG_ERROR([ diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index 212852d70a..1f5b0c623d 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -18,9 +18,9 @@ print_SOURCES = \ print_gimp.h INCLUDES = \ - -I$(top_srcdir) \ - $(GTK_CFLAGS) \ - $(PRINT_CFLAGS) \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ + $(GIMPPRINT_CFLAGS) \ -I$(includedir) LDADD = \ @@ -30,6 +30,6 @@ LDADD = \ $(libgimpcolor) \ $(libgimpbase) \ $(GTK_LIBS) \ - $(PRINT_LIBS) \ + $(GIMPPRINT_LIBS) \ $(RT_LIBS) \ $(INTLLIBS)