--- yoda/configure 2005/05/07 08:47:27 4.2 +++ yoda/configure 2005/05/28 10:43:27 4.4 @@ -463,7 +463,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LOG4CXX_INCLUDES LOG4CXX_LDFLAGS LOG4CXX_LIBRARY LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1797,7 +1797,7 @@ # Define the identity of the package. PACKAGE=yoda - VERSION=4.0.0 + VERSION=4.2.4 cat >>confdefs.h <<_ACEOF @@ -19596,6 +19596,25 @@ fi; LOG4CXX_INCLUDES="-I${LOG4CXX}/include" +#------------------------------------------------------------ + +# Check whether --with-log4cxx or --without-log4cxx was given. +if test "${with_log4cxx+set}" = set; then + withval="$with_log4cxx" + LOG4CXX=$with_log4cxx +fi; + +LOG4CXX_LIBRARY="${LOG4CXX}/lib" +LOG4CXX_INCLUDES="-I${LOG4CXX}/include" +LOG4CXX_LDFLAGS=" ${LOG4CXX_LIBRARY}/liblog4cxx.so " + + + + +#------------------------------------------------------------ + + + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -20505,6 +20524,9 @@ s,@ROOT_INCLUDES@,$ROOT_INCLUDES,;t t s,@ROOT_LDFLAGS@,$ROOT_LDFLAGS,;t t s,@ROOTCINT@,$ROOTCINT,;t t +s,@LOG4CXX_INCLUDES@,$LOG4CXX_INCLUDES,;t t +s,@LOG4CXX_LDFLAGS@,$LOG4CXX_LDFLAGS,;t t +s,@LOG4CXX_LIBRARY@,$LOG4CXX_LIBRARY,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF