Commit b4180790 authored by Marc Lehmann's avatar Marc Lehmann
Browse files

see plug-ins/perl/Changes

parent 0aeb6370
Revision history for Gimp-Perl extension. Revision history for Gimp-Perl extension.
1.098 Wed Jul 21 20:57:12 CEST 1999
- do not try to compile personal_rc_file without gimp-1.1. - do not try to compile personal_rc_file without gimp-1.1.
- fixed old prefix detection.
- get rid of "glib-config" dependency and use AM_PATH_GLIB instead.
- do not install examples/magick until it is repeaired.
1.097 Wed Jul 14 22:55:24 CEST 1999 1.097 Wed Jul 14 22:55:24 CEST 1999
- updated perlotine. - updated perlotine.
......
...@@ -13,7 +13,7 @@ use subs qw(init end lock unlock canonicalize_color); ...@@ -13,7 +13,7 @@ use subs qw(init end lock unlock canonicalize_color);
require DynaLoader; require DynaLoader;
@ISA=qw(DynaLoader); @ISA=qw(DynaLoader);
$VERSION = 1.097; $VERSION = 1.098;
@_param = qw( @_param = qw(
PARAM_BOUNDARY PARAM_CHANNEL PARAM_COLOR PARAM_DISPLAY PARAM_DRAWABLE PARAM_BOUNDARY PARAM_CHANNEL PARAM_COLOR PARAM_DISPLAY PARAM_DRAWABLE
......
...@@ -1751,6 +1751,7 @@ gimp_personal_rc_file(basename) ...@@ -1751,6 +1751,7 @@ gimp_personal_rc_file(basename)
g_free (basename); g_free (basename);
OUTPUT: OUTPUT:
RETVAL RETVAL
#endif #endif
guint guint
......
=head1 NAME =head1 NAME
Gimp::Pixel - how to operate on raw pixels Gimp::Pixel - how to operate on raw pixels.
***WARNING*** this manpage is no longer up-to-date. See C<examples/colourtoalpha>
for a simple raw-piyxel-manipulating plug-in.
=head1 SYNOPSIS =head1 SYNOPSIS
use Gimp; use Gimp;
use Gimp::PDL; # you need Gimp::PDL for pixel access
use PDL; # to make sensible things with the pixels use PDL; # to make sensible things with the pixels
# Gimp::GDrawable - The GDrawable structure # Gimp::GDrawable - The GDrawable structure
......
...@@ -5,9 +5,10 @@ use Config; ...@@ -5,9 +5,10 @@ use Config;
$|=1; $|=1;
@examples = @examples =
# not yet: magick
qw(windy.pl prep4gif.pl webify.pl PDB alpha2color.pl tex-to-float ditherize.pl qw(windy.pl prep4gif.pl webify.pl PDB alpha2color.pl tex-to-float ditherize.pl
border.pl view3d.pl feedback.pl xachlego.pl xachshadow.pl parasite-editor border.pl view3d.pl feedback.pl xachlego.pl xachshadow.pl parasite-editor
scratches.pl blowinout.pl terral_text xachvision.pl gimpmagick perlcc scratches.pl blowinout.pl terral_text xachvision.pl perlcc
sethspin.pl animate_cells image_tile yinyang stamps font_table sethspin.pl animate_cells image_tile yinyang stamps font_table
perlotine randomblends innerbevel fit-text guidegrid roundrectsel perlotine randomblends innerbevel fit-text guidegrid roundrectsel
repdup centerguide stampify goldenmean triangle billboard mirrorsplit repdup centerguide stampify goldenmean triangle billboard mirrorsplit
...@@ -88,8 +89,8 @@ eval "use Parse::RecDescent;"; $PRD = $@ eq ""; ...@@ -88,8 +89,8 @@ eval "use Parse::RecDescent;"; $PRD = $@ eq "";
$] >= 5.005 or print <<EOF; $] >= 5.005 or print <<EOF;
NOTICE: You are using a version of perl older than 5.005. This will reduce NOTICE: You are using a version of perl older than 5.005. This will slightly
the features available to the Gimp-Perl extension. reduce the features available to the Gimp-Perl extension.
EOF EOF
......
use ExtUtils::MakeMaker; use ExtUtils::MakeMaker;
chomp ($_gccflags = qx<glib-config --cflags glib>);
chomp ($_gldflags = qx<glib-config --libs glib>);
do '../config.pl'; do '../config.pl';
sub MY::postamble { sub MY::postamble {
...@@ -17,8 +14,8 @@ $GIMP_INC_NOUI = "-I../../.. $GIMP_INC_NOUI" if $IN_GIMP; ...@@ -17,8 +14,8 @@ $GIMP_INC_NOUI = "-I../../.. $GIMP_INC_NOUI" if $IN_GIMP;
WriteMakefile( WriteMakefile(
'NAME' => 'Gimp::Net', 'NAME' => 'Gimp::Net',
'VERSION_FROM' => '../Gimp.pm', 'VERSION_FROM' => '../Gimp.pm',
'INC' => "$INC1 $CPPFLAGS $pdl_inc $_gccflags $CFLAGS", 'INC' => "$INC1 $CPPFLAGS $pdl_inc $cfg{GLIB_CFLAGS} $CFLAGS",
'DEFINE' => "$DEFINE1 $DEFS", 'DEFINE' => "$DEFINE1 $DEFS",
'TYPEMAPS' => ["$topdir/typemap",@pdl_typemaps], 'TYPEMAPS' => ["$topdir/typemap",@pdl_typemaps],
dynamic_lib => { OTHERLDFLAGS => "$LDFLAGS $LIBS $_gldflags" }, dynamic_lib => { OTHERLDFLAGS => "$LDFLAGS $LIBS $cfg{GLIB_LIBS}" },
); );
...@@ -10,16 +10,13 @@ make test TEST_VERBOSE=1 ...@@ -10,16 +10,13 @@ make test TEST_VERBOSE=1
bugs bugs
* MJH: glib-config(!!!) [DONE] * MJH: glib-config(!!!)
* replace examples/pixemap pod by (.*) and watch it die! * replace examples/pixemap pod by (.*) and watch it die!
* empty desfiption -> no display in PDB?` * empty desfiption -> no display in PDB?`
* make uninstall is actually a concern: make it work * make uninstall is actually a concern: make it work
[DONE] * PF_TEXT has no Load/Save buttons
[DONE] * Christian Soeller told me its easy: apply the affine transformation from C
* podestions are not expanded in dialog help strings etc.. * podestions are not expanded in dialog help strings etc..
* Document spawn_options in Gimp::Net. {DONE] * Document spawn_options in Gimp::Net.
* Selection => To Brush. * Selection => To Brush.
[DONE] * --enable-perl=/tmp/leckmich
* Kommandozeilenmodus(!). * Kommandozeilenmodus(!).
* don't start gimp in cmdline mode and error. * don't start gimp in cmdline mode and error.
* KILL :auto from default(!) * KILL :auto from default(!)
...@@ -27,14 +24,11 @@ bugs ...@@ -27,14 +24,11 @@ bugs
* gimp-piddle must be written back automatically on destroy, if changed * gimp-piddle must be written back automatically on destroy, if changed
* possibly rename "Brush Selection" to "Paint Settings" * possibly rename "Brush Selection" to "Paint Settings"
* gimp-tile set dirty automatically(!) * gimp-tile set dirty automatically(!)
* fatal errors in config.pl (!) [KILL] * fatal errors in config.pl (!)
[DONE] * disable module build (EMBEDMYALLOC)
[DONE] * turn -1 into undef and vice versa.
* perl module install dependency * perl module install dependency
* not calling unload -> coredump [DONE} * not calling unload -> coredump
* $Config{cc} might not understand Gimps CFLAGS (-mpentium). * $Config{cc} might not understand Gimps CFLAGS (-mpentium).
[DONE] * do NOT modinstall with older gimp versions (!!!!!!!!!) [KILL} * improve examples/example-*.pl
* improve examples/example-*.pl
* wait for working gimp_file_load (or do it myself?) * wait for working gimp_file_load (or do it myself?)
* get rid of xs_exit. please please fuck me plenty. * get rid of xs_exit. please please fuck me plenty.
* create gimpstyle.pod * create gimpstyle.pod
...@@ -42,12 +36,10 @@ bugs ...@@ -42,12 +36,10 @@ bugs
important issues important issues
* migrate BOOT: into INIT() * migrate BOOT: into INIT()
* gimp_progress_done * gimp_progress_done, gimp_progress_close
* gimp_progress_close
* maybe implement --enable-perl=runtime-only? * maybe implement --enable-perl=runtime-only?
* --ui and --noui for Gimp::Fu [KILL] * --ui and --noui for Gimp::Fu
* pdb_proc_renameto * pdb_proc_renameto
[DONE] * gimp_progress_init (1 & 2 args)
* gimp_default_display (...) for libgimp * gimp_default_display (...) for libgimp
* Gimp::Module for modules (!) * Gimp::Module for modules (!)
* PerlCC configurable options for Perl-Server startup, Gipm_host etc. * PerlCC configurable options for Perl-Server startup, Gipm_host etc.
...@@ -56,7 +48,7 @@ important issues ...@@ -56,7 +48,7 @@ important issues
* PF_PREVIEW(!) * PF_PREVIEW(!)
* change set_usize to something else.. * change set_usize to something else..
* Gimp::IO (?) * Gimp::IO (?)
* Gimp::Fu import after Gimp? use Gimp::main for Gimp::Fu?? [KILL] * Gimp::Fu import after Gimp? use Gimp::main for Gimp::Fu??
* install scripts in share/ * install scripts in share/
* register dummy function to calm gimp down (really??) * register dummy function to calm gimp down (really??)
* gimp->object_id, drawable_object_id remove! * gimp->object_id, drawable_object_id remove!
...@@ -65,7 +57,7 @@ important issues ...@@ -65,7 +57,7 @@ important issues
* allow plug-ins to register with only a drawable argument(!) * allow plug-ins to register with only a drawable argument(!)
* gradient button * gradient button
* implement Perl-Server RSET and shared lock(!) * implement Perl-Server RSET and shared lock(!)
* use Gimp qw(GIMP_HOST=jfjf)??? [KILL} * use Gimp qw(GIMP_HOST=jfjf)???
[DONE] * zero-copy PDL support [DONE] * zero-copy PDL support
* weighted movement in drawing tools * weighted movement in drawing tools
[KILL] * -DMIN_PERL_DEFINE [KILL] * -DMIN_PERL_DEFINE
...@@ -79,6 +71,7 @@ important issues ...@@ -79,6 +71,7 @@ important issues
long term issues and ideas long term issues and ideas
* rewrite interact() in pure C, gets rid of most gtk dependencies.
* default function parameters (with hash %defaults?) * default function parameters (with hash %defaults?)
* gimp_text(text => "hallo", family => "engraver", size => 20); * gimp_text(text => "hallo", family => "engraver", size => 20);
......
...@@ -177,3 +177,200 @@ int main () ...@@ -177,3 +177,200 @@ int main ()
rm -f conf.gimptest rm -f conf.gimptest
]) ])
# Configure paths for GLIB
# Owen Taylor 97-11-3
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config
dnl
AC_DEFUN(AM_PATH_GLIB,
[dnl
dnl Get the cflags and libraries from the glib-config script
dnl
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
glib_config_prefix="$withval", glib_config_prefix="")
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
, enable_glibtest=yes)
if test x$glib_config_exec_prefix != x ; then
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
fi
fi
if test x$glib_config_prefix != x ; then
glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_prefix/bin/glib-config
fi
fi
for module in . $4
do
case "$module" in
gmodule)
glib_config_args="$glib_config_args gmodule"
;;
gthread)
glib_config_args="$glib_config_args gthread"
;;
esac
done
AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
min_glib_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
else
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$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 <glib.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.glibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_glib_version");
exit(1);
}
if ((glib_major_version != $glib_config_major_version) ||
(glib_minor_version != $glib_config_minor_version) ||
(glib_micro_version != $glib_config_micro_version))
{
printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If glib-config was correct, then it is best\n");
printf ("*** to remove the old version of GLIB. You may also be able 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 that 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 remove the file config.cache\n");
printf("*** before re-running configure\n");
}
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
(glib_micro_version != 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 == major) && (glib_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= 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_version);
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 version, this error\n");
printf("*** probably means that the wrong copy of the glib-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the GLIB_CONFIG environment 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=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_glib" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GLIB_CONFIG" = "no" ; then
echo "*** The glib-config script installed by GLIB could not be found"
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is 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="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([
#include <glib.h>
#include <stdio.h>
], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, 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 "***"
echo "*** If you have a RedHat 5.0 system, you should remove the 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 was 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_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GLIB_CFLAGS=""
GLIB_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
rm -f conf.glibtest
])
...@@ -25,6 +25,9 @@ $^W=0; ...@@ -25,6 +25,9 @@ $^W=0;
_GIMP_LIBS => q[@GIMP_LIBS@], _GIMP_LIBS => q[@GIMP_LIBS@],
_GIMP_LIBS_NOUI => q[@GIMP_LIBS_NOUI@], _GIMP_LIBS_NOUI => q[@GIMP_LIBS_NOUI@],
GLIB_CFLAGS => q[@GLIB_CFLAGS@],
GLIB_LIBS => q[@GLIB_LIBS@],
INSTALL => q[@INSTALL@], INSTALL => q[@INSTALL@],
INSTALL_PROGRAM => q[@INSTALL_PROGRAM@], INSTALL_PROGRAM => q[@INSTALL_PROGRAM@],
gimpplugindir => q[@gimpplugindir@], gimpplugindir => q[@gimpplugindir@],
...@@ -69,6 +72,7 @@ if ($IN_GIMP) { ...@@ -69,6 +72,7 @@ if ($IN_GIMP) {
$GIMP = expand($GIMP); $GIMP = expand($GIMP);
} }
$cfg{GIMP_PREFIX} = $GIMP_PREFIX;
$GIMP_INC =~ s%\$topdir%$topdir%g; $GIMP_INC =~ s%\$topdir%$topdir%g;
$GIMP_INC_NOUI =~ s%\$topdir%$topdir%g; $GIMP_INC_NOUI =~ s%\$topdir%$topdir%g;
......
...@@ -26,6 +26,12 @@ ac_help="$ac_help ...@@ -26,6 +26,12 @@ ac_help="$ac_help
--with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)" --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)"
ac_help="$ac_help ac_help="$ac_help
--disable-gimptest Do not try to compile and run a test GIMP program" --disable-gimptest Do not try to compile and run a test GIMP program"
ac_help="$ac_help
--with-glib-prefix=PFX Prefix where GLIB is installed (optional)"
ac_help="$ac_help
--with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)"
ac_help="$ac_help
--disable-glibtest Do not try to compile and run a test GLIB program"
# Initialize some variables set by options. # Initialize some variables set by options.
# The variables have the same names as the options, with # The variables have the same names as the options, with
...@@ -573,7 +579,7 @@ do ...@@ -573,7 +579,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:577: checking for $ac_word" >&5 echo "configure:583: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GIMP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GIMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -650,7 +656,7 @@ fi ...@@ -650,7 +656,7 @@ fi
# Extract the first word of "gimptool", so it can be a program name with args. # Extract the first word of "gimptool", so it can be a program name with args.
set dummy gimptool; ac_word=$2 set dummy gimptool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:654: checking for $ac_word" >&5 echo "configure:660: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GIMPTOOL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GIMPTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -683,9 +689,9 @@ else ...@@ -683,9 +689,9 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
min_gimp_version=1.0.2 min_gimp_version=1.0.4
echo $ac_n "checking for GIMP - version >= $min_gimp_version""... $ac_c" 1>&6 echo $ac_n "checking for GIMP - version >= $min_gimp_version""... $ac_c" 1>&6
echo "configure:689: checking for GIMP - version >= $min_gimp_version" >&5 echo "configure:695: checking for GIMP - version >= $min_gimp_version" >&5
no_gimp="" no_gimp=""
if test "$GIMPTOOL" = "no" ; then if test "$GIMPTOOL" = "no" ; then
no_gimp=yes no_gimp=yes
...@@ -718,7 +724,7 @@ echo "configure:689: checking for GIMP - version >= $min_gimp_version" >&5 ...@@ -718,7 +724,7 @@ echo "configure:689: checking for GIMP - version >= $min_gimp_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c" echo $ac_n "cross compiling; assumed OK... $ac_c"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 722 "configure" #line 728 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
...@@ -767,7 +773,7 @@ int main () ...@@ -767,7 +773,7 @@ int main ()
EOF EOF
if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -801,7 +807,7 @@ fi ...@@ -801,7 +807,7 @@ fi
CFLAGS="$CFLAGS $GIMP_CFLAGS" CFLAGS="$CFLAGS $GIMP_CFLAGS"
LIBS="$LIBS $GIMP_LIBS" LIBS="$LIBS $GIMP_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 805 "configure" #line 811 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
...@@ -811,7 +817,7 @@ int main() { ...@@ -811,7 +817,7 @@ int main() {
return 0; return 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means" echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GIMP or finding the wrong" echo "*** that the run-time linker is not finding GIMP or finding the wrong"
...@@ -849,10 +855,280 @@ rm -f conftest* ...@@ -849,10 +855,280 @@ rm -f conftest*
rm -f conf.gimptest rm -f conf.gimptest
# Check whether --with-glib-prefix or --without-glib-prefix was given.
if test "${with_glib_prefix+set}" = set; then
withval="$with_glib_prefix"
glib_config_prefix="$withval"
else
glib_config_prefix=""
fi
# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
if test "${with_glib_exec_prefix+set}" = set; then
withval="$with_glib_exec_prefix"
glib_config_exec_prefix="$withval"
else
glib_config_exec_prefix=""
fi
# Check whether --enable-glibtest or --disable-glibtest was given.
if test "${enable_glibtest+set}" = set; then
enableval="$enable_glibtest"
:
else
enable_glibtest=yes
fi
if test x$glib_config_exec_prefix != x ; then
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
fi
fi
if test x$glib_config_prefix != x ; then
glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_prefix/bin/glib-config
fi
fi
for module in .
do
case "$module" in
gmodule)
glib_config_args="$glib_config_args gmodule"
;;
gthread)
glib_config_args="$glib_config_args gthread"
;;
esac
done