You are viewing a plain text version of this content. The canonical link for it is here.

Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2007/01/07 21:53:00 UTC

svn commit: r493833 - /logging/log4cxx/trunk/configure.in

Author: carnold
Date: Sun Jan  7 12:52:59 2007
New Revision: 493833

URL: http://svn.apache.org/viewvc?view=rev&rev=493833
Log:
LOGCXX-74: Support non-std cppunit location

Modified:
    logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=493833&r1=493832&r2=493833
==============================================================================
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sun Jan  7 12:52:59 2007
@@ -122,8 +122,16 @@
                 AC_MSG_WARN(cppunit not found !)
         fi
 
-        AC_CHECK_HEADER([cppunit/TestFixture.h],,
+        # save cpp and ld options
+        _save_CPPFLAGS="$CPPFLAGS"
+        _save_LIBS="$LIBS"
+
+	    LIBS="$LIBS $LIBS_CPPUNIT"
+	    CPPFLAGS="$CPPFLAGS $CPPFLAGS_CPPUNIT"
+           AC_CHECK_HEADER([cppunit/TestFixture.h],,
                 enable_tests=no)
+	    CPPFLAGS="$_save_CPPFLAGS"
+	    LIBS="$_save_LIBS"
 fi
 
 AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)