Changeset 10200


Ignore:
Timestamp:
Mar 2, 2011, 10:10:40 AM (10 years ago)
Author:
tbretz
Message:
Updated.
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.in

    r10190 r10200  
    3939host_triplet = @host@
    4040DIST_COMMON = README $(am__configure_deps) $(dist_noinst_SCRIPTS) \
    41         $(libDimCpp_la_HEADERS) $(libDim_la_HEADERS) \
     41        $(libDim___la_HEADERS) $(libDim_la_HEADERS) \
    4242        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    4343        $(srcdir)/aminclude.am $(top_srcdir)/configure \
     
    5555        $(top_srcdir)/.macro_dir/ltversion.m4 \
    5656        $(top_srcdir)/.macro_dir/lt~obsolete.m4 \
     57        $(top_srcdir)/.macro_dir/mysql++_devel.m4 \
     58        $(top_srcdir)/.macro_dir/mysql_devel.m4 \
    5759        $(top_srcdir)/configure.ac
    5860am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
     
    8587  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
    8688am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
    87         "$(DESTDIR)$(libDimCpp_ladir)" "$(DESTDIR)$(libDim_ladir)"
     89        "$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"
    8890LTLIBRARIES = $(lib_LTLIBRARIES)
    8991libConfiguration_la_LIBADD =
     
    9496am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
    9597am__v_lt_0 = --silent
     98libDim___la_LIBADD =
     99am_libDim___la_OBJECTS = dim_v19r15/src/diccpp.lo \
     100        dim_v19r15/src/dimcpp.lo dim_v19r15/src/tokenstring.lo \
     101        dim_v19r15/src/discpp.lo
     102libDim___la_OBJECTS = $(am_libDim___la_OBJECTS)
    96103libDim_la_LIBADD =
    97104am_libDim_la_OBJECTS = dim_v19r15/src/dic.lo dim_v19r15/src/dis.lo \
     
    103110        dim_v19r15/src/dim_thr.lo dim_v19r15/src/utilities.lo
    104111libDim_la_OBJECTS = $(am_libDim_la_OBJECTS)
    105 libDimCpp_la_LIBADD =
    106 am_libDimCpp_la_OBJECTS = dim_v19r15/src/diccpp.lo \
    107         dim_v19r15/src/dimcpp.lo dim_v19r15/src/tokenstring.lo \
    108         dim_v19r15/src/discpp.lo
    109 libDimCpp_la_OBJECTS = $(am_libDimCpp_la_OBJECTS)
    110112libStateMachine_la_LIBADD =
    111113am_libStateMachine_la_OBJECTS = src/EventImp.lo src/Event.lo \
     
    130132        src/LocalControl.$(OBJEXT)
    131133dclient5_OBJECTS = $(am_dclient5_OBJECTS)
    132 dclient5_DEPENDENCIES = libDim.la libDimCpp.la libTools.la libTime.la \
     134dclient5_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
    133135        libStateMachine.la libConfiguration.la
    134136am_did_OBJECTS = dim_v19r15/src/did/did-did.$(OBJEXT) \
     
    142144dserver2_OBJECTS = $(am_dserver2_OBJECTS)
    143145dserver2_DEPENDENCIES = libTime.la libTools.la libStateMachine.la \
    144         libDim.la libDimCpp.la
     146        libDim.la libDim++.la
    145147am_log_OBJECTS = src/log.$(OBJEXT)
    146148log_OBJECTS = $(am_log_OBJECTS)
    147 log_DEPENDENCIES = libTime.la libTools.la libDim.la libDimCpp.la \
     149log_DEPENDENCIES = libTime.la libTools.la libDim.la libDim++.la \
    148150        libStateMachine.la
    149151am_logtime_OBJECTS = src/logtime.$(OBJEXT)
    150152logtime_OBJECTS = $(am_logtime_OBJECTS)
    151153logtime_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    152         libDim.la libDimCpp.la
     154        libDim.la libDim++.la
    153155am_test3_OBJECTS = src/test3.$(OBJEXT) src/RemoteControl.$(OBJEXT)
    154156test3_OBJECTS = $(am_test3_OBJECTS)
    155157test3_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
    156         libDim.la libDimCpp.la libConfiguration.la
     158        libDim.la libDim++.la libConfiguration.la
    157159am_time_OBJECTS = src/time.$(OBJEXT)
    158160time_OBJECTS = $(am_time_OBJECTS)
     
    201203am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
    202204am__v_GEN_0 = @echo "  GEN   " $@;
    203 SOURCES = $(libConfiguration_la_SOURCES) $(libDim_la_SOURCES) \
    204         $(libDimCpp_la_SOURCES) $(libStateMachine_la_SOURCES) \
     205SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
     206        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    205207        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    206208        $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
    207209        $(dserver2_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    208210        $(test3_SOURCES) $(time_SOURCES)
    209 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim_la_SOURCES) \
    210         $(libDimCpp_la_SOURCES) $(libStateMachine_la_SOURCES) \
     211DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
     212        $(libDim_la_SOURCES) $(libStateMachine_la_SOURCES) \
    211213        $(libTime_la_SOURCES) $(libTools_la_SOURCES) $(argv_SOURCES) \
    212214        $(dclient5_SOURCES) $(did_SOURCES) $(dns_SOURCES) \
    213215        $(dserver2_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
    214216        $(test3_SOURCES) $(time_SOURCES)
    215 HEADERS = $(libDimCpp_la_HEADERS) $(libDim_la_HEADERS)
     217HEADERS = $(libDim___la_HEADERS) $(libDim_la_HEADERS)
    216218ETAGS = etags
    217219CTAGS = ctags
     
    304306MAKEINFO = @MAKEINFO@
    305307MKDIR_P = @MKDIR_P@
     308MYSQLPP_INC_DIR = @MYSQLPP_INC_DIR@
     309MYSQLPP_LIB_DIR = @MYSQLPP_LIB_DIR@
     310MYSQL_C_INC_DIR = @MYSQL_C_INC_DIR@
     311MYSQL_C_LIB_DIR = @MYSQL_C_LIB_DIR@
     312MYSQL_C_LIB_NAME = @MYSQL_C_LIB_NAME@
    306313NM = @NM@
    307314NMEDIT = @NMEDIT@
     
    318325PACKAGE_VERSION = @PACKAGE_VERSION@
    319326PATH_SEPARATOR = @PATH_SEPARATOR@
     327PTHREAD_CC = @PTHREAD_CC@
     328PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
     329PTHREAD_LIBS = @PTHREAD_LIBS@
    320330RANLIB = @RANLIB@
    321331SED = @SED@
     
    331341ac_ct_CXX = @ac_ct_CXX@
    332342ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
     343acx_pthread_config = @acx_pthread_config@
    333344am__include = @am__include@
    334345am__leading_dot = @am__leading_dot@
     
    407418AM_CPPFLAGS = \
    408419   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
    409    -Idim_v19r15/dim $(DIM_FLAGS)
     420   -Idim_v19r15/dim $(DIM_FLAGS) $(PTHREAD_CFLAGS)
    410421
    411422AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
     
    413424# -no-undefined
    414425AM_LDFLAGS = -module -avoid-version \
     426        $(PTHREAD_CFLAGS) \
     427        -lmysqlpp \
    415428        -lboost_system \
    416429        -lboost_thread \
     
    418431        -lboost_date_time \
    419432        -lboost_program_options \
    420         -lboost_filesystem \
    421         -lmysqlpp
    422 
    423 lib_LTLIBRARIES = libDim.la libDimCpp.la libTime.la libTools.la \
     433        -lboost_filesystem
     434
     435lib_LTLIBRARIES = libDim.la libDim++.la libTime.la libTools.la \
    424436                  libConfiguration.la libStateMachine.la
    425437
     
    428440dist_noinst_SCRIPTS = autogen.sh
    429441EXTRA_DIST = \
     442        Doxyfile \
    430443        dim_v19r15/DIM_Performance.pdf \
    431444        dim_v19r15/LICENSE.GPL \
     
    477490
    478491#libDimCpp_la_CXXFLAGS = $(AM_CXXFLAGS) $(DIM_FLAGS)
    479 libDimCpp_ladir =
    480 libDimCpp_la_HEADERS = \
     492libDim___ladir =
     493libDim___la_HEADERS = \
    481494        dim_v19r15/dim/dic.hxx \
    482495        dim_v19r15/dim/dim_core.hxx \
     
    487500        dim_v19r15/dim/tokenstring.hxx
    488501
    489 libDimCpp_la_SOURCES = \
     502libDim___la_SOURCES = \
    490503        dim_v19r15/src/diccpp.cxx \
    491504        dim_v19r15/src/dimcpp.cxx \
     
    518531libTools_la_SOURCES = src/tools.h src/tools.cc
    519532dserver2_SOURCES = src/dserver2.cc
    520 dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDimCpp.la
     533dserver2_LDADD = libTime.la libTools.la libStateMachine.la libDim.la libDim++.la
    521534log_SOURCES = src/log.cc
    522 log_LDADD = libTime.la libTools.la libDim.la libDimCpp.la libStateMachine.la
    523 logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la
     535log_LDADD = libTime.la libTools.la libDim.la libDim++.la libStateMachine.la
     536logtime_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la
    524537logtime_SOURCES = src/logtime.cc
    525538dclient5_SOURCES = src/dclient5.cc src/LocalControl.cc
    526 dclient5_LDADD = libDim.la libDimCpp.la libTools.la libTime.la libStateMachine.la \
     539dclient5_LDADD = libDim.la libDim++.la libTools.la libTime.la libStateMachine.la \
    527540    libConfiguration.la
    528541
     
    530543argv_LDADD = libConfiguration.la
    531544test3_SOURCES = src/test3.cc src/RemoteControl.cc
    532 test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDimCpp.la libConfiguration.la
     545test3_LDADD = libStateMachine.la libTools.la libTime.la libDim.la libDim++.la libConfiguration.la
    533546time_SOURCES = src/time.cc
    534547time_LDADD = libTime.la
     
    618631        @$(MKDIR_P) dim_v19r15/src/$(DEPDIR)
    619632        @: > dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     633dim_v19r15/src/diccpp.lo: dim_v19r15/src/$(am__dirstamp) \
     634        dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     635dim_v19r15/src/dimcpp.lo: dim_v19r15/src/$(am__dirstamp) \
     636        dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     637dim_v19r15/src/tokenstring.lo: dim_v19r15/src/$(am__dirstamp) \
     638        dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     639dim_v19r15/src/discpp.lo: dim_v19r15/src/$(am__dirstamp) \
     640        dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     641libDim++.la: $(libDim___la_OBJECTS) $(libDim___la_DEPENDENCIES)
     642        $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDim___la_OBJECTS) $(libDim___la_LIBADD) $(LIBS)
    620643dim_v19r15/src/dic.lo: dim_v19r15/src/$(am__dirstamp) \
    621644        dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
     
    648671libDim.la: $(libDim_la_OBJECTS) $(libDim_la_DEPENDENCIES)
    649672        $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libDim_la_OBJECTS) $(libDim_la_LIBADD) $(LIBS)
    650 dim_v19r15/src/diccpp.lo: dim_v19r15/src/$(am__dirstamp) \
    651         dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
    652 dim_v19r15/src/dimcpp.lo: dim_v19r15/src/$(am__dirstamp) \
    653         dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
    654 dim_v19r15/src/tokenstring.lo: dim_v19r15/src/$(am__dirstamp) \
    655         dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
    656 dim_v19r15/src/discpp.lo: dim_v19r15/src/$(am__dirstamp) \
    657         dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
    658 libDimCpp.la: $(libDimCpp_la_OBJECTS) $(libDimCpp_la_DEPENDENCIES)
    659         $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDimCpp_la_OBJECTS) $(libDimCpp_la_LIBADD) $(LIBS)
    660673src/EventImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
    661674src/Event.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
     
    10661079distclean-libtool:
    10671080        -rm -f libtool config.lt
    1068 install-libDimCpp_laHEADERS: $(libDimCpp_la_HEADERS)
     1081install-libDim___laHEADERS: $(libDim___la_HEADERS)
    10691082        @$(NORMAL_INSTALL)
    1070         test -z "$(libDimCpp_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libDimCpp_ladir)"
    1071         @list='$(libDimCpp_la_HEADERS)'; test -n "$(libDimCpp_ladir)" || list=; \
     1083        test -z "$(libDim___ladir)" || $(MKDIR_P) "$(DESTDIR)$(libDim___ladir)"
     1084        @list='$(libDim___la_HEADERS)'; test -n "$(libDim___ladir)" || list=; \
    10721085        for p in $$list; do \
    10731086          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     
    10751088        done | $(am__base_list) | \
    10761089        while read files; do \
    1077           echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libDimCpp_ladir)'"; \
    1078           $(INSTALL_HEADER) $$files "$(DESTDIR)$(libDimCpp_ladir)" || exit $$?; \
     1090          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libDim___ladir)'"; \
     1091          $(INSTALL_HEADER) $$files "$(DESTDIR)$(libDim___ladir)" || exit $$?; \
    10791092        done
    10801093
    1081 uninstall-libDimCpp_laHEADERS:
     1094uninstall-libDim___laHEADERS:
    10821095        @$(NORMAL_UNINSTALL)
    1083         @list='$(libDimCpp_la_HEADERS)'; test -n "$(libDimCpp_ladir)" || list=; \
     1096        @list='$(libDim___la_HEADERS)'; test -n "$(libDim___ladir)" || list=; \
    10841097        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
    10851098        test -n "$$files" || exit 0; \
    1086         echo " ( cd '$(DESTDIR)$(libDimCpp_ladir)' && rm -f" $$files ")"; \
    1087         cd "$(DESTDIR)$(libDimCpp_ladir)" && rm -f $$files
     1099        echo " ( cd '$(DESTDIR)$(libDim___ladir)' && rm -f" $$files ")"; \
     1100        cd "$(DESTDIR)$(libDim___ladir)" && rm -f $$files
    10881101install-libDim_laHEADERS: $(libDim_la_HEADERS)
    10891102        @$(NORMAL_INSTALL)
     
    13121325
    13131326installdirs:
    1314         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libDimCpp_ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
     1327        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libDim___ladir)" "$(DESTDIR)$(libDim_ladir)"; do \
    13151328          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    13161329        done
     
    13701383info-am:
    13711384
    1372 install-data-am: install-libDimCpp_laHEADERS install-libDim_laHEADERS
     1385install-data-am: install-libDim___laHEADERS install-libDim_laHEADERS
    13731386
    13741387install-dvi: install-dvi-am
     
    14181431ps-am:
    14191432
    1420 uninstall-am: uninstall-binPROGRAMS uninstall-libDimCpp_laHEADERS \
     1433uninstall-am: uninstall-binPROGRAMS uninstall-libDim___laHEADERS \
    14211434        uninstall-libDim_laHEADERS uninstall-libLTLIBRARIES
    14221435
     
    14331446        install-data-am install-dvi install-dvi-am install-exec \
    14341447        install-exec-am install-html install-html-am install-info \
    1435         install-info-am install-libDimCpp_laHEADERS \
     1448        install-info-am install-libDim___laHEADERS \
    14361449        install-libDim_laHEADERS install-libLTLIBRARIES install-man \
    14371450        install-pdf install-pdf-am install-ps install-ps-am \
     
    14411454        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    14421455        tags uninstall uninstall-am uninstall-binPROGRAMS \
    1443         uninstall-libDimCpp_laHEADERS uninstall-libDim_laHEADERS \
     1456        uninstall-libDim___laHEADERS uninstall-libDim_laHEADERS \
    14441457        uninstall-libLTLIBRARIES
    14451458
     
    14921505#                       $(pkg_verbose)cp $(srcdir)/foo.in $@
    14931506
     1507#$(MyAnalysisDS): $(MyAnalysisH) $(MyAnalysisL)
     1508#       $(ROOTCINT) -f $@ -c -I$(top_builddir)/config $(INCLUDES) $^
     1509#       rootcint_files=`echo $@ | sed -ne 's/\(.*\)\..*/\1.cxx \1.h/p'` && \
     1510#        $(top_srcdir)/config/runsed $(top_srcdir)/config/rootcint.sed $$rootcint_files && \
     1511#        for i in $$rootcint_files; do \
     1512#          if test ! `diff $$i $(srcdir)/$$i >/dev/null 2>&1`; then \
     1513#            cp $$i $(srcdir)/; \
     1514#          fi; \
     1515#        done
     1516
    14941517# Tell versions [3.59,3.63) of GNU make to not export all variables.
    14951518# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/FACT++/configure

    r10190 r10200  
    747747LTLIBOBJS
    748748LIBOBJS
     749ROOTSOVERSION
     750ROOTVERSION
     751ROOTRPATH
     752ROOTAUXCFLAGS
     753ROOTAUXLIBS
     754ROOTGLIBS
     755ROOTLIBS
     756ROOTCFLAGS
     757ROOTETCDIR
     758ROOTINCDIR
     759ROOTLIBDIR
     760ROOTCINT
     761ROOTEXEC
     762ROOTCONF
    749763BOOST_THREAD_LIB
    750764BOOST_SYSTEM_LIB
     
    798812DX_DOXYGEN
    799813DX_FLAG_doc
    800 DX_ENV
    801814DX_DOCDIR
    802815DX_CONFIG
    803816DX_PROJECT
     817DX_ENV
    804818AM_BACKSLASH
    805819AM_DEFAULT_VERBOSITY
     
    919933ac_user_opts='
    920934enable_option_checking
     935enable_shared
    921936enable_static
    922 enable_shared
    923937with_pic
    924938enable_fast_install
     
    946960with_boost_system
    947961with_boost_thread
     962with_rootsys
    948963with_mysqlpp_lib_path
    949964'
     
    15821597  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    15831598  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    1584   --enable-static[=PKGS]  build static libraries [default=no]
    15851599  --enable-shared[=PKGS]  build shared libraries [default=yes]
     1600  --enable-static[=PKGS]  build static libraries [default=yes]
    15861601  --enable-fast-install[=PKGS]
    15871602                          optimize for fast installation [default=yes]
     
    16001615                          file
    16011616  --disable-doxygen-html  don't generate doxygen plain HTML documentation
    1602   --disable-doxygen-ps    don't generate doxygen PostScript documentation
     1617  --enable-doxygen-ps    generate doxygen PostScript documentation
    16031618  --disable-doxygen-pdf   don't generate doxygen PDF documentation
    16041619
     
    16471662                          to specify a certain library for the linker e.g.
    16481663                          --with-boost-thread=boost_thread-gcc-mt
     1664  --with-rootsys          top of the ROOT installation directory
    16491665
    16501666       --with-mysqlpp-lib-path location of the MySQL++ library, defaults to
     
    32043220ac_compiler_gnu=$ac_cv_c_compiler_gnu
    32053221
     3222 #If output variable CXXFLAGS was not already set, set it to -g -O2
    32063223ac_ext=cpp
    32073224ac_cpp='$CXXCPP $CPPFLAGS'
     
    41414158  lt_cv_nm_interface="BSD nm"
    41424159  echo "int some_variable = 0;" > conftest.$ac_ext
    4143   (eval echo "\"\$as_me:4143: $ac_compile\"" >&5)
     4160  (eval echo "\"\$as_me:4160: $ac_compile\"" >&5)
    41444161  (eval "$ac_compile" 2>conftest.err)
    41454162  cat conftest.err >&5
    4146   (eval echo "\"\$as_me:4146: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4163  (eval echo "\"\$as_me:4163: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    41474164  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    41484165  cat conftest.err >&5
    4149   (eval echo "\"\$as_me:4149: output\"" >&5)
     4166  (eval echo "\"\$as_me:4166: output\"" >&5)
    41504167  cat conftest.out >&5
    41514168  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     
    53535370*-*-irix6*)
    53545371  # Find out which ABI we are using.
    5355   echo '#line 5355 "configure"' > conftest.$ac_ext
     5372  echo '#line 5372 "configure"' > conftest.$ac_ext
    53565373  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    53575374  (eval $ac_compile) 2>&5
     
    67836800
    67846801# Set options
    6785 # Check whether --enable-static was given.
    6786 if test "${enable_static+set}" = set; then :
    6787   enableval=$enable_static; p=${PACKAGE-default}
    6788     case $enableval in
    6789     yes) enable_static=yes ;;
    6790     no) enable_static=no ;;
    6791     *)
    6792      enable_static=no
    6793       # Look at the argument we got.  We use all the common list separators.
    6794       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
    6795       for pkg in $enableval; do
    6796         IFS="$lt_save_ifs"
    6797         if test "X$pkg" = "X$p"; then
    6798           enable_static=yes
    6799         fi
    6800       done
    6801       IFS="$lt_save_ifs"
    6802       ;;
    6803     esac
    6804 else
    6805   enable_static=no
    6806 fi
    6807 
    6808 
    6809 
    6810 
    6811 
    6812 
    6813 
    68146802
    68156803
     
    68446832fi
    68456833
     6834
     6835
     6836
     6837
     6838
     6839
     6840
     6841
     6842  # Check whether --enable-static was given.
     6843if test "${enable_static+set}" = set; then :
     6844  enableval=$enable_static; p=${PACKAGE-default}
     6845    case $enableval in
     6846    yes) enable_static=yes ;;
     6847    no) enable_static=no ;;
     6848    *)
     6849     enable_static=no
     6850      # Look at the argument we got.  We use all the common list separators.
     6851      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
     6852      for pkg in $enableval; do
     6853        IFS="$lt_save_ifs"
     6854        if test "X$pkg" = "X$p"; then
     6855          enable_static=yes
     6856        fi
     6857      done
     6858      IFS="$lt_save_ifs"
     6859      ;;
     6860    esac
     6861else
     6862  enable_static=yes
     6863fi
    68466864
    68476865
     
    72817299   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72827300   -e 's:$: $lt_compiler_flag:'`
    7283    (eval echo "\"\$as_me:7283: $lt_compile\"" >&5)
     7301   (eval echo "\"\$as_me:7301: $lt_compile\"" >&5)
    72847302   (eval "$lt_compile" 2>conftest.err)
    72857303   ac_status=$?
    72867304   cat conftest.err >&5
    7287    echo "$as_me:7287: \$? = $ac_status" >&5
     7305   echo "$as_me:7305: \$? = $ac_status" >&5
    72887306   if (exit $ac_status) && test -s "$ac_outfile"; then
    72897307     # The compiler can only warn and ignore the option if not recognized
     
    76207638   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76217639   -e 's:$: $lt_compiler_flag:'`
    7622    (eval echo "\"\$as_me:7622: $lt_compile\"" >&5)
     7640   (eval echo "\"\$as_me:7640: $lt_compile\"" >&5)
    76237641   (eval "$lt_compile" 2>conftest.err)
    76247642   ac_status=$?
    76257643   cat conftest.err >&5
    7626    echo "$as_me:7626: \$? = $ac_status" >&5
     7644   echo "$as_me:7644: \$? = $ac_status" >&5
    76277645   if (exit $ac_status) && test -s "$ac_outfile"; then
    76287646     # The compiler can only warn and ignore the option if not recognized
     
    77257743   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77267744   -e 's:$: $lt_compiler_flag:'`
    7727    (eval echo "\"\$as_me:7727: $lt_compile\"" >&5)
     7745   (eval echo "\"\$as_me:7745: $lt_compile\"" >&5)
    77287746   (eval "$lt_compile" 2>out/conftest.err)
    77297747   ac_status=$?
    77307748   cat out/conftest.err >&5
    7731    echo "$as_me:7731: \$? = $ac_status" >&5
     7749   echo "$as_me:7749: \$? = $ac_status" >&5
    77327750   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77337751   then
     
    77807798   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77817799   -e 's:$: $lt_compiler_flag:'`
    7782    (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
     7800   (eval echo "\"\$as_me:7800: $lt_compile\"" >&5)
    77837801   (eval "$lt_compile" 2>out/conftest.err)
    77847802   ac_status=$?
    77857803   cat out/conftest.err >&5
    7786    echo "$as_me:7786: \$? = $ac_status" >&5
     7804   echo "$as_me:7804: \$? = $ac_status" >&5
    77877805   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77887806   then
     
    1016410182  lt_status=$lt_dlunknown
    1016510183  cat > conftest.$ac_ext <<_LT_EOF
    10166 #line 10166 "configure"
     10184#line 10184 "configure"
    1016710185#include "confdefs.h"
    1016810186
     
    1026010278  lt_status=$lt_dlunknown
    1026110279  cat > conftest.$ac_ext <<_LT_EOF
    10262 #line 10262 "configure"
     10280#line 10280 "configure"
    1026310281#include "confdefs.h"
    1026410282
     
    1221612234   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1221712235   -e 's:$: $lt_compiler_flag:'`
    12218    (eval echo "\"\$as_me:12218: $lt_compile\"" >&5)
     12236   (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
    1221912237   (eval "$lt_compile" 2>conftest.err)
    1222012238   ac_status=$?
    1222112239   cat conftest.err >&5
    12222    echo "$as_me:12222: \$? = $ac_status" >&5
     12240   echo "$as_me:12240: \$? = $ac_status" >&5
    1222312241   if (exit $ac_status) && test -s "$ac_outfile"; then
    1222412242     # The compiler can only warn and ignore the option if not recognized
     
    1231512333   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1231612334   -e 's:$: $lt_compiler_flag:'`
    12317    (eval echo "\"\$as_me:12317: $lt_compile\"" >&5)
     12335   (eval echo "\"\$as_me:12335: $lt_compile\"" >&5)
    1231812336   (eval "$lt_compile" 2>out/conftest.err)
    1231912337   ac_status=$?
    1232012338   cat out/conftest.err >&5
    12321    echo "$as_me:12321: \$? = $ac_status" >&5
     12339   echo "$as_me:12339: \$? = $ac_status" >&5
    1232212340   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1232312341   then
     
    1236712385   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1236812386   -e 's:$: $lt_compiler_flag:'`
    12369    (eval echo "\"\$as_me:12369: $lt_compile\"" >&5)
     12387   (eval echo "\"\$as_me:12387: $lt_compile\"" >&5)
    1237012388   (eval "$lt_compile" 2>out/conftest.err)
    1237112389   ac_status=$?
    1237212390   cat out/conftest.err >&5
    12373    echo "$as_me:12373: \$? = $ac_status" >&5
     12391   echo "$as_me:12391: \$? = $ac_status" >&5
    1237412392   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1237512393   then
     
    1334113359
    1334213360#AC_PATH_XTRA
     13361
    1334313362
    1334413363
     
    1428114300
    1428214301
    14283 
     14302######################################################################
     14303# DOXYGEN SUPPORT
     14304######################################################################
     14305
     14306### FIXME: Need a configure commandline switch
     14307DX_ENV="$DX_ENV EXTRACT_ALL='YES'"
     14308
     14309DX_ENV="$DX_ENV RECURSIVE='YES'"
     14310
     14311DX_ENV="$DX_ENV ALL_GRAPHS='NO'"
     14312  # change to yet to switch on call(er) graphs
     14313
     14314#DX_DOXYGEN_FEATURE(ON)
     14315#DX_DOT_FEATURE(ON)               # sets HAVE_DOT
     14316#DX_HTML_FEATURE(ON)              # sets GENERATE_HTML (default)
     14317#DX_CHM_FEATURE(ON|OFF)           # sets GENERATE_HTMLHELP
     14318#DX_CHI_FEATURE(ON|OFF)           # sets GENERATE_CHI
     14319#DX_MAN_FEATURE(ON)               # sets GENERATE_MAN (segfaults)
     14320#DX_RTF_FEATURE(ON|OFF)           # sets GENERATE_RTF
     14321#DX_XML_FEATURE(ON|OFF)           # sets GENERATE_XML
     14322#DX_PDF_FEATURE(ON|OFF)           # sets GENERATE_PDF (default)
     14323                # sets GENERATE_PS  (default)
    1428414324
    1428514325
    1428614326# Files:
    14287 DX_PROJECT=FACT++
     14327DX_PROJECT=$PACKAGE_NAME
    1428814328
    1428914329DX_CONFIG=Doxyfile
     
    1530015340else
    1530115341
    15302 DX_FLAG_ps=1
     15342DX_FLAG_ps=0
    1530315343
    1530415344
     
    1619916239#echo DX_ENV=$DX_ENV
    1620016240#, DOXYFILE-PATH, [OUTPUT-DIR])
    16201 #DX_DOXYGEN_FEATURE(ON)
    16202 #DX_DOT_FEATURE(ON)
    16203 #DX_HTML_FEATURE(ON)
    16204 #DX_CHM_FEATURE(ON|OFF)
    16205 #DX_CHI_FEATURE(ON|OFF)
    16206 
    16207 #DX_RTF_FEATURE(ON|OFF)
    16208 #DX_XML_FEATURE(ON|OFF)
    16209 #DX_PDF_FEATURE(ON|OFF)
    16210 
    16211 DX_ENV="$DX_ENV EXTRACT_ALL='YES'"
    16212 
    16213 DX_ENV="$DX_ENV RECURSIVE='YES'"
    16214 
    16215 DX_ENV="$DX_ENV ALL_GRAPHS='NO'"
    16216   # change to yet to switch on call(er) graphs
    1621716241
    1621816242#USE_HTAGS              = $(USE_HTAGS)
     16243
     16244######################################################################
     16245# BOOST SUPPORT
     16246######################################################################
    1621916247
    1622016248
     
    1805818086#ax_boost_wserialization
    1805918087
     18088######################################################################
     18089# ROOT SUPPORT
     18090######################################################################
     18091
     18092#ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
     18093
     18094
     18095# Check whether --with-rootsys was given.
     18096if test "${with_rootsys+set}" = set; then :
     18097  withval=$with_rootsys; user_rootsys=$withval
     18098else
     18099  user_rootsys="none"
     18100fi
     18101
     18102  if test ! x"$user_rootsys" = xnone; then
     18103    rootbin="$user_rootsys/bin"
     18104  elif test ! x"$ROOTSYS" = x ; then
     18105    rootbin="$ROOTSYS/bin"
     18106  else
     18107   rootbin=$PATH
     18108  fi
     18109  # Extract the first word of "root-config ", so it can be a program name with args.
     18110set dummy root-config ; ac_word=$2
     18111{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     18112$as_echo_n "checking for $ac_word... " >&6; }
     18113if test "${ac_cv_path_ROOTCONF+set}" = set; then :
     18114  $as_echo_n "(cached) " >&6
     18115else
     18116  case $ROOTCONF in
     18117  [\\/]* | ?:[\\/]*)
     18118  ac_cv_path_ROOTCONF="$ROOTCONF" # Let the user override the test with a path.
     18119  ;;
     18120  *)
     18121  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     18122for as_dir in $rootbin
     18123do
     18124  IFS=$as_save_IFS
     18125  test -z "$as_dir" && as_dir=.
     18126    for ac_exec_ext in '' $ac_executable_extensions; do
     18127  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     18128    ac_cv_path_ROOTCONF="$as_dir/$ac_word$ac_exec_ext"
     18129    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     18130    break 2
     18131  fi
     18132done
     18133  done
     18134IFS=$as_save_IFS
     18135
     18136  test -z "$ac_cv_path_ROOTCONF" && ac_cv_path_ROOTCONF="no"
     18137  ;;
     18138esac
     18139fi
     18140ROOTCONF=$ac_cv_path_ROOTCONF
     18141if test -n "$ROOTCONF"; then
     18142  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCONF" >&5
     18143$as_echo "$ROOTCONF" >&6; }
     18144else
     18145  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     18146$as_echo "no" >&6; }
     18147fi
     18148
     18149
     18150  # Extract the first word of "root ", so it can be a program name with args.
     18151set dummy root ; ac_word=$2
     18152{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     18153$as_echo_n "checking for $ac_word... " >&6; }
     18154if test "${ac_cv_path_ROOTEXEC+set}" = set; then :
     18155  $as_echo_n "(cached) " >&6
     18156else
     18157  case $ROOTEXEC in
     18158  [\\/]* | ?:[\\/]*)
     18159  ac_cv_path_ROOTEXEC="$ROOTEXEC" # Let the user override the test with a path.
     18160  ;;
     18161  *)
     18162  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     18163for as_dir in $rootbin
     18164do
     18165  IFS=$as_save_IFS
     18166  test -z "$as_dir" && as_dir=.
     18167    for ac_exec_ext in '' $ac_executable_extensions; do
     18168  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     18169    ac_cv_path_ROOTEXEC="$as_dir/$ac_word$ac_exec_ext"
     18170    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     18171    break 2
     18172  fi
     18173done
     18174  done
     18175IFS=$as_save_IFS
     18176
     18177  test -z "$ac_cv_path_ROOTEXEC" && ac_cv_path_ROOTEXEC="no"
     18178  ;;
     18179esac
     18180fi
     18181ROOTEXEC=$ac_cv_path_ROOTEXEC
     18182if test -n "$ROOTEXEC"; then
     18183  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTEXEC" >&5
     18184$as_echo "$ROOTEXEC" >&6; }
     18185else
     18186  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     18187$as_echo "no" >&6; }
     18188fi
     18189
     18190
     18191  # Extract the first word of "rootcint ", so it can be a program name with args.
     18192set dummy rootcint ; ac_word=$2
     18193{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     18194$as_echo_n "checking for $ac_word... " >&6; }
     18195if test "${ac_cv_path_ROOTCINT+set}" = set; then :
     18196  $as_echo_n "(cached) " >&6
     18197else
     18198  case $ROOTCINT in
     18199  [\\/]* | ?:[\\/]*)
     18200  ac_cv_path_ROOTCINT="$ROOTCINT" # Let the user override the test with a path.
     18201  ;;
     18202  *)
     18203  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     18204for as_dir in $rootbin
     18205do
     18206  IFS=$as_save_IFS
     18207  test -z "$as_dir" && as_dir=.
     18208    for ac_exec_ext in '' $ac_executable_extensions; do
     18209  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     18210    ac_cv_path_ROOTCINT="$as_dir/$ac_word$ac_exec_ext"
     18211    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     18212    break 2
     18213  fi
     18214done
     18215  done
     18216IFS=$as_save_IFS
     18217
     18218  test -z "$ac_cv_path_ROOTCINT" && ac_cv_path_ROOTCINT="no"
     18219  ;;
     18220esac
     18221fi
     18222ROOTCINT=$ac_cv_path_ROOTCINT
     18223if test -n "$ROOTCINT"; then
     18224  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCINT" >&5
     18225$as_echo "$ROOTCINT" >&6; }
     18226else
     18227  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     18228$as_echo "no" >&6; }
     18229fi
     18230
     18231
     18232
     18233  if test ! x"$ROOTCONF" = "xno" && \
     18234     test ! x"$ROOTCINT" = "xno" ; then
     18235
     18236    # define some variables
     18237    ROOTLIBDIR=`$ROOTCONF --libdir`
     18238    ROOTINCDIR=`$ROOTCONF --incdir`
     18239    ROOTETCDIR=`$ROOTCONF --etcdir`
     18240    ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags`
     18241    ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs`
     18242    ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs`
     18243    ROOTAUXCFLAGS=`$ROOTCONF --auxcflags`
     18244    ROOTAUXLIBS=`$ROOTCONF --auxlibs`
     18245    ROOTRPATH=$ROOTLIBDIR
     18246    ROOTVERSION=`$ROOTCONF --version`
     18247    ROOTSOVERSION=`dirname $ROOTVERSION`
     18248
     18249    if test 5.12/00 ; then
     18250      { $as_echo "$as_me:${as_lineno-$LINENO}: checking wether ROOT version >= 5.12/00" >&5
     18251$as_echo_n "checking wether ROOT version >= 5.12/00... " >&6; }
     18252      vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
     18253      requ=`echo 5.12/00 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
     18254      if test $vers -lt $requ ; then
     18255        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     18256$as_echo "no" >&6; }
     18257        no_root="yes"
     18258      else
     18259        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     18260$as_echo "yes" >&6; }
     18261      fi
     18262    fi
     18263  else
     18264    # otherwise, we say no_root
     18265    no_root="yes"
     18266  fi
     18267
     18268
     18269
     18270
     18271
     18272
     18273
     18274
     18275
     18276
     18277
     18278
     18279
     18280  if test "x$no_root" = "x" ; then
     18281    :
     18282  else
     18283    :
     18284  fi
     18285
     18286# ROOTCONF           full path to root-config
     18287# ROOTEXEC           full path to root
     18288# ROOTCINT           full path to rootcint
     18289# ROOTLIBDIR         Where the ROOT libraries are
     18290# ROOTINCDIR         Where the ROOT headers are
     18291# ROOTETCDIR         Where the ROOT configuration is
     18292# ROOTCFLAGS         Extra compiler flags
     18293# ROOTLIBS           ROOT basic libraries
     18294# ROOTGLIBS          ROOT basic + GUI libraries
     18295# ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
     18296# ROOTAUXCFLAGS      Auxilary compiler flags
     18297# ROOTRPATH          Same as ROOTLIBDIR
     18298
    1806018299
    1806118300ac_ext=c
     
    1853618775#AC_TYPE_PID_T
    1853718776#AC_HEADER_STDC
     18777
     18778
     18779
     18780##########################################################################
     18781# debug compilation support
     18782##########################################################################
     18783#
     18784#AC_MSG_CHECKING([whether to build with debug information])
     18785#AC_ARG_ENABLE([debug],
     18786#    [AS_HELP_STRING([--enable-debug],
     18787#        [enable debug data generation (def=no)])],
     18788#    [debugit="$enableval"],
     18789#    [debugit=no])
     18790#AC_MSG_RESULT([$debugit])
     18791#
     18792#if test x"$debugit" = x"yes"; then
     18793#    AC_DEFINE([DEBUG],[],[Debug Mode])
     18794#    AM_CXXFLAGS="$AM_CXXFLAGS -g -Wall -Werror -Wno-uninitialized -O0"
     18795#else
     18796#    AC_DEFINE([NDEBUG],[],[No-debug Mode])
     18797#    AM_CXXFLAGS="$AM_CXXFLAGS -O3"
     18798#fi
     18799#
     18800###########################################################################
     18801#To get the changed compiler flags distributed among your final Makefiles you have to add the following line somewhere afterwards:
     18802#
     18803#AC_SUBST([AM_CXXFLAGS])
     18804
     18805
     18806
     18807
     18808
     18809
     18810
     18811
     18812
     18813
     18814
     18815
    1853818816
    1853918817cat >confcache <<\_ACEOF
     
    1936419642macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
    1936519643macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
     19644enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
    1936619645enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
    19367 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
    1936819646pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
    1936919647enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
     
    2020020478macro_revision=$macro_revision
    2020120479
     20480# Whether or not to build shared libraries.
     20481build_libtool_libs=$enable_shared
     20482
    2020220483# Whether or not to build static libraries.
    2020320484build_old_libs=$enable_static
    20204 
    20205 # Whether or not to build shared libraries.
    20206 build_libtool_libs=$enable_shared
    2020720485
    2020820486# What type of objects to build.
Note: See TracChangeset for help on using the changeset viewer.