Commit 16e6b8bd authored by Marc Lehmann's avatar Marc Lehmann

see plug-ins/perl/Changes

parent 1a3398f0
Revision history for Gimp-Perl extension.
1.071 Tue Mar 23 13:47:10 CET 1999
- changed the definition of PF_RADIO, simplifying it (it ain't no C).
- Gimp::Fu scripts try to run with default arguments if Gtk is not
available.
......@@ -10,6 +11,15 @@ Revision history for Gimp-Perl extension.
bangpath.
- added font_map. re-added xachshadow.pl, which was mysteriously
missing.
- fixed Gimp::Util::set_state.
- improved get/set_state functions.
- added perlotine, randomblends and innerbevel plugins.
- improved t/run.t and server spawn robustness.
- Makefile.PL wrongly required the Gimp.pm in the current directory.
- made the 5.004 + gimp-1.0 combination work by working around another
bug in 5.004.
- fixed reporting of errors at startup time.
- enforcing argument name style. Eat it or die!
1.07 Mon Mar 15 01:27:05 CET 1999
- added examples/yinyang, examples/image_tile, examples/stamps.
......
......@@ -162,6 +162,7 @@ sub import($;@) {
if ($_ eq ":auto") {
push(@export,@_consts,@_procs);
*{"${up}::AUTOLOAD"} = sub {
croak "cannot autoload '$AUTOLOAD' at this time" unless initialized();
my ($class,$name) = $AUTOLOAD =~ /^(.*)::(.*?)$/;
*{$AUTOLOAD} = sub { Gimp->$name(@_) };
goto &$AUTOLOAD;
......@@ -329,6 +330,7 @@ unless ($no_SIG) {
sub call_callback {
my $req = shift;
my $cb = shift;
return () if $caller eq "Gimp";
if (UNIVERSAL::can($caller,$cb)) {
&{"${caller}::$cb"};
} else {
......@@ -338,7 +340,6 @@ sub call_callback {
sub callback {
my $type = shift;
return () if $caller eq "Gimp";
if ($type eq "-run") {
local $function = shift;
local $in_run = 1;
......@@ -455,8 +456,6 @@ sub AUTOLOAD {
wantarray ? @r : $r[0];
};
goto &$AUTOLOAD;
} elsif (defined(*{"${interface_pkg}::$sub"}{CODE})) {
die "safety net $interface_pkg :: $sub (REPORT THIS!!)";#d#
}
}
# for performance reasons: supply a DESTROY method
......@@ -790,10 +789,9 @@ interface (L<Gimp::Net>), and not as a native plug-in. Here's an example:
Gimp::init;
<do something with the gimp>
Gimp::end;
The optional argument to init has the same format as the GIMP_HOST variable
described in L<Gimp::Net>.
described in L<Gimp::Net>. Calling C<Gimp::end> is optional.
=item Gimp::lock(), Gimp::unlock()
......
......@@ -62,6 +62,13 @@ _gimp_prefix()
OUTPUT:
RETVAL
char *
_gimp_path()
CODE:
RETVAL = GIMP_PATH;
OUTPUT:
RETVAL
BOOT:
{
HV *stash = gv_stashpvn("Gimp", 4, TRUE);
......
package Gimp::Data;
use strict;
use Carp;
use Gimp qw();
use Gimp ();
sub TIEHASH {
my $pkg = shift;
......
......@@ -47,21 +47,6 @@ sub import {
}
}
sub missing {
my ($msg,$function)=@_;
require Gimp;
Gimp::logger(message => "$_[0] is required but not found", function => $function);
Gimp::initialized() ? die "BE QUIET ABOUT THIS DIE\n" : exit Gimp::quiet_main();
}
sub need {
my ($feature,$function)=@_;
unless (present($feature)) {
missing($description{$feature},$function);
Gimp::initialized() ? die "BE QUIET ABOUT THIS DIE\n" : exit Gimp::quiet_main();
}
}
sub describe {
$description{$_[0]};
}
......@@ -111,6 +96,17 @@ sub present {
}
}
sub missing {
my ($msg,$function)=@_;
require Gimp;
Gimp::logger(message => "$_[0] is required but not found", function => $function);
Gimp::initialized() ? die "BE QUIET ABOUT THIS DIE\n" : exit Gimp::quiet_main();
}
sub need {
my ($feature,$function)=@_;
missing($description{$feature},$function) unless present $feature;
}
1;
__END__
......
package Gimp::Fu;
use Carp;
use Gimp qw();
use Gimp ();
use Gimp::Data;
require Exporter;
......@@ -158,6 +158,7 @@ sub help_window(\$$$) {
$b = new Gtk::Text;
$b->set_editable (0);
$b->set_word_wrap (1);
$font = load Gtk::Gdk::Font "9x15bold";
$font = fontset_load Gtk::Gdk::Font "-*-courier-medium-r-normal--*-120-*-*-*-*-*" unless $font;
......@@ -281,7 +282,7 @@ sub interact($$$$@) {
my $setval = sub {
$val=$_[0];
unless (defined $val && $fs->set_font_name ($val)) {
warn "illegal default font description: $val" if defined $val;
warn "illegal default font description for $function: $val\n" if defined $val;
$val=$def;
$fs->set_font_name ($val);
}
......@@ -899,19 +900,20 @@ sub register($$$$$$$$$;@) {
@_==0 or die "register called with too many or wrong arguments\n";
for my $p (@$params,@$results) {
int($p->[0]) eq $p->[0] or croak "Argument/return value '$p->[1]' has illegal type '$p->[0]'";
int($p->[0]) eq $p->[0] or croak "$function: argument/return value '$p->[1]' has illegal type '$p->[0]'";
$p->[1]=~/^[0-9a-z_]+$/ or carp "$function: argument name '$p->[1]' contains illegal characters, only 0-9, a-z and _ allowed";
}
$function="perl_fu_".$function unless $function=~/^(?:perl_fu|extension|plug_in)/ || $function=~s/^\+//;
Gimp::logger message => "function name contains dashes instead of underscores",
function => $function, fatal => 0
if $function =~ y/-//;
*$function = sub {
$run_mode=shift; # global!
my(@pre,@defaults,@lastvals,$input_image);
Gimp::logger message => "function name contains dashes instead of underscores",
function => $function, fatal => 0
if $function =~ y/-//;
if ($menupath=~/^<Image>\//) {
@_ >= 2 or die "<Image> plug-in called without both image and drawable arguments!\n";
@pre = (shift,shift);
......
......@@ -611,7 +611,7 @@ push_gimp_sv (GParam *arg, int array_as_ref)
case PARAM_STATUS: sv = newSViv(arg->data.d_status ); break;
case PARAM_STRING:
sv = arg->data.d_string ? neuSVpv(arg->data.d_string)
: &PL_sv_undef;
: newSVsv (&PL_sv_undef);
break;
case PARAM_COLOR:
......@@ -810,6 +810,32 @@ destroy_paramdefs (GParamDef *arg, int count)
}
#endif
#ifdef GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE
#define get_data_size gimp_get_data_size
#else
guint32
get_data_size (gchar *id)
{
GParam *return_vals;
int nreturn_vals;
int length;
return_vals = gimp_run_procedure ("gimp_procedural_db_get_data",
&nreturn_vals,
PARAM_STRING, id,
PARAM_END);
if (return_vals[0].data.d_status == STATUS_SUCCESS)
length = return_vals[1].data.d_int32;
else
length = 0;
gimp_destroy_params (return_vals, nreturn_vals);
return length;
}
#endif
static void simple_perl_call (char *function, char *arg1)
{
char *argv[2];
......@@ -1363,20 +1389,7 @@ gimp_set_data(id, data)
dta = SvPV (data, dlen);
/* do not remove this comment */
#ifdef GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE
gimp_set_data (SvPV (id, dc), dta, dlen);
#else
{
char str[MAX_STRING]; /* hack */
SvUPGRADE (id, SVt_PV);
len = SvCUR (id);
Copy (SvPV (id, dc), str, len, char);
str[len+1] = 0;
str[len] = 'S'; gimp_set_data (str, &dlen, sizeof (STRLEN));
str[len] = 'C'; gimp_set_data (str, dta, dlen);
}
#endif
}
void
......@@ -1389,35 +1402,12 @@ gimp_get_data(id)
STRLEN len;
STRLEN dc;
/* do not remove this comment */
#ifdef GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE
dlen = gimp_get_data_size (SvPV (id, dc));
dlen = get_data_size (SvPV (id, dc));
/* I count on dlen being zero if "id" doesn't exist. */
data = newSVpv ("", 0);
gimp_get_data (SvPV (id, dc), SvGROW (data, dlen+1));
SvCUR_set (data, dlen);
*((char *)SvPV (data, dc) + dlen) = 0;
#else
{
char str[MAX_STRING]; /* hack */
SvUPGRADE (id, SVt_PV);
len = SvCUR (id);
Copy (SvPV (id, dc), str, len, char);
str[len+1] = 0;
dlen = (STRLEN) -1;
str[len] = 'S'; gimp_get_data (str, &dlen);
data = newSVpv ("", 0);
if (dlen != (STRLEN)-1)
{
str[len] = 'C'; gimp_get_data (str, SvGROW (data, dlen+1));
SvCUR_set (data, dlen);
*((char *)SvPV (data, dc) + dlen) = 0;
}
}
#endif
XPUSHs (sv_2mortal (data));
}
......
......@@ -140,26 +140,31 @@ sub set_trace {
sub start_server {
print "trying to start gimp\n" if $Gimp::verbose;
$server_fh=local *FH;
socketpair $server_fh,GIMP_FH,PF_UNIX,SOCK_STREAM,AF_UNIX
my $gimp_fh=local *FH;
socketpair $server_fh,$gimp_fh,PF_UNIX,SOCK_STREAM,AF_UNIX
or croak "unable to create socketpair for gimp communications: $!";
$gimp_pid = fork;
if ($gimp_pid > 0) {
Gimp::ignore_functions(@Gimp::gimp_gui_functions);
close $gimp_fh;
return $server_fh;
} elsif ($gimp_pid == 0) {
close $server_fh;
delete $ENV{GIMP_HOST};
unless ($Gimp::verbose) {
open STDIN,"</dev/null";
open STDOUT,">/dev/null";
open STDERR,">&1";
close STDIN;
}
my $args = &Gimp::RUN_NONINTERACTIVE." ".
(&Gimp::_PS_FLAG_BATCH | &Gimp::_PS_FLAG_QUIET)." ".
fileno(GIMP_FH);
fileno($gimp_fh);
{ # block to suppress warning with broken perls (e.g. 5.004)
exec "gimp","-n","-b","(extension-perl-server $args)",
"(extension_perl_server $args)"
exec &Gimp::_gimp_path,
"-n","-b","(extension-perl-server $args)",
"(extension_perl_server $args)",
"(gimp_quit 0)",
"(gimp-quit 0)";
}
exit(255);
} else {
......
package Gimp::UI;
use Carp;
use Gimp qw();
use Gimp ();
use Gtk;
$gtk_10 = Gtk->major_version==1 && Gtk->minor_version==0;
......
......@@ -23,12 +23,15 @@ you end up with them and the user cannot see them or delete them. So we
always attach our created layers to an image here, too avoid memory leaks
and debugging times.
These functions try to preserve the current settings like colors.
These functions try to preserve the current settings like colors, but not
all do.
Also: these functions are handled in exactly the same way as
PDB-Functions, i.e. the (hypothetical) function C<gimp_image_xyzzy> can be
called as $image->xyzzy, if the module is available.
The need to explicitly C<use Gimp::Util> will go away in the future.
=head1 FUNCTIONS
=over 4
......@@ -55,20 +58,31 @@ use Gimp;
=item C<get_state ()>, C<set_state state>
C<get_state> returns a scalar representing most of gimps global state (at the
moment foreground colour and background colour). The state can later be
restored by a call to C<set_state>. This is ideal for library functions such
as the ones used here, at least when it includes more state in the future.
C<get_state> returns a scalar representing most of gimps global state
(at the moment foreground colour, background colour, active gradient,
pattern and brush). The state can later be restored by a call to
C<set_state>. This is ideal for library functions such as the ones used
here, at least when it includes more state in the future.
=cut
sub get_state() {
[Palette->get_foreground,Palette->get_background];
[
Palette->get_foreground,
Palette->get_background,
Gradients->get_active,
scalar Patterns->get_pattern,
scalar Brushes->get_brush,
]
}
sub set_state($) {
Palette->set_foreground($_->[0]);
Palette->set_background($_->[1]);
my $s = shift;
Palette->set_foreground($s->[0]);
Palette->set_background($s->[1]);
Gradients->set_active($s->[2]);
Patterns->set_pattern($s->[3]);
Brushes->set_brush($s->[4]);
}
##############################################################################
......
......@@ -72,3 +72,7 @@ examples/yinyang
examples/image_tile
examples/stamps
examples/font_table
examples/perlotine
examples/randomblends
examples/innerbevel
......@@ -10,6 +10,7 @@ $|=1;
border.pl view3d.pl feedback.pl xachlego.pl xachshadow.pl parasite-editor
scratches.pl blowinout.pl terral_text xachvision.pl gimpmagick perlcc
sethspin.pl animate_cells image_tile yinyang stamps font_table
perlotine randomblends innerbevel
);
@shebang = (map("examples/$_",@examples),
qw(Perl-Server examples/example-net.pl examples/homepage-logo.pl
......@@ -24,7 +25,7 @@ if ($ARGV[0] ne "--writemakefile") {
do './config.pl';
if(defined $EXTENSIVE_TESTS) {
print "\nFetched some defaults from an earlier Makefile.PL run.\n";
print "Run \"make clean\" if you don't want this\n";
print "Run \"make realclean\" if you don't want this\n";
} else {
print "
This module usually does only a very short installation check.
......@@ -35,7 +36,7 @@ gimp-1.1 ;)
If you decide to run these tests (please!), I'd be glad to hear
success stories (and of course any bug-reports ;)
Do you want me to make these tests [y]? ";
Do you want me to run these tests [y]? ";
print "y\n";
$EXTENSIVE_TESTS = 1;
......@@ -59,6 +60,45 @@ Do you want me to make these tests [y]? ";
require ExtUtils::MakeMaker;
import ExtUtils::MakeMaker;
@INC = grep /^\//,@INC;
eval { $Gimp::no_SIG=1; require Gimp };
unless($@) {
$old_prefix = eval { Gimp::_gimp_prefix() };
if ($@) {
print <<EOF;
WARNING: I've detected an old version of Gimp-Perl installed
already. Since I cannot detect the prefix used to install
it I will just overwrite it. If you happen to use two
different and incompatible versions of the Gimp with differing
prefixes you should call configure with the --disable-perl
switch to disable the perl extension, or consider installing
the perl module elsewhere, using the environment variables
PERL5LIB=/my/module/dir and PERL_MM_OPTS="PREFIX=\$PERL5LIB" to
overwrite the installation directory (PERL_MM_OPTS) and run the
Gimp (PERL5LIB). See "perldoc ExtUtils::MakeMaker" for a full
discussion of your options.
EOF
} else {
if ($GIMP_PREFIX ne $old_prefix) {
print <<EOF;
WARNING: I've detected another installation of the Gimp-Perl extension.
This version uses the prefix '$GIMP_PREFIX'.
The already installed version uses the prefix '$old_prefix'.
They don't match, which indicates that installing Gimp-Perl might
overwrite an old but still used installation. Gimp-Perl will
therefore be disabled, and not be installed.
EOF
not_halt("prefix mismatch");
}
}
}
eval "use Gtk;"; $GTK = $@ eq "";
eval "use PDL;"; $PDL = $@ eq "";
eval "use Parse::RecDescent;"; $PRD = $@ eq "";
......@@ -129,44 +169,6 @@ WARNING: version 0.3 of Gtk is _required_ for this module to
EOF
}
eval { $Gimp::no_SIG=1; require Gimp };
unless($@) {
$old_prefix = eval { Gimp::_gimp_prefix() };
if ($@) {
print <<EOF;
WARNING: I've detected an old version of Gimp-Perl installed
already. Since I cannot detect the prefix used to install
it I will just overwrite it. If you happen to use two
different and incompatible versions of the Gimp with differing
prefixes you should call configure with the --disable-perl
switch to disable the perl extension, or consider installing
the perl module elsewhere, using the environment variables
PERL5LIB=/my/module/dir and PERL_MM_OPTS="PREFIX=\$PERL5LIB" to
overwrite the installation directory (PERL_MM_OPTS) and run the
Gimp (PERL5LIB). See "perldoc ExtUtils::MakeMaker" for a full
discussion of your options.
EOF
} else {
if ($GIMP_PREFIX ne $old_prefix) {
print <<EOF;
WARNING: I've detected another installaion of the Gimp-Perl extension.
This version uses the prefix '$GIMP_PREFIX'.
The already installed version uses the prefix '$old_prefix'.
They don't match, which indicates that installing Gimp-Perl might
overwrite an old but still used installation. Gimp-Perl will
therefore be disabled, and not be installed.
EOF
not_halt("prefix mismatch");
}
}
}
# wo do no longer do these dirty things
#for(@shebang) {
# system ($Config{perlpath},"-pi","-e","\$. == 1 and \$_ = '#!$Config{perlpath}\n'",$_);
......
......@@ -16,9 +16,9 @@ use strict;
use vars qw($use_unix $use_tcp $trace_res $server_quit $max_pkt $unix $tcp $ps_flags
%object_dynamic $object_uid %objects $auth @authorized $exclusive
$rm $saved_rm);
# the '' might be required (i.e. no ())
use Gimp '';
use Gimp::Net qw(:server);
# the '' might be required (i.e. no ()). why??
use Gimp ();
use Gimp::Net ();
Gimp::set_trace(\$trace_res);
Gimp::ignore_functions(qw(gimp_progress_init gimp_progress_update));
......@@ -305,15 +305,15 @@ sub extension_perl_server {
}
sub query {
Gimp->install_procedure("extension_perl_server", "Start the Gimp-Perl Server",
"This is the server for plug-ins written using the Gimp::Net module",
"Marc Lehmann <pcg\@goof.com>", "Marc Lehmann", "1998-07-22",
"<Toolbox>/Xtns/Perl Server", "*",&Gimp::PROC_EXTENSION,
[
[&Gimp::PARAM_INT32, "run_mode", "Interactive, [non-interactive]"],
[&Gimp::PARAM_INT32, "flags", "internal flags (must be 0)"],
[&Gimp::PARAM_INT32, "extra", "multi-purpose ;)"],
],[]);
Gimp->install_procedure("extension_perl_server", "Start the Gimp-Perl Server",
"This is the server for plug-ins written using the Gimp::Net module",
"Marc Lehmann <pcg\@goof.com>", "Marc Lehmann", "1998-07-22",
"<Toolbox>/Xtns/Perl Server", "*",&Gimp::PROC_EXTENSION,
[
[&Gimp::PARAM_INT32, "run_mode", "Interactive, [non-interactive]"],
[&Gimp::PARAM_INT32, "flags", "internal flags (must be 0)"],
[&Gimp::PARAM_INT32, "extra", "multi-purpose ;)"],
],[]);
}
sub quit {
......
......@@ -7,11 +7,17 @@ $LDFLAGS = q[@LDFLAGS@];
$prefix = q[@prefix@];
$exec_prefix = q[@exec_prefix@];
$libdir = q[@libdir@];
$bindir = q[@bindir@];
$exec_prefix=~s/\${?prefix}?/$prefix/g;
$libdir=~s/\${?exec_prefix}?/$exec_prefix/g;
$bindir=~s/\${?exec_prefix}?/$exec_prefix/g;
$IN_GIMP = q[@IN_GIMP@];
$PERL = q[@PERL@];
$GIMP = q[@GIMP@];
$GIMP = $IN_GIMP ? q[@GIMP@] : "$bindir/gimp";
$GIMPTOOL = q[@GIMPTOOL@];
$GIMP_INC = q[@GIMP_CFLAGS@];
$GIMP_INC_NOUI = q[@GIMP_CFLAGS_NOUI@];
......@@ -34,4 +40,4 @@ if ($IN_GIMP) {
chomp $GIMP_PREFIX;
}
$DEFS = ' -DGIMP_PREFIX=\"'.$GIMP_PREFIX.'\"';
$DEFS = ' -DGIMP_PREFIX=\"'.$GIMP_PREFIX.'\" -DGIMP_PATH=\"'.$GIMP.'\"';
......@@ -574,25 +574,31 @@ do
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:577: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GIMP'+set}'`\" = set"; then
if eval "test \"`echo '$''{'ac_cv_path_GIMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$GIMP"; then
ac_cv_prog_GIMP="$GIMP" # Let the user override the test.
else
case "$GIMP" in
/*)
ac_cv_path_GIMP="$GIMP" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_GIMP="$GIMP" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_GIMP="$ac_prog"
ac_cv_path_GIMP="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
;;
esac
fi
fi
GIMP="$ac_cv_prog_GIMP"
GIMP="$ac_cv_path_GIMP"
if test -n "$GIMP"; then
echo "$ac_t""$GIMP" 1>&6
else
......@@ -601,7 +607,6 @@ fi
test -n "$GIMP" && break
done
test -n "$GIMP" || GIMP="gimp"
# Check whether --with-gimp-prefix or --without-gimp-prefix was given.
......@@ -645,7 +650,7 @@ fi
# Extract the first word of "gimptool", so it can be a program name with args.
set dummy gimptool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:649: checking for $ac_word" >&5
echo "configure:654: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GIMPTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -680,7 +685,7 @@ fi
min_gimp_version=1.0.2
echo $ac_n "checking for GIMP - version >= $min_gimp_version""... $ac_c" 1>&6
echo "configure:684: checking for GIMP - version >= $min_gimp_version" >&5
echo "configure:689: checking for GIMP - version >= $min_gimp_version" >&5
no_gimp=""
if test "$GIMPTOOL" = "no" ; then
no_gimp=yes
......@@ -713,7 +718,7 @@ echo "configure:684: checking for GIMP - version >= $min_gimp_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 717 "configure"
#line 722 "configure"
#include "confdefs.h"
#include <stdio.h>
......@@ -762,7 +767,7 @@ int main ()
EOF
if { (eval echo configure:766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
......@@ -796,7 +801,7 @@ fi
CFLAGS="$CFLAGS $GIMP_CFLAGS"
LIBS="$LIBS $GIMP_LIBS"
cat > conftest.$ac_ext <<EOF
#line 800 "configure"
#line 805 "configure"
#include "confdefs.h"
#include <stdio.h>
......@@ -806,7 +811,7 @@ int main() {
return 0;
; return 0; }
EOF
if { (eval echo configure:810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
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"
......@@ -847,7 +852,7 @@ rm -f conftest*
ac_gimp_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GIMP_CFLAGS"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:851: checking how to run the C preprocessor" >&5
echo "configure:856: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
......@@ -862,13 +867,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 866 "configure"
#line 871 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }