You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2006/12/01 16:15:20 UTC
svn commit: r481262 - in /incubator/qpid/trunk/qpid/cpp: bootstrap
configure.ac lib/broker/Makefile.am lib/client/Makefile.am
lib/common/Makefile.am
Author: gsim
Date: Fri Dec 1 07:15:18 2006
New Revision: 481262
URL: http://svn.apache.org/viewvc?view=rev&rev=481262
Log:
Path from Jim Meyering (sent to qpid-dev list) to fix issue with gen.mk plus apr dependencies etc.
Modified:
incubator/qpid/trunk/qpid/cpp/bootstrap
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/bootstrap?view=diff&rev=481262&r1=481261&r2=481262
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/bootstrap (original)
+++ incubator/qpid/trunk/qpid/cpp/bootstrap Fri Dec 1 07:15:18 2006
@@ -1,8 +1,13 @@
#!/bin/sh
+set -e
aclocal -I m4
autoheader
libtoolize --automake
+
+# Generate (for automake) lots of repetitive parts of tests/Makefile.am.
+(cd tests && rm -f gen.mk
+ perl -ne '/^include / or print' Makefile.am \
+ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk )
+
automake
autoconf
-./configure --enable-warnings --prefix=/tmp/qpid-inst CXXFLAGS=-g
-
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=481262&r1=481261&r2=481262
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Fri Dec 1 07:15:18 2006
@@ -32,7 +32,7 @@
*) AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
esac],
[enableval=yes])
-
+
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
# qpid-dev list.
@@ -79,6 +79,14 @@
AC_SUBST(LIBTOOL_VERSION_INFO_ARG)
gl_CLOCK_TIME
+
+APR_MINIMUM_VERSION=1.2.7
+PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
+
+APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
+AC_SUBST(APR_CXXFLAGS)
+AC_SUBST(APR_LIBS)
+
AC_CONFIG_FILES([
Makefile
Modified: incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am?view=diff&rev=481262&r1=481261&r2=481262
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am Fri Dec 1 07:15:18 2006
@@ -1,10 +1,10 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
-INCLUDES = \
- -I$(shell apr-1-config --includedir) \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES = \
+ -I$(top_srcdir)/gen \
+ -I$(top_srcdir)/lib/common \
+ -I$(top_srcdir)/lib/common/sys \
+ -I$(top_srcdir)/lib/common/framing \
+ $(APR_CXXFLAGS)
lib_LTLIBRARIES = libbroker.la
libbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
Modified: incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am?view=diff&rev=481262&r1=481261&r2=481262
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am Fri Dec 1 07:15:18 2006
@@ -1,10 +1,10 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
-INCLUDES = \
- -I$(shell apr-1-config --includedir) \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES = \
+ -I$(top_srcdir)/gen \
+ -I$(top_srcdir)/lib/common \
+ -I$(top_srcdir)/lib/common/sys \
+ -I$(top_srcdir)/lib/common/framing \
+ $(APR_CXXFLAGS)
lib_LTLIBRARIES = libclient.la
libclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=481262&r1=481261&r2=481262
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Fri Dec 1 07:15:18 2006
@@ -1,11 +1,10 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
-LIBS = -lapr-1
+AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = \
- -I$(shell apr-1-config --includedir) \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing
+INCLUDES = \
+ -I$(top_srcdir)/gen \
+ -I$(top_srcdir)/lib/common/sys \
+ -I$(top_srcdir)/lib/common/framing \
+ $(APR_CXXFLAGS)
apr = sys/apr
apr_src = \
@@ -24,7 +23,7 @@
$(apr)/Thread.cpp
posix = sys/posix
-posix_src = \
+posix_src = \
$(posix)/PosixAcceptor.cpp \
$(posix)/Socket.cpp \
$(posix)/Thread.cpp \
@@ -43,6 +42,7 @@
lib_LTLIBRARIES = libcommon.la
libcommon_la_LIBADD = \
+ $(APR_LIBS) \
$(LIB_DLOPEN) \
$(LIB_CLOCK_GETTIME)