--- yoda/configure.in 2005/01/29 00:26:30 2.4 +++ yoda/configure.in 2005/08/29 09:45:01 5.0 @@ -7,7 +7,7 @@ AC_INIT(event/PamelaRun.h) dnl Adds several standard checks. It takes the program name and version number as arguments. -AM_INIT_AUTOMAKE([yoda],[0.1.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 +52,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 @@ -90,8 +90,8 @@ ${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_LIBRARY}/libASImage.so \ +${ROOT_LIBRARY}/libThread.so \ -ldl" @@ -117,6 +117,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,6 +151,9 @@ event/arrDump/Makefile \ event/tabDump/Makefile \ event/varDump/Makefile \ + event/tsbt/Makefile \ + event/tsbb/Makefile \ + event/endrun/Makefile \ event/physics/Makefile \ event/physics/tracker/Makefile \ event/physics/anticounter/Makefile \