diff options
| author | Gordon Sim <gsim@apache.org> | 2011-01-31 22:17:04 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-01-31 22:17:04 +0000 |
| commit | 60c603b30f0591c1877a90d626553be6544ea73d (patch) | |
| tree | 35fc886da14e41f078125ba3900ab72f5390406e /qpid/cpp | |
| parent | 55c22f0d29b5ac0226f206f42544a5e56970a387 (diff) | |
| download | qpid-python-60c603b30f0591c1877a90d626553be6544ea73d.tar.gz | |
QPID-3009: Improved configure support for python bindings based on suggestion by Jose Pedro Oliveira
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1065832 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 1ed6ee1975..a0cf2fed76 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -232,11 +232,13 @@ AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test -f $PYTHON_INC/Python.h && test -n "$S # Perl bindings: AC_CHECK_PROG([H2XS], [h2xs], [h2xs]) -if test -n "$H2XS" ; then - AC_CHECK_FILE("$libdir/perl5/CORE/perl.h", [AC_SUBST([PERL_INC], "$libdir/perl5/CORE")]) -fi -AM_CONDITIONAL([HAVE_PERL_DEVEL], [test -n "$H2XS" && test -n "$SWIG" && test -n "$PERL_INC"]) - +AC_CHECK_PROG([PERL], [perl], [perl]) +if test -n "$PERL"; then + PERL_ARCHLIB=`perl -MConfig -e 'print "$Config{archlib}";'` + AC_CHECK_FILE( ["$PERL_ARCHLIB/CORE/perl.h"], + [AC_SUBST([PERL_INC], ["$PERL_ARCHLIB/CORE"])] ) +fi +AM_CONDITIONAL([HAVE_PERL_DEVEL], [test -n "$PERL" && test -n "$H2XS" && test -n "$SWIG" && test -n "$PERL_INC"]) specdir=`pwd`/$srcdir/../specs AMQP_FINAL_XML=$specdir/amqp.0-10-qpid-errata.xml |