--- yoda/configure.in 2005/03/04 10:22:12 2.4.2.1 +++ yoda/configure.in 2006/09/29 10:19:08 6.1 @@ -5,9 +5,10 @@ dnl changing all the relative path for all the files involved in the code! dnl this will be called in the all the other MAKEFILEs as "@top_srcdir@" AC_INIT(event/PamelaRun.h) +AC_CONFIG_HEADER(dummy.h) dnl Adds several standard checks. It takes the program name and version number as arguments. -AM_INIT_AUTOMAKE([yoda],[2.5.0]) +AM_INIT_AUTOMAKE([yoda],[4.2.4]) dnl Indicates that you will be using a config.h file dnl config.h will be generated by AUTOCONF using a confing.h.in file @@ -52,7 +53,7 @@ dnl This will allow you to build code in sub-directories into temporary libraries, dnl which MAKE will then link in with the rest of the code -AC_PROG_RANLIB +dnl AC_PROG_RANLIB AC_PROG_MAKE_SET @@ -73,25 +74,9 @@ ROOT_LIBRARY="${ROOTSYS}/lib" -ROOT_LDFLAGS=" \ -${ROOT_LIBRARY}/libCint.so ${ROOT_LIBRARY}/libCore.so \ -${ROOT_LIBRARY}/libMatrix.so ${ROOT_LIBRARY}/libHist.so \ -${ROOT_LIBRARY}/libTree.so ${ROOT_LIBRARY}/libGraf.so \ -${ROOT_LIBRARY}/libGraf3d.so ${ROOT_LIBRARY}/libGpad.so \ -${ROOT_LIBRARY}/libGui.so ${ROOT_LIBRARY}/libMinuit.so \ -${ROOT_LIBRARY}/libHistPainter.so ${ROOT_LIBRARY}/libTreePlayer.so \ -${ROOT_LIBRARY}/libTreeViewer.so ${ROOT_LIBRARY}/libProof.so \ -${ROOT_LIBRARY}/libProofGui.so ${ROOT_LIBRARY}/libPhysics.so \ -${ROOT_LIBRARY}/libRint.so ${ROOT_LIBRARY}/libHtml.so \ -${ROOT_LIBRARY}/libEG.so ${ROOT_LIBRARY}/libGeom.so \ -${ROOT_LIBRARY}/libGeomPainter.so ${ROOT_LIBRARY}/libVMC.so \ -${ROOT_LIBRARY}/libFumili.so ${ROOT_LIBRARY}/libMLP.so \ -${ROOT_LIBRARY}/libGedOld.so ${ROOT_LIBRARY}/libGed.so \ -${ROOT_LIBRARY}/libQuadp.so \ -${ROOT_LIBRARY}/libGX11.so ${ROOT_LIBRARY}/libGX11TTF.so \ -${ROOT_LIBRARY}/libX3d.so \ -${ROOT_LIBRARY}/libRGL.so ${ROOT_LIBRARY}/libASImage.so \ -${ROOT_LIBRARY}/libThread.so ${ROOT_LIBRARY}/libRXML.so \ +ROOT_LDFLAGS=" \ +${ROOT_LIBRARY}/libCint.so ${ROOT_LIBRARY}/libCore.so \ +${ROOT_LIBRARY}/libTree.so \ -ldl" @@ -117,6 +102,22 @@ [--with-log4cxx=path Use the specified directroy for log4cxx], LOG4CXX=$with_log4cxx,) LOG4CXX_INCLUDES="-I${LOG4CXX}/include" +AC_SUBST(LOG4CXX_INCLUDES) +#------------------------------------------------------------ +AC_ARG_WITH(log4cxx, + [--with-log4cxx=path Use the specified directroy for log4cxx], + LOG4CXX=$with_log4cxx,) + +LOG4CXX_LIBRARY="${LOG4CXX}/lib" +LOG4CXX_INCLUDES="-I${LOG4CXX}/include" +LOG4CXX_LDFLAGS=" ${LOG4CXX_LIBRARY}/liblog4cxx.so " + +AC_SUBST(LOG4CXX_INCLUDES) +AC_SUBST(LOG4CXX_LDFLAGS) +AC_SUBST(LOG4CXX_LIBRARY) +#------------------------------------------------------------ + + dnl Checks for header files. AC_HEADER_STDC @@ -135,10 +136,10 @@ event/arrDump/Makefile \ event/tabDump/Makefile \ event/varDump/Makefile \ - event/endrun/Makefile \ - event/physics/Makefile \ event/tsbt/Makefile \ event/tsbb/Makefile \ + event/endrun/Makefile \ + event/physics/Makefile \ event/physics/tracker/Makefile \ event/physics/anticounter/Makefile \ event/physics/calorimeter/Makefile \