diff options
| author | Ted Ross <tross@apache.org> | 2011-01-28 19:11:54 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-01-28 19:11:54 +0000 |
| commit | b7c255e9589aa454b6d52afbc3e29bf08c679df3 (patch) | |
| tree | efbede6be678fae52be8350e24ffd4a9d8cdbc93 /cpp | |
| parent | ead1307223c73d6efcc5573c177a22e238440f39 (diff) | |
| download | qpid-python-b7c255e9589aa454b6d52afbc3e29bf08c679df3.tar.gz | |
QPID-3009 - Fixed configuration problem found by gsim.
There's certainly a better way to find the include path for the perl-devel headers but
this will prevent builds from being broken.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064811 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bindings/qpid/perl/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/configure.ac | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/bindings/qpid/perl/Makefile.am b/cpp/bindings/qpid/perl/Makefile.am index 566c8256d2..982d493ba0 100644 --- a/cpp/bindings/qpid/perl/Makefile.am +++ b/cpp/bindings/qpid/perl/Makefile.am @@ -19,7 +19,7 @@ if HAVE_PERL_DEVEL -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC) EXTRA_DIST = perl.i BUILT_SOURCES = cqpid.cpp @@ -34,7 +34,7 @@ cqpid_PERL = cqpid.pm cqpid_la_LDFLAGS = -avoid-version -module -shared cqpid_la_LIBADD = -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \ $(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la -cqpid_la_CXXFLAGS = $(INCLUDES) $(PERL_INC) +cqpid_la_CXXFLAGS = $(INCLUDES) nodist_cqpid_la_SOURCES = cqpid.cpp CLEANFILES = cqpid.cpp cqpid.pm diff --git a/cpp/configure.ac b/cpp/configure.ac index dc92cd0b44..1ed6ee1975 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -233,9 +233,9 @@ AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test -f $PYTHON_INC/Python.h && test -n "$S AC_CHECK_PROG([H2XS], [h2xs], [h2xs]) if test -n "$H2XS" ; then - AC_CHECK_FILE("$libdir/perl5/CORE/perl.h", [AC_SUBST([PERL_INC], "-I$libdir/perl5/CORE")]) + 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"]) +AM_CONDITIONAL([HAVE_PERL_DEVEL], [test -n "$H2XS" && test -n "$SWIG" && test -n "$PERL_INC"]) specdir=`pwd`/$srcdir/../specs |