Changeset 10202 for trunk/FACT++/configure

Timestamp:

03/02/11 10:12:22 (14 years ago)

Author:

tbretz

Message:

Updated.

File:

• trunk/FACT++/configure (modified) (28 diffs)

trunk/FACT++/configure

@@ -747 +747 @@
 LTLIBOBJS
 LIBOBJS
-ROOTSOVERSION
-ROOTVERSION
-ROOTRPATH
-ROOTAUXCFLAGS
-ROOTAUXLIBS
-ROOTGLIBS
-ROOTLIBS
-ROOTCFLAGS
-ROOTETCDIR
-ROOTINCDIR
-ROOTLIBDIR
-ROOTCINT
-ROOTEXEC
-ROOTCONF
 BOOST_THREAD_LIB
 BOOST_SYSTEM_LIB
@@ -770 +756 @@
 BOOST_LDFLAGS
 BOOST_CPPFLAGS
+MYSQLPP_INC_DIR
+MYSQLPP_LIB_DIR
+MYSQL_C_LIB_NAME
+MYSQL_C_LIB_DIR
+MYSQL_C_INC_DIR
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+PTHREAD_CC
+acx_pthread_config
 DOXYGEN_PAPER_SIZE
 DX_COND_latex_FALSE
@@ -933 +928 @@
 ac_user_opts='
 enable_option_checking
+enable_static
 enable_shared
-enable_static
 with_pic
 enable_fast_install
@@ -951 +946 @@
 enable_doxygen_ps
 enable_doxygen_pdf
+with_mysql_include
+with_mysqlpp
+with_mysqlpp_lib
+with_mysqlpp_include
 with_boost
 with_boost_libdir
@@ -960 +959 @@
 with_boost_system
 with_boost_thread
-with_rootsys
-with_mysqlpp_lib_path
 '
       ac_precious_vars='build_alias
@@ -1597 +1594 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
@@ -1624 +1621 @@
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-mysql-include=<path> directory path of MySQL header installation
+  --with-mysqlpp=<path>     path containing MySQL++ header and library subdirs
+  --with-mysqlpp-lib=<path> directory path of MySQL++ library
+  --with-mysqlpp-include=<path> directory path of MySQL++ headers
   --with-boost[=DIR]      use boost (default is yes) - it is possible to
                           specify the root directory for boost (optional)
@@ -1662 +1663 @@
                           to specify a certain library for the linker e.g.
                           --with-boost-thread=boost_thread-gcc-mt
-  --with-rootsys          top of the ROOT installation directory
-
-       --with-mysqlpp-lib-path location of the MySQL++ library, defaults to
-                          /usr/lib
-
 
 Some influential environment variables:
@@ -4158 +4154 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4160: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4156: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4163: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4159: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4166: output\"" >&5)
+  (eval echo "\"\$as_me:4162: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -5370 +5366 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5372 "configure"' > conftest.$ac_ext
+  echo '#line 5368 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6800 +6796 @@
 
 # Set options
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+        IFS="$lt_save_ifs"
+        if test "X$pkg" = "X$p"; then
+          enable_static=yes
+        fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
 
 
@@ -6832 +6857 @@
 fi
 
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-        IFS="$lt_save_ifs"
-        if test "X$pkg" = "X$p"; then
-          enable_static=yes
-        fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
 
 
@@ -7299 +7294 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7301: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7296: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7305: \$? = $ac_status" >&5
+   echo "$as_me:7300: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7638 +7633 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7640: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7635: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7644: \$? = $ac_status" >&5
+   echo "$as_me:7639: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7743 +7738 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7745: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7740: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7749: \$? = $ac_status" >&5
+   echo "$as_me:7744: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -7798 +7793 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7800: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7795: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7804: \$? = $ac_status" >&5
+   echo "$as_me:7799: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10182 +10177 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10184 "configure"
+#line 10179 "configure"
 #include "confdefs.h"
 
@@ -10278 +10273 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10280 "configure"
+#line 10275 "configure"
 #include "confdefs.h"
 
@@ -12234 +12229 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12240: \$? = $ac_status" >&5
+   echo "$as_me:12235: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12333 +12328 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12335: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12330: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12339: \$? = $ac_status" >&5
+   echo "$as_me:12334: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -12385 +12380 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12382: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12391: \$? = $ac_status" >&5
+   echo "$as_me:12386: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -13359 +13354 @@
 
 #AC_PATH_XTRA
-
 
 
@@ -16243 +16237 @@
 
 ######################################################################
+# pthread/Readline/NCurses (pthread needed by dim and boost)
+######################################################################
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_join ();
+int
+main ()
+{
+return pthread_join ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  acx_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+        ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+        case $flag in
+                none)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
+                ;;
+
+                -*)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                # Extract the first word of "pthread-config", so it can be a program name with args.
+set dummy pthread-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$acx_pthread_config"; then
+  ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_acx_pthread_config="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
+fi
+fi
+acx_pthread_config=$ac_cv_prog_acx_pthread_config
+if test -n "$acx_pthread_config"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5
+$as_echo "$acx_pthread_config" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+                if test x"$acx_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+pthread_t th; pthread_join(th, 0);
+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  acx_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+$as_echo_n "checking for joinable pthread attribute... " >&6; }
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+int attr=$attr; return attr;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  attr_name=$attr; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        done
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5
+$as_echo "$attr_name" >&6; }
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+
+cat >>confdefs.h <<_ACEOF
+#define PTHREAD_CREATE_JOINABLE $attr_name
+_ACEOF
+
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+        flag=no
+        case "${host_cpu}-${host_os}" in
+            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
+$as_echo "${flag}" >&6; }
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: must compile with xlc_r or cc_r
+        if test x"$GCC" != xyes; then
+          for ac_prog in xlc_r cc_r
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PTHREAD_CC"; then
+  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PTHREAD_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
+if test -n "$PTHREAD_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+$as_echo "$PTHREAD_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PTHREAD_CC" && break
+done
+test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
+
+        else
+          PTHREAD_CC=$CC
+        fi
+else
+        PTHREAD_CC="$CC"
+fi
+
+
+
+
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+        :
+else
+        acx_pthread_ok=no
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_readline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lreadline  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+int
+main ()
+{
+return readline ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_readline_readline=yes
+else
+  ac_cv_lib_readline_readline=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBREADLINE 1
+_ACEOF
+
+  LIBS="-lreadline $LIBS"
+
+else
+
+      echo "Error! libreadline not found in default libarary paths."
+      exit -1
+
+
+fi
+
+for ac_header in readline/readline.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_READLINE_H 1
+_ACEOF
+
+else
+
+      echo "Error! readline/readline.h not properly installed in default include path (maybe readline-dev missing)."
+      exit -1
+
+
+fi
+
+done
+
+
+
+for ac_header in panel.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "panel.h" "ac_cv_header_panel_h" "$ac_includes_default"
+if test "x$ac_cv_header_panel_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PANEL_H 1
+_ACEOF
+
+else
+
+      echo "Error! Ncurses panel.h not properly installed in default include paths."
+      exit -1
+
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanel" >&5
+$as_echo_n "checking for update_panels in -lpanel... " >&6; }
+if test "${ac_cv_lib_panel_update_panels+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpanel  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char update_panels ();
+int
+main ()
+{
+return update_panels ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_panel_update_panels=yes
+else
+  ac_cv_lib_panel_update_panels=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panel_update_panels" >&5
+$as_echo "$ac_cv_lib_panel_update_panels" >&6; }
+if test "x$ac_cv_lib_panel_update_panels" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPANEL 1
+_ACEOF
+
+  LIBS="-lpanel $LIBS"
+
+else
+
+      echo "Error! Ncurses libpanel not properly installed in the default libarary paths."
+      exit -1
+
+
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+######################################################################
+# pthread support
+######################################################################
+
+#AX_PTHREAD
+#
+#AC_CHECK_LIB(pthread,  pthread_create,
+#   [],
+#   [
+#      echo "Error! libpthread not found in default libarary paths."
+#      exit -1
+#   ]
+#)
+#AC_CHECK_HEADERS(pthread.h, [],
+#   [
+#      echo "Error! pthread.h not properly installed in default include paths."
+#      exit -1
+#   ]
+#)
+
+######################################################################
+# Xm.h (lesstif/motif)
+######################################################################
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+for ac_header in Mrm/MrmAppl.h Xm/Xm.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+
+      echo "Error! Mrm/MrmAppl.h, Xm/Xm.h not properly installed, needed to compile did (you need most probably lesstif2-dev)."
+      exit -1
+
+
+fi
+
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtToolkitInitialize in -lXm" >&5
+$as_echo_n "checking for XtToolkitInitialize in -lXm... " >&6; }
+if test "${ac_cv_lib_Xm_XtToolkitInitialize+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XtToolkitInitialize ();
+int
+main ()
+{
+return XtToolkitInitialize ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xm_XtToolkitInitialize=yes
+else
+  ac_cv_lib_Xm_XtToolkitInitialize=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XtToolkitInitialize" >&5
+$as_echo "$ac_cv_lib_Xm_XtToolkitInitialize" >&6; }
+if test "x$ac_cv_lib_Xm_XtToolkitInitialize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXM 1
+_ACEOF
+
+  LIBS="-lXm $LIBS"
+
+else
+
+      echo "Error! libXm (lesstif2) not properly installed in the default library path (needed by dim to link did)."
+      exit -1
+
+
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+######################################################################
+# MySQL(++) SUPPORT
+######################################################################
+
+
+        MYSQL_inc_check="/usr/include/mysql /usr/local/include/mysql /usr/local/mysql/include /usr/local/mysql/include/mysql /usr/mysql/include/mysql /opt/mysql/include/mysql /sw/include/mysql"
+
+# Check whether --with-mysql-include was given.
+if test "${with_mysql_include+set}" = set; then :
+  withval=$with_mysql_include; MYSQL_inc_check="$with_mysql_include $with_mysql_include/include $with_mysql_include/include/mysql"
+fi
+
+
+        #
+        # Look for MySQL C API headers
+        #
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL include directory" >&5
+$as_echo_n "checking for MySQL include directory... " >&6; }
+        MYSQL_C_INC_DIR=
+        for m in $MYSQL_inc_check
+        do
+                if test -d "$m" && test -f "$m/mysql.h"
+                then
+                        MYSQL_C_INC_DIR=$m
+                        break
+                fi
+        done
+
+        if test -z "$MYSQL_C_INC_DIR"
+        then
+                as_fn_error $? "Didn't find the MySQL include dir in '$MYSQL_inc_check'" "$LINENO" 5
+        fi
+
+        case "$MYSQL_C_INC_DIR" in
+                /* ) ;;
+                * )  as_fn_error $? "The MySQL include directory ($MYSQL_C_INC_DIR) must be an absolute path." "$LINENO" 5  ;;
+        esac
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_C_INC_DIR" >&5
+$as_echo "$MYSQL_C_INC_DIR" >&6; }
+
+        CPPFLAGS="$CPPFLAGS -I${MYSQL_C_INC_DIR}"
+
+
+
+
+
+
+
+# Check whether --with-mysqlpp was given.
+if test "${with_mysqlpp+set}" = set; then :
+  withval=$with_mysqlpp; MYSQLPP_lib_check="$with_mysqlpp/lib64 $with_mysqlpp/lib $with_mysqlpp/lib64/mysql++ $with_mysqlpp/lib/mysql++"
+                  MYSQLPP_inc_check="$with_mysqlpp/include $with_mysqlpp/include/mysql++"
+else
+  MYSQLPP_lib_check="/usr/local/mysql++/lib64 /usr/local/mysql++/lib /usr/local/lib64/mysql++ /usr/local/lib/mysql++ /opt/mysql++/lib64 /opt/mysql++/lib /usr/lib64/mysql++ /usr/lib/mysql++ /usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib"
+                  MYSQLPP_inc_check="/usr/local/mysql++/include /usr/local/include/mysql++ /opt/mysql++/include /usr/local/include/mysql++ /usr/local/include /usr/include/mysql++ /usr/include"
+fi
+
+
+# Check whether --with-mysqlpp-lib was given.
+if test "${with_mysqlpp_lib+set}" = set; then :
+  withval=$with_mysqlpp_lib; MYSQLPP_lib_check="$with_mysqlpp_lib $with_mysqlpp_lib/lib64 $with_mysqlpp_lib/lib $with_mysqlpp_lib/lib64/mysql $with_mysqlpp_lib/lib/mysql"
+fi
+
+
+# Check whether --with-mysqlpp-include was given.
+if test "${with_mysqlpp_include+set}" = set; then :
+  withval=$with_mysqlpp_include; MYSQLPP_inc_check="$with_mysqlpp_include $with_mysqlpp_include/include $with_mysqlpp_include/include/mysql"
+fi
+
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL++ library location" >&5
+$as_echo_n "checking for MySQL++ library location... " >&6; }
+if test "${ac_cv_mysqlpp_lib+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                for dir in $MYSQLPP_lib_check
+                do
+                        if test -d "$dir" && \
+                                ( test -f "$dir/libmysqlpp.so" ||
+                                  test -f "$dir/libmysqlpp.a" )
+                        then
+                                ac_cv_mysqlpp_lib=$dir
+                                break
+                        fi
+                done
+
+                if test -z "$ac_cv_mysqlpp_lib"
+                then
+                        as_fn_error $? "Didn't find the MySQL++ library dir in '$MYSQLPP_lib_check'" "$LINENO" 5
+                fi
+
+                case "$ac_cv_mysqlpp_lib" in
+                        /* ) ;;
+                        * )  as_fn_error $? "The MySQL++ library directory ($ac_cv_mysqlpp_lib) must be an absolute path." "$LINENO" 5  ;;
+                esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mysqlpp_lib" >&5
+$as_echo "$ac_cv_mysqlpp_lib" >&6; }
+        MYSQLPP_LIB_DIR=$ac_cv_mysqlpp_lib
+
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL++ include path" >&5
+$as_echo_n "checking for MySQL++ include path... " >&6; }
+if test "${ac_cv_mysqlpp_inc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                for dir in $MYSQLPP_inc_check
+                do
+                        if test -d "$dir" && test -f "$dir/mysql++.h"
+                        then
+                                ac_cv_mysqlpp_inc=$dir
+                                break
+                        fi
+                done
+
+                if test -z "$ac_cv_mysqlpp_inc"
+                then
+                        as_fn_error $? "Didn't find the MySQL++ header dir in '$MYSQLPP_inc_check'" "$LINENO" 5
+                fi
+
+                case "$ac_cv_mysqlpp_inc" in
+                        /* ) ;;
+                        * )  as_fn_error $? "The MySQL++ header directory ($ac_cv_mysqlpp_inc) must be an absolute path." "$LINENO" 5  ;;
+                esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mysqlpp_inc" >&5
+$as_echo "$ac_cv_mysqlpp_inc" >&6; }
+        MYSQLPP_INC_DIR=$ac_cv_mysqlpp_inc
+
+
+                                        case "$ac_cv_mysqlpp_lib" in
+          /usr/lib) ;;
+          *) LDFLAGS="$LDFLAGS -L${ac_cv_mysqlpp_lib}" ;;
+        esac
+        CPPFLAGS="$CPPFLAGS -I${ac_cv_mysqlpp_inc} -I${MYSQL_C_INC_DIR}"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking that we can build MySQL++ programs" >&5
+$as_echo_n "checking that we can build MySQL++ programs... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mysql++.h>
+int
+main ()
+{
+mysqlpp::Connection c(false)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  as_fn_error $? "no" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+######################################################################
 # BOOST SUPPORT
 ######################################################################
@@ -18086 +18858 @@
 #ax_boost_wserialization
 
-######################################################################
-# ROOT SUPPORT
-######################################################################
-
-#ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
-
-
-# Check whether --with-rootsys was given.
-if test "${with_rootsys+set}" = set; then :
-  withval=$with_rootsys; user_rootsys=$withval
-else
-  user_rootsys="none"
-fi
-
-  if test ! x"$user_rootsys" = xnone; then
-    rootbin="$user_rootsys/bin"
-  elif test ! x"$ROOTSYS" = x ; then
-    rootbin="$ROOTSYS/bin"
-  else
-   rootbin=$PATH
-  fi
-  # Extract the first word of "root-config ", so it can be a program name with args.
-set dummy root-config ; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ROOTCONF+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ROOTCONF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ROOTCONF="$ROOTCONF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $rootbin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ROOTCONF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ROOTCONF" && ac_cv_path_ROOTCONF="no"
-  ;;
-esac
-fi
-ROOTCONF=$ac_cv_path_ROOTCONF
-if test -n "$ROOTCONF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCONF" >&5
-$as_echo "$ROOTCONF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "root ", so it can be a program name with args.
-set dummy root ; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ROOTEXEC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ROOTEXEC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ROOTEXEC="$ROOTEXEC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $rootbin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ROOTEXEC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ROOTEXEC" && ac_cv_path_ROOTEXEC="no"
-  ;;
-esac
-fi
-ROOTEXEC=$ac_cv_path_ROOTEXEC
-if test -n "$ROOTEXEC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTEXEC" >&5
-$as_echo "$ROOTEXEC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  # Extract the first word of "rootcint ", so it can be a program name with args.
-set dummy rootcint ; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ROOTCINT+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ROOTCINT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ROOTCINT="$ROOTCINT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $rootbin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ROOTCINT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ROOTCINT" && ac_cv_path_ROOTCINT="no"
-  ;;
-esac
-fi
-ROOTCINT=$ac_cv_path_ROOTCINT
-if test -n "$ROOTCINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCINT" >&5
-$as_echo "$ROOTCINT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test ! x"$ROOTCONF" = "xno" && \
-     test ! x"$ROOTCINT" = "xno" ; then
-
-    # define some variables
-    ROOTLIBDIR=`$ROOTCONF --libdir`
-    ROOTINCDIR=`$ROOTCONF --incdir`
-    ROOTETCDIR=`$ROOTCONF --etcdir`
-    ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags`
-    ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs`
-    ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs`
-    ROOTAUXCFLAGS=`$ROOTCONF --auxcflags`
-    ROOTAUXLIBS=`$ROOTCONF --auxlibs`
-    ROOTRPATH=$ROOTLIBDIR
-    ROOTVERSION=`$ROOTCONF --version`
-    ROOTSOVERSION=`dirname $ROOTVERSION`
-
-    if test 5.12/00 ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking wether ROOT version >= 5.12/00" >&5
-$as_echo_n "checking wether ROOT version >= 5.12/00... " >&6; }
-      vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-      requ=`echo 5.12/00 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-      if test $vers -lt $requ ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        no_root="yes"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      fi
-    fi
-  else
-    # otherwise, we say no_root
-    no_root="yes"
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-  if test "x$no_root" = "x" ; then
-    :
-  else
-    :
-  fi
-
-# ROOTCONF           full path to root-config
-# ROOTEXEC           full path to root
-# ROOTCINT           full path to rootcint
-# ROOTLIBDIR         Where the ROOT libraries are
-# ROOTINCDIR         Where the ROOT headers are
-# ROOTETCDIR         Where the ROOT configuration is
-# ROOTCFLAGS         Extra compiler flags
-# ROOTLIBS           ROOT basic libraries
-# ROOTGLIBS          ROOT basic + GUI libraries
-# ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
-# ROOTAUXCFLAGS      Auxilary compiler flags
-# ROOTRPATH          Same as ROOTLIBDIR
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-else
-
-      echo "Error! libpthread not found in default libarary paths."
-      exit -1
-
-
-fi
-
-for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-else
-
-      echo "Error! pthread.h not properly installed in default include paths."
-      exit -1
-
-
-fi
-
-done
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
-$as_echo_n "checking for readline in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_readline+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char readline ();
-int
-main ()
-{
-return readline ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_readline_readline=yes
-else
-  ac_cv_lib_readline_readline=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
-$as_echo "$ac_cv_lib_readline_readline" >&6; }
-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
-
-  LIBS="-lreadline $LIBS"
-
-else
-
-      echo "Error! libreadline not found in default libarary paths."
-      exit -1
-
-
-fi
-
-for ac_header in readline/readline.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
-if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_READLINE_READLINE_H 1
-_ACEOF
-
-else
-
-      echo "Error! readline/readline.h not properly installed in default include path (maybe readline-dev missing)."
-      exit -1
-
-
-fi
-
-done
-
-
-
-for ac_header in panel.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "panel.h" "ac_cv_header_panel_h" "$ac_includes_default"
-if test "x$ac_cv_header_panel_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PANEL_H 1
-_ACEOF
-
-else
-
-      echo "Error! Ncurses panel.h not properly installed in default include paths."
-      exit -1
-
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanel" >&5
-$as_echo_n "checking for update_panels in -lpanel... " >&6; }
-if test "${ac_cv_lib_panel_update_panels+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpanel  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char update_panels ();
-int
-main ()
-{
-return update_panels ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_panel_update_panels=yes
-else
-  ac_cv_lib_panel_update_panels=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panel_update_panels" >&5
-$as_echo "$ac_cv_lib_panel_update_panels" >&6; }
-if test "x$ac_cv_lib_panel_update_panels" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPANEL 1
-_ACEOF
-
-  LIBS="-lpanel $LIBS"
-
-else
-
-      echo "Error! Ncurses libpanel not properly installed in the default libarary paths."
-      exit -1
-
-
-fi
-
-
-
-for ac_header in Mrm/MrmAppl.h Xm/Xm.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-
-      echo "Error! Mrm/MrmAppl.h, Xm/Xm.h not properly installed, needed to compile did (you need most probably lesstif2-dev)."
-      exit -1
-
-
-fi
-
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtToolkitInitialize in -lXm" >&5
-$as_echo_n "checking for XtToolkitInitialize in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XtToolkitInitialize+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XtToolkitInitialize ();
-int
-main ()
-{
-return XtToolkitInitialize ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xm_XtToolkitInitialize=yes
-else
-  ac_cv_lib_Xm_XtToolkitInitialize=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XtToolkitInitialize" >&5
-$as_echo "$ac_cv_lib_Xm_XtToolkitInitialize" >&6; }
-if test "x$ac_cv_lib_Xm_XtToolkitInitialize" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXM 1
-_ACEOF
-
-  LIBS="-lXm $LIBS"
-
-else
-
-      echo "Error! libXm (lesstif2) not properly installed in the default library path (needed by dim to link did)."
-      exit -1
-
-
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
 #AC_CHECK_HEADERS(
 #   [\
@@ -18618 +18879 @@
 #)
 
-#AC_ARG_WITH([dim],
-#   [
-#      AS_HELP_STRING([--with-dim],
-#         [location of the Dim headers, defaults to dim_v19r15])
-#   ],
-#   [DIM_PATH="$withval"],
-#   [DIM_PATH="dim_v19r15"]
-#)
-#
-#AC_SUBST([DIM_PATH])
-#
-#CFLAGS="$CFLAGS -I$DIM_PATH/dim"
-#CPPFLAGS="$CPPFLAGS -I$DIM_PATH/dim"
-#INCLUDEPATH="$INCLUDEPATH -I$DIM_PATH/dim"
-#AC_CHECK_HEADERS([dis.hxx dic.hxx], [],
-#  [
-#      echo "Error! Dim headers (dis.hxx, dic.hxx) not found in $DIM_PATH/dim."
-#      exit -1
-#   ]
-#)
-
-## ============>   boost header and boost libraries
-
-##########################################################################
-#AC_ARG_WITH([dim-include-path],
-#   [
-#      AS_HELP_STRING([--with-dim-include-path],
-#         [location of the Dim headers, defaults to ${HOME}/FACT/dim_v19r11/dim])
-#   ],
-#   [DIM_INCLUDE_PATH="$withval"],
-#   [DIM_INCLUDE_PATH="${HOME}/Software/Dim/dim_v19r11/dim"]
-#)
-#DIM_CFLAGS="-I$DIM_INCLUDE_PATH"
-##AC_SUBST([DIM_CFLAGS])
-#
-#CFLAGS="$CFLAGS $DIM_CFLAGS"
-#CPPFLAGS="$CPPFLAGS $DIM_CFLAGS"
-##INCLUDEPATH="$INCLUDEPATH $DIM_INCLUDE_PATH"
-#AC_CHECK_HEADERS([dis.hxx dic.hxx], [],
-#   [
-#      echo "Error! Dim headers (dis.hxx, dic.hxx) not found in $DIM_INCLUDE_PATH."
-#      exit -1
-#   ]
-#)
-##########################################################################
-
+######################################################################
+# ROOT SUPPORT
+######################################################################
+
+# ROOT_PATH([5.12/00, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
+# ROOT_PATH([5.12/00])
+# ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old))
+# ROOT_PATH(, AC_DEFINE([HAVE_ROOT]))
+
+# ROOTCONF           full path to root-config
+# ROOTEXEC           full path to root
+# ROOTCINT           full path to rootcint
+# ROOTLIBDIR         Where the ROOT libraries are
+# ROOTINCDIR         Where the ROOT headers are
+# ROOTETCDIR         Where the ROOT configuration is
+# ROOTCFLAGS         Extra compiler flags
+# ROOTLIBS           ROOT basic libraries
+# ROOTGLIBS          ROOT basic + GUI libraries
+# ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
+# ROOTAUXCFLAGS      Auxilary compiler flags
+# ROOTRPATH          Same as ROOTLIBDIR
 
 
 ###########################################################################
-#AC_ARG_WITH([dim-lib-path],
-#  [
-#     AS_HELP_STRING([--with-dim-lib-path],
-#        [location of the Dim libraries, defaults to ${HOME}/FACT/dim_v19r11/linux])
-#  ],
-#  [DIM_LIB_PATH="$withval"],
-#  [DIM_LIB_PATH="${HOME}/Software/Dim/dim_v19r11/linux"]
-#)
-#DIM_LIBS="-L$DIM_LIB_PATH -ldim"
-##AC_SUBST([DIM_LIBS])
-#
-#LDFLAGS="$LDFLAGS $DIM_LIBS"
-#AC_CHECK_LIB(dim, [get_dns_port_number], [],
-#   [
-#      echo "Error! libdim.so file not found in $DIM_LIB_PATH."
-#      exit -1
-#   ]
-#)
-###########################################################################
-
-
-
-# Get MySQL++ library and include locations
-#AC_ARG_WITH([mysqlpp-include-path],
-#   [
-#      AS_HELP_STRING([--with-mysqlpp-include-path],
-#         [location of the MySQL++ librarary headers, defaults to /usr/include/mysql++])
-#   ],
-#   [MYSQLPP_INCLUDE_PATH="$withval"],
-#   [MYSQLPP_INCLUDE_PATH=""]
-##)
-#MYSQLPP_CFLAGS="-I$MYSQLPP_INCLUDE_PATH"
-##AC_SUBST([DIM_CFLAGS])
-#
-#CFLAGS="$CFLAGS $MYSQLPP_CFLAGS"
-#CPPFLAGS="$CPPFLAGS $MYSQLPP_CFLAGS"
-##INCLUDEPATH="$INCLUDEPATH $DIM_INCLUDE_PATH"
-#AC_CHECK_HEADERS([mysql++/mysql++.h],
-#   [],
-#   [
-#      echo "Error! mysql++/mysql++.h not found in default include path."
-#      exit -1
-#   ]
-#)
-#### LAST ARGUMENT IS "OTHER LIBRARIES"
-
-
-
-#AC_ARG_WITH([mysql-lib-path],
-#  [
-#     AS_HELP_STRING([--with-mysql-lib-path],
-#        [location of the MySQL library, defaults to /usr/lib])
-#  ],
-#  [MYSQL_LIB_PATH="$withval"],
-#  [MYSQL_LIB_PATH="/usr/lib"]
-#)
-#MYSQL_LIBS="-L$MYSQL_LIB_PATH -lmysql"
-##AC_SUBST([DIM_LIBS])
-#
-#LDFLAGS="$LDFLAGS $MYSQL_LIBS"
-#AC_CHECK_LIB(mysql, [mysql_errno],
-#   [],
-#   [
-#      echo "Error! mysql libarary file not found in $MYSQL_LIB_PATH."
-#      exit -1
-#   ]
-#)
-
-
-
-
-
-# Check whether --with-mysqlpp-lib-path was given.
-if test "${with_mysqlpp_lib_path+set}" = set; then :
-  withval=$with_mysqlpp_lib_path; MYSQLPP_LIB_PATH="$withval"
-else
-  MYSQLPP_LIB_PATH="/usr/lib"
-
-fi
-
-MYSQLPP_LIBS="-L$MYSQLPP_LIB_PATH -lmysqlpp"
-#AC_SUBST([DIM_LIBS])
-
-#LDFLAGS="$LDFLAGS $MYSQLPP_LIBS"
-#AC_CHECK_LIB(mysql++, [mysql_errno],
-#   [],
-#   [
-#      echo "Error! mysql++ libarary file not found in $MYSQL_LIB_PATH."
-#      exit -1
-#   ]
-#)
-
-
-
-
-
-#CPPFLAGS="$CPPFLAGS -std=c++0x"
-
-CPPFLAGS="$CPPFLAGS -I/usr/include/mysql"
-
-
-
-
-#AC_CHECK_HEADERS_ONCE(dim.h)
+
 
 #AC_C_CONST
 #AC_TYPE_PID_T
 #AC_HEADER_STDC
-
-
 
 ##########################################################################
@@ -18802 +18933 @@
 #
 #AC_SUBST([AM_CXXFLAGS])
-
-
-
-
-
-
-
-
-
-
 
 
@@ -19642 +19763 @@
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
@@ -20478 +20599 @@
 macro_revision=$macro_revision
 
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
 
 # What type of objects to build.