BIND 10 trac438, updated. f70d352db01e774ad9561499f2205de3e66e8dbb [trac438] Fix problems in configure.ac and a Makefile.am
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 1 18:24:02 UTC 2011
The branch, trac438 has been updated
via f70d352db01e774ad9561499f2205de3e66e8dbb (commit)
from 6c8cd2a184118179db9e54eed8967cedbafecbab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f70d352db01e774ad9561499f2205de3e66e8dbb
Author: Stephen Morris <stephen at isc.org>
Date: Tue Feb 1 18:21:35 2011 +0000
[trac438] Fix problems in configure.ac and a Makefile.am
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 +++---
src/lib/log/Makefile.am | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c894c23..aa92558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,7 +336,7 @@ AC_ARG_WITH([log4cxx],
[specify directory where log4cxx is installed]),
[
log4cxx_include_path="${withval}/include";
- log4cxx_lib_path="${$withval}/lib"
+ log4cxx_library_path="${withval}/lib"
])
# If not specified, try some common paths. These default to
@@ -348,7 +348,7 @@ if test -z "$with_log4cxx"; then
do
if test -d $d/include/log4cxx; then
log4cxx_include_path=$d/include
- log4cxx_library_path=$d/lib
+ log4cxx_library_path=$d/lib
break
fi
done
@@ -365,7 +365,7 @@ AC_SUBST(LOG4CXX_INCLUDES)
LOG4CXX_LDFLAGS="-llog4cxx";
if test "${log4cxx_library_path}"; then
- LOG4CXX_LDFLAGS="-L{log4cxx_library_path} -llog4cxx"
+ LOG4CXX_LDFLAGS="-L${log4cxx_library_path} -llog4cxx"
fi
AC_SUBST(LOG4CXX_LDFLAGS)
diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am
index 9171682..47e4f81 100644
--- a/src/lib/log/Makefile.am
+++ b/src/lib/log/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = . compiler tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(LOG4CXX_INCLUDES)
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
CLEANFILES = *.gcno *.gcda
More information about the bind10-changes
mailing list