You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2011/01/28 20:11:54 UTC
svn commit: r1064811 - in /qpid/trunk/qpid/cpp:
bindings/qpid/perl/Makefile.am configure.ac
Author: tross
Date: Fri Jan 28 19:11:54 2011
New Revision: 1064811
URL: http://svn.apache.org/viewvc?rev=1064811&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am
qpid/trunk/qpid/cpp/configure.ac
Modified: qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am?rev=1064811&r1=1064810&r2=1064811&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/perl/Makefile.am Fri Jan 28 19:11:54 2011
@@ -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
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1064811&r1=1064810&r2=1064811&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Fri Jan 28 19:11:54 2011
@@ -233,9 +233,9 @@ AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [tes
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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org