diff --git a/configure.in b/configure.in index e397c4f211..02c1325d45 100644 --- a/configure.in +++ b/configure.in @@ -476,7 +476,7 @@ if eval "test x$enable_perl != xno"; then dnl these are gross hacks GIMP_CFLAGS="$CFLAGS -I$srcdir -I\$topdir/../.. $GTK_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" GIMPTOOL="../../gimptool" IN_GIMP=1 @@ -517,8 +517,10 @@ if eval "test x$enable_perl != xno"; then AC_SUBST(GIMP_LIBS) dnl we ignore prefix - echo "echo invoking perl for configuration..." >plug-ins/perl/config.status - echo "$PERL Makefile.PL --writemakefile" >>plug-ins/perl/config.status + cat >plug-ins/perl/config.status <{LD_RUN_PATH} = join (":", + $libdir, + split /:/,$self->{LD_RUN_PATH} + ); + } + package MY; + $self->SUPER::const_loadlibs(@_); +} + WriteMakefile( 'NAME' => 'Gimp::Lib', 'VERSION_FROM' => '../Gimp.pm', '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", 'DEFINE' => '', ); diff --git a/plug-ins/perl/Gimp/OO.pod b/plug-ins/perl/Gimp/OO.pod index 9352fd5e08..cd7a2c78aa 100644 --- a/plug-ins/perl/Gimp/OO.pod +++ b/plug-ins/perl/Gimp/OO.pod @@ -94,6 +94,7 @@ that are checked are shown as well (the null prefix "" is implicit). gimp_layer_ gimp_drawable_ + gimp_floating_sel_ gimp_image_ gimp_ @@ -118,6 +119,7 @@ that are checked are shown as well (the null prefix "" is implicit). gimp_channel_ gimp_drawable_ + gimp_selection_ gimp_image_ gimp_ diff --git a/plug-ins/perl/Makefile.PL b/plug-ins/perl/Makefile.PL index b4a4805aa2..c1007c7055 100644 --- a/plug-ins/perl/Makefile.PL +++ b/plug-ins/perl/Makefile.PL @@ -96,7 +96,6 @@ WARNING: Parse::RecDescent is not installed (correctly) on your system. This EOF ($major,$minor,$patch)=split /[._]/,$Gtk::VERSION; -print "using gtk version $Gtk::VERSION\n"; unless ($major > 0 || ($major == 0 && $minor > 3) @@ -118,6 +117,7 @@ sub MY::postamble { maintainer-clean :: realclean objclean :: realclean distclean :: realclean +check :: test install :: install-plugins @@ -157,9 +157,8 @@ WriteMakefile( 'LIBS' => [''], 'INC' => "$CPPFLAGS $CFLAGS $GIMP_INC_NOUI $DEFS", 'DEFINE' => ($IN_GIMP ? " -DIN_GIMP" : ""), - 'realclean' => { FILES => "config.status" }, - 'clean' => { FILES => "config.log config.h pcfg config.cache config.pl Makefile.old ". - "etc/config.pl etc/config.status etc/config.cache etc/config.h etc/config.log" }, + 'realclean' => { FILES => "config.status config.cache config.log config.pl config.h" }, + 'clean' => { FILES => "Makefile.old config.pl" }, ); $IN_GIMP or print <