Parcourir la source

[trac438] Fix problems in configure.ac and a Makefile.am

Stephen Morris il y a 14 ans
Parent
commit
f70d352db0
2 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 3 3
      configure.ac
  2. 1 0
      src/lib/log/Makefile.am

+ 3 - 3
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)
 

+ 1 - 0
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