From 26a4b20dfea24572bafa90309c5430dfe3df8839 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 30 Jul 2004 20:42:53 +0000 Subject: [PATCH] always do the check for perl and use the substituted perl executable name 2004-07-30 Sven Neumann * configure.in: always do the check for perl and use the substituted perl executable name in the call for gimp-mkenums. Fixes the build on platforms where perl is not available as /usr/bin/perl. Closes bug #148813. * app/widgets/gimpenumstore.c: added missing include. --- ChangeLog | 9 +++++++++ app/widgets/gimpenumstore.c | 1 + configure.in | 9 ++++----- libgimpwidgets/gimpenumstore.c | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0224c48f0..5761baf189 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-07-30 Sven Neumann + + * configure.in: always do the check for perl and use the + substituted perl executable name in the call for gimp-mkenums. + Fixes the build on platforms where perl is not available as + /usr/bin/perl. Closes bug #148813. + + * app/widgets/gimpenumstore.c: added missing include. + 2004-07-30 DindinX * plug-ins/common/channel_mixer.c: GtkPreview->GtkDrawingArea, plus diff --git a/app/widgets/gimpenumstore.c b/app/widgets/gimpenumstore.c index d9943b8880..6a04db41a1 100644 --- a/app/widgets/gimpenumstore.c +++ b/app/widgets/gimpenumstore.c @@ -23,6 +23,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" diff --git a/configure.in b/configure.in index 031f6aec8b..ece7c6627f 100644 --- a/configure.in +++ b/configure.in @@ -1266,14 +1266,13 @@ fi # Check for perl ################ +AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl) + + AC_ARG_WITH(pdbgen, [ --with-pdbgen use 'pdbgen' code generation tool],, with_pdbgen=$enable_maintainer_mode) -if test "x$with_pdbgen" = xyes ; then - AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl) -fi - AM_CONDITIONAL(WITH_PDBGEN, test x$with_pdbgen = xyes) AM_CONDITIONAL(WITH_AUTHORSGEN, test x$enable_maintainer_mode = xyes) @@ -1478,7 +1477,7 @@ AC_SUBST(GIMPINSTALL) AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes) dnl a tuned version of glib-mkenums -GIMP_MKENUMS="\$(top_srcdir)/tools/gimp-mkenums" +GIMP_MKENUMS="\$(PERL) \$(top_srcdir)/tools/gimp-mkenums" AC_SUBST(GIMP_MKENUMS) diff --git a/libgimpwidgets/gimpenumstore.c b/libgimpwidgets/gimpenumstore.c index d9943b8880..6a04db41a1 100644 --- a/libgimpwidgets/gimpenumstore.c +++ b/libgimpwidgets/gimpenumstore.c @@ -23,6 +23,7 @@ #include +#include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h"