summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Tarricone <brian@tarricone.org>2008-12-25 11:30:12 +0000
committerBrian Tarricone <brian@tarricone.org>2008-12-25 11:30:12 +0000
commit7455b9403f3c953060e821c18f8a1c624d99863f (patch)
tree77ef071a7f205646f4247bb789a07dd46650d686
parent72e71dd5f2acfb8deb83ac5c601d060eda4f3465 (diff)
downloadxfconf-7455b9403f3c953060e821c18f8a1c624d99863f.tar.gz
allow passing arbitrary options to the perl bindings' Makefile.PL via
configure --with-perl-options="foo". patch from <yselkowitz@users.sourceforge.net> (bug 4735) (Old svn revision: 29048)
-rw-r--r--NEWS2
-rw-r--r--configure.ac.in8
-rw-r--r--xfconf-perl/Makefile.am2
3 files changed, 11 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 280d56c..79c4190 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Xfce 4.6beta3 (Xfce 4.5.93)
* Install xfconfd to $(libexecdir) instead of $(bindir).
* Fix perl bindings link order on Cygwin (bug 4735).
+ * Allow passing arbitrary options to the perl bindings' Makefile.PL
+ generation script (bug 4735).
Xfce 4.6beta2 (Xfce 4.5.92)
diff --git a/configure.ac.in b/configure.ac.in
index d1606b7..f2eca93 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -105,6 +105,14 @@ AC_SUBST([PERL_GLIB_REQUIRED_VERSION])
AC_SUBST([PERL_EXTUTILS_DEPENDS_REQUIRED_VERSION])
AC_SUBST([PERL_EXTUTILS_PKGCONFIG_REQUIRED_VERSION])
+dnl Options to pass when configuring Perl bindings
+AC_ARG_WITH([perl-options],
+ [AC_HELP_STRING([--with-perl-options=OPTIONS],
+ [options to pass on command-line when generating Perl bindings build file])],
+ [perl_makeopts="$withval"], [perl_makeopts=""])
+PERL_MAKE_OPTIONS="$perl_makeopts"
+AC_SUBST(PERL_MAKE_OPTIONS)
+
dnl check alignment for struct returns
AC_DEFUN([BT_GLIB_CHECK_ALIGNOF],
[
diff --git a/xfconf-perl/Makefile.am b/xfconf-perl/Makefile.am
index dfaaf26..23307ed 100644
--- a/xfconf-perl/Makefile.am
+++ b/xfconf-perl/Makefile.am
@@ -20,7 +20,7 @@ Makefile.perl: Makefile.PL xs_files xfconfperl.maps Makefile
test -f $$f || $(LN_S) $(srcdir)/$$f $$f; \
done; \
fi
- top_builddir="$(top_srcdir)" $(PERL) Makefile.PL PREFIX="$(prefix)"
+ top_builddir="$(top_srcdir)" $(PERL) Makefile.PL PREFIX="$(prefix)" $(PERL_MAKE_OPTIONS)
all-local: Makefile.perl
$(MAKE) -f Makefile.perl