Commit b0964a4c authored by Marc Lehmann's avatar Marc Lehmann

changed order in library search path for the perl plug-in.

        * configure.in: changed order in library search path
          for the perl plug-in.
parent 0963a109
...@@ -476,7 +476,7 @@ if eval "test x$enable_perl != xno"; then ...@@ -476,7 +476,7 @@ if eval "test x$enable_perl != xno"; then
dnl these are gross hacks dnl these are gross hacks
GIMP_CFLAGS="$CFLAGS -I$srcdir -I\$topdir/../.. $GTK_CFLAGS" GIMP_CFLAGS="$CFLAGS -I$srcdir -I\$topdir/../.. $GTK_CFLAGS"
GIMP_CFLAGS_NOUI="$GIMP_CFLAGS" GIMP_CFLAGS_NOUI="$GIMP_CFLAGS"
GIMP_LIBS="$LIBS -L\$topdir/../../libgimp -L\$topdir/../../libgimp/.libs -lgimp" GIMP_LIBS="$LIBS -L\$topdir/../../libgimp/.libs -L\$topdir/../../libgimp -lgimp"
GIMP_LIBS_NOUI="$GIMP_LIBS" GIMP_LIBS_NOUI="$GIMP_LIBS"
GIMPTOOL="../../gimptool" GIMPTOOL="../../gimptool"
IN_GIMP=1 IN_GIMP=1
...@@ -517,8 +517,10 @@ if eval "test x$enable_perl != xno"; then ...@@ -517,8 +517,10 @@ if eval "test x$enable_perl != xno"; then
AC_SUBST(GIMP_LIBS) AC_SUBST(GIMP_LIBS)
dnl we ignore prefix dnl we ignore prefix
echo "echo invoking perl for configuration..." >plug-ins/perl/config.status cat >plug-ins/perl/config.status <<EOF
echo "$PERL Makefile.PL --writemakefile" >>plug-ins/perl/config.status echo invoking perl for configuration...
$PERL Makefile.PL --writemakefile
EOF
GIMP_PERL=perl GIMP_PERL=perl
else else
GIMP_PERL= GIMP_PERL=
......
Revision history for Gimp-Perl extension. Revision history for Gimp-Perl extension.
- more configuration cleanups
- fixed Gimp::Fu to respect RUN_WITH_LAST_VALS again
- added more oo-prefixes to channels and layers (see Gimp::OO)
1.0441 Sat Oct 24 22:52:05 CEST 1998
- t/run.t does much less when no tests are requested - t/run.t does much less when no tests are requested
- cleaned up Gimp::UI learned much about Gtk (but still not much) - cleaned up Gimp::UI learned much about Gtk (but still not much)
- an occurence of PARAM_PARASITE wasn't wrapped into an #if-clause.
this is just one of the countless braindead bugs being found
by schinder@pobox.com and the cpan-testers! Thanks!
1.044 Sat Oct 24 03:54:47 CEST 1998 1.044 Sat Oct 24 03:54:47 CEST 1998
- allow PF_PATTERN etc. to be usable as commandline arguments - allow PF_PATTERN etc. to be usable as commandline arguments
......
...@@ -11,7 +11,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD %EXPORT_TAGS @EXPORT_FAIL ...@@ -11,7 +11,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD %EXPORT_TAGS @EXPORT_FAIL
require DynaLoader; require DynaLoader;
@ISA = qw(DynaLoader); @ISA = qw(DynaLoader);
$VERSION = 1.044; $VERSION = 1.0441;
@_param = qw( @_param = qw(
PARAM_BOUNDARY PARAM_CHANNEL PARAM_COLOR PARAM_DISPLAY PARAM_DRAWABLE PARAM_BOUNDARY PARAM_CHANNEL PARAM_COLOR PARAM_DISPLAY PARAM_DRAWABLE
...@@ -291,11 +291,11 @@ sub _pseudoclass { ...@@ -291,11 +291,11 @@ sub _pseudoclass {
push(@{"${class}::PREFIXES"} , @prefixes); @prefixes=@{"${class}::PREFIXES"}; push(@{"${class}::PREFIXES"} , @prefixes); @prefixes=@{"${class}::PREFIXES"};
} }
_pseudoclass qw(Layer gimp_layer_ gimp_drawable_ gimp_image_ gimp_); _pseudoclass qw(Layer gimp_layer_ gimp_drawable_ gimp_floating_sel_ gimp_image_ gimp_);
_pseudoclass qw(Image gimp_image_ gimp_drawable_ gimp_); _pseudoclass qw(Image gimp_image_ gimp_drawable_ gimp_);
_pseudoclass qw(Drawable gimp_drawable_ gimp_layer_ gimp_image_ gimp_); _pseudoclass qw(Drawable gimp_drawable_ gimp_layer_ gimp_image_ gimp_);
_pseudoclass qw(Selection gimp_selection_); _pseudoclass qw(Selection gimp_selection_);
_pseudoclass qw(Channel gimp_channel_ gimp_drawable_ gimp_image_ gimp_); _pseudoclass qw(Channel gimp_channel_ gimp_drawable_ gimp_selection_ gimp_image_ gimp_);
_pseudoclass qw(Display gimp_display_ gimp_); _pseudoclass qw(Display gimp_display_ gimp_);
_pseudoclass qw(Plugin plug_in_); _pseudoclass qw(Plugin plug_in_);
_pseudoclass qw(Gradients gimp_gradients_); _pseudoclass qw(Gradients gimp_gradients_);
......
...@@ -749,7 +749,8 @@ sub register($$$$$$$$$;@) { ...@@ -749,7 +749,8 @@ sub register($$$$$$$$$;@) {
return unless $res; return unless $res;
} elsif ($run_mode == &Gimp::RUN_NONINTERACTIVE) { } elsif ($run_mode == &Gimp::RUN_NONINTERACTIVE) {
} elsif ($run_mode == &Gimp::RUN_WITH_LAST_VALS) { } elsif ($run_mode == &Gimp::RUN_WITH_LAST_VALS) {
@_=@defaults; # FIXME my $VAR1; # Data::Dumper is braindamaged
@_=@{eval $Gimp::Data{"$function/_fu_data"}};
} else { } else {
die "run_mode must be INTERACTIVE, NONINTERACTIVE or WITH_LAST_VALS\n"; die "run_mode must be INTERACTIVE, NONINTERACTIVE or WITH_LAST_VALS\n";
} }
......
...@@ -296,7 +296,8 @@ dump_params (int nparams, GParam *args, GParamDef *params) ...@@ -296,7 +296,8 @@ dump_params (int nparams, GParam *args, GParamDef *params)
args[i].data.d_color.green, args[i].data.d_color.green,
args[i].data.d_color.blue); args[i].data.d_color.blue);
break; break;
#if GIMP_PARASITE
case PARAM_PARASITE: case PARAM_PARASITE:
{ {
gint32 found = 0; gint32 found = 0;
...@@ -318,6 +319,7 @@ dump_params (int nparams, GParam *args, GParamDef *params) ...@@ -318,6 +319,7 @@ dump_params (int nparams, GParam *args, GParamDef *params)
trace_printf (", %d bytes data]", args[i].data.d_parasite.size); trace_printf (", %d bytes data]", args[i].data.d_parasite.size);
} }
break; break;
#endif
default: default:
trace_printf ("(?%d?)", args[i].type); trace_printf ("(?%d?)", args[i].type);
......
...@@ -3,10 +3,23 @@ use ExtUtils::MakeMaker; ...@@ -3,10 +3,23 @@ use ExtUtils::MakeMaker;
$topdir=".."; $topdir="..";
do '../config.pl'; do '../config.pl';
sub MY::const_loadlibs {
my $self = shift;
if ($IN_GIMP) {
$self->{LD_RUN_PATH} = join (":",
$libdir,
split /:/,$self->{LD_RUN_PATH}
);
}
package MY;
$self->SUPER::const_loadlibs(@_);
}
WriteMakefile( WriteMakefile(
'NAME' => 'Gimp::Lib', 'NAME' => 'Gimp::Lib',
'VERSION_FROM' => '../Gimp.pm', 'VERSION_FROM' => '../Gimp.pm',
'INC' => "$CPPFLAGS -I.. $CFLAGS $GIMP_INC_NOUI $DEFS".($IN_GIMP ? " -DIN_GIMP" : ""), 'INC' => "$CPPFLAGS -I.. $CFLAGS $GIMP_INC_NOUI $DEFS".($IN_GIMP ? " -DIN_GIMP" : ""),
'macro' => { libdir => $libdir, exec_prefix => $exec_prefix, prefix => $prefix },
'LDLOADLIBS'=> "$LDFLAGS $LIBS $GIMP_LIBS_NOUI", 'LDLOADLIBS'=> "$LDFLAGS $LIBS $GIMP_LIBS_NOUI",
'DEFINE' => '', 'DEFINE' => '',
); );
...@@ -94,6 +94,7 @@ that are checked are shown as well (the null prefix "" is implicit). ...@@ -94,6 +94,7 @@ that are checked are shown as well (the null prefix "" is implicit).
gimp_layer_ gimp_layer_
gimp_drawable_ gimp_drawable_
gimp_floating_sel_
gimp_image_ gimp_image_
gimp_ gimp_
...@@ -118,6 +119,7 @@ that are checked are shown as well (the null prefix "" is implicit). ...@@ -118,6 +119,7 @@ that are checked are shown as well (the null prefix "" is implicit).
gimp_channel_ gimp_channel_
gimp_drawable_ gimp_drawable_
gimp_selection_
gimp_image_ gimp_image_
gimp_ gimp_
......
...@@ -96,7 +96,6 @@ WARNING: Parse::RecDescent is not installed (correctly) on your system. This ...@@ -96,7 +96,6 @@ WARNING: Parse::RecDescent is not installed (correctly) on your system. This
EOF EOF
($major,$minor,$patch)=split /[._]/,$Gtk::VERSION; ($major,$minor,$patch)=split /[._]/,$Gtk::VERSION;
print "using gtk version $Gtk::VERSION\n";
unless ($major > 0 unless ($major > 0
|| ($major == 0 && $minor > 3) || ($major == 0 && $minor > 3)
...@@ -118,6 +117,7 @@ sub MY::postamble { ...@@ -118,6 +117,7 @@ sub MY::postamble {
maintainer-clean :: realclean maintainer-clean :: realclean
objclean :: realclean objclean :: realclean
distclean :: realclean distclean :: realclean
check :: test
install :: install-plugins install :: install-plugins
...@@ -157,9 +157,8 @@ WriteMakefile( ...@@ -157,9 +157,8 @@ WriteMakefile(
'LIBS' => [''], 'LIBS' => [''],
'INC' => "$CPPFLAGS $CFLAGS $GIMP_INC_NOUI $DEFS", 'INC' => "$CPPFLAGS $CFLAGS $GIMP_INC_NOUI $DEFS",
'DEFINE' => ($IN_GIMP ? " -DIN_GIMP" : ""), 'DEFINE' => ($IN_GIMP ? " -DIN_GIMP" : ""),
'realclean' => { FILES => "config.status" }, 'realclean' => { FILES => "config.status config.cache config.log config.pl config.h" },
'clean' => { FILES => "config.log config.h pcfg config.cache config.pl Makefile.old ". 'clean' => { FILES => "Makefile.old config.pl" },
"etc/config.pl etc/config.status etc/config.cache etc/config.h etc/config.log" },
); );
$IN_GIMP or print <<EOF; $IN_GIMP or print <<EOF;
......
...@@ -3,7 +3,7 @@ up-to-date and may not even be readable ;) ...@@ -3,7 +3,7 @@ up-to-date and may not even be readable ;)
shortcuts (don't ask) shortcuts (don't ask)
gimp pix/ka001.jpg -b "(extension-perl-server 0 0 0)" gimp ~/pix/ka001.jpg -b "(extension-perl-server 0 0 0)"
bugs bugs
......
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
$CPPFLAGS = q[@CPPFLAGS@]; $CPPFLAGS = q[@CPPFLAGS@];
$CFLAGS = q[@CFLAGS@]; $CFLAGS = q[@CFLAGS@];
$LDFLAGS = q[@LDFLAGS@]; $LDFLAGS = q[@LDFLAGS@];
$prefix = q[@prefix@]; $prefix = q[@prefix@];
$exec_prefix = q[@exec_prefix@];
$libdir = q[@libdir@];
$IN_GIMP = q[@IN_GIMP@]; $IN_GIMP = q[@IN_GIMP@];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment