/[PAMELA software]/yoda/configure

Diff of /yoda/configure

Parent Directory | Revision Log | View Patch Patch

-revision 4.0 by kusanagi,
Sun Mar  6 04:33:01 2005 UTC
+revision 5.0 by kusanagi,
Mon Aug 29 09:45:00 2005 UTC
 Line 463 
 ac_includes_default="\
  # include <unistd.h>
  #endif"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LIBOBJS LTLIBOBJS'
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LOG4CXX_INCLUDES LOG4CXX_LDFLAGS LOG4CXX_LIBRARY LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  # Initialize some variables set by options.
 Line 1023 
 if test -n "$ac_init_help"; then
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --disable-dependency-tracking Speeds up one-time builds
+   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking  Do not reject slow dependency extractors
+   --enable-dependency-tracking   do not reject slow dependency extractors
    --enable-shared[=PKGS]
                            build shared libraries [default=yes]
    --enable-static[=PKGS]
 Line 1498 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
- am__api_version="1.7"
+ am__api_version="1.9"
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
 Line 1661 
 _ACEOF
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
  rm conftest.sed
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-Line 1675 
 else
+Line 1674 
 else
  echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+   # We used to keeping the `.' as first argument, in order to
+   # allow $(mkdir_p) to be used without argument.  As in
+   #   $(mkdir_p) $(somedir)
+   # where $(somedir) is conditionally defined.  However this is wrong
+   # for two reasons:
+   #  1. if the package is installed by a user who cannot write `.'
+   #     make install will fail,
+   #  2. the above comment should most certainly read
+   #     $(mkdir_p) $(DESTDIR)$(somedir)
+   #     so it does not work when $(somedir) is undefined and
+   #     $(DESTDIR) is not.
+   #  To support the latter case, we have to write
+   #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+   #  so the `.' trick is pointless.
+   mkdir_p='mkdir -p --'
+ else
+   # On NextStep and OpenStep, the `mkdir' command does not
+   # recognize any option.  It will interpret all options as
+   # directories to create, and then abort because `.' already
+   # exists.
+   for d in ./-p ./--version;
+   do
+     test -d $d && rmdir $d
+   done
+   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+   if test -f "$ac_aux_dir/mkinstalldirs"; then
+     mkdir_p='$(mkinstalldirs)'
+   else
+     mkdir_p='$(install_sh) -d'
+   fi
+ fi
  for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-Line 1753 
 else
+Line 1785 
 else
  fi
  rmdir .tst 2>/dev/null
-  # test to see if srcdir already configured
+ # test to see if srcdir already configured
  if test "`cd $srcdir && pwd`" != "`pwd`" &&
     test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-Line 1773 
 fi
+Line 1805 
 fi
  # Define the identity of the package.
   PACKAGE=yoda
-  VERSION=2.1.0
+  VERSION=4.2.4
  cat >>confdefs.h <<_ACEOF
-Line 1801 
 AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+Line 1833 
 AUTOHEADER=${AUTOHEADER-"${am_missing_ru
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- AMTAR=${AMTAR-"${am_missing_run}tar"}
  install_sh=${install_sh-"$am_aux_dir/install-sh"}
  # Installed binaries are usually stripped using `strip' when the user
-Line 1896 
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
+Line 1925 
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
+ # Always define AMTAR for backward compatibility.
+ AMTAR=${AMTAR-"${am_missing_run}tar"}
+ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-Line 2997 
 else
+Line 3033 
 else
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
-       : > sub/conftst$i.h
+       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+       # Solaris 8's {/usr,}/bin/sh.
+       touch sub/conftst$i.h
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-Line 3025 
 else
+Line 3063 
 else
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
-       # (even with -Werror).  So we grep stderr for any message
+       # or remarks (even with -Werror).  So we grep stderr for any message
-       # that says an option was ignored.
+       # that says an option was ignored or not supported.
-       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+       # When given -MP, icc 7.0 and 7.1 complain thusly:
+       #   icc: Command line warning: ignoring option '-M'; no argument required
+       # The diagnosis changed in icc 8.0:
+       #   icc: Command line remark: option '-MP' not supported
+       if (grep 'ignoring option' conftest.err ||
+           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
          am_cv_CC_dependencies_compiler_type=$depmode
          break
        fi
-Line 3151 
 fi
+Line 3194 
 fi
  # Provide some information about the compiler.
- echo "$as_me:3154:" \
+ echo "$as_me:3197:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-Line 3348 
 _ACEOF
+Line 3391 
 _ACEOF
  # flags.
  ac_save_FFLAGS=$FFLAGS
  FFLAGS="$FFLAGS $ac_verb"
- (eval echo $as_me:3351: \"$ac_link\") >&5
+ (eval echo $as_me:3394: \"$ac_link\") >&5
  ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
  echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
-Line 3426 
 _ACEOF
+Line 3469 
 _ACEOF
  # flags.
  ac_save_FFLAGS=$FFLAGS
  FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
- (eval echo $as_me:3429: \"$ac_link\") >&5
+ (eval echo $as_me:3472: \"$ac_link\") >&5
  ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
  echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
-Line 3996 
 else
+Line 4039 
 else
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
-       : > sub/conftst$i.h
+       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+       # Solaris 8's {/usr,}/bin/sh.
+       touch sub/conftst$i.h
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-Line 4024 
 else
+Line 4069 
 else
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
-       # (even with -Werror).  So we grep stderr for any message
+       # or remarks (even with -Werror).  So we grep stderr for any message
-       # that says an option was ignored.
+       # that says an option was ignored or not supported.
-       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+       # When given -MP, icc 7.0 and 7.1 complain thusly:
+       #   icc: Command line warning: ignoring option '-M'; no argument required
+       # The diagnosis changed in icc 8.0:
+       #   icc: Command line remark: option '-MP' not supported
+       if (grep 'ignoring option' conftest.err ||
+           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
          am_cv_CXX_dependencies_compiler_type=$depmode
          break
        fi
-Line 4611 
 ia64-*-hpux*)
+Line 4661 
 ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
-   echo '#line 4614 "configure"' > conftest.$ac_ext
+   echo '#line 4664 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-Line 6521 
 else
+Line 6571 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6524: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6574: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:6528: \$? = $ac_status" >&5
+    echo "$as_me:6578: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 6754 
 else
+Line 6804 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6807: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:6761: \$? = $ac_status" >&5
+    echo "$as_me:6811: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 6814 
 else
+Line 6864 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6817: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6867: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:6821: \$? = $ac_status" >&5
+    echo "$as_me:6871: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-Line 9004 
 else
+Line 9054 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 9007 "configure"
+ #line 9057 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 9102 
 else
+Line 9152 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 9105 "configure"
+ #line 9155 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 11281 
 else
+Line 11331 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:11284: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:11334: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:11288: \$? = $ac_status" >&5
+    echo "$as_me:11338: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 11341 
 else
+Line 11391 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:11344: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:11394: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:11348: \$? = $ac_status" >&5
+    echo "$as_me:11398: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-Line 12708 
 else
+Line 12758 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 12711 "configure"
+ #line 12761 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 12806 
 else
+Line 12856 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 12809 "configure"
+ #line 12859 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 13633 
 else
+Line 13683 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:13636: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:13686: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:13640: \$? = $ac_status" >&5
+    echo "$as_me:13690: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 13693 
 else
+Line 13743 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:13696: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:13746: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:13700: \$? = $ac_status" >&5
+    echo "$as_me:13750: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-Line 15733 
 else
+Line 15783 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:15736: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:15786: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:15740: \$? = $ac_status" >&5
+    echo "$as_me:15790: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 15966 
 else
+Line 16016 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:16019: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:15973: \$? = $ac_status" >&5
+    echo "$as_me:16023: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-Line 16026 
 else
+Line 16076 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:16029: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:16079: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:16033: \$? = $ac_status" >&5
+    echo "$as_me:16083: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-Line 18216 
 else
+Line 18266 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 18219 "configure"
+ #line 18269 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 18314 
 else
+Line 18364 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 18317 "configure"
+ #line 18367 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 19521 
 ${ROOT_LIBRARY}/libQuadp.so
+Line 19571 
 ${ROOT_LIBRARY}/libQuadp.so
  ${ROOT_LIBRARY}/libGX11.so          ${ROOT_LIBRARY}/libGX11TTF.so       \
  ${ROOT_LIBRARY}/libX3d.so                  \
  ${ROOT_LIBRARY}/libASImage.so       \
- ${ROOT_LIBRARY}/libThread.so        ${ROOT_LIBRARY}/libRXML.so          \
+ ${ROOT_LIBRARY}/libThread.so        \
   -ldl"
-Line 19558 
 if test "${with_log4cxx+set}" = set; the
+Line 19608 
 if test "${with_log4cxx+set}" = set; the
  fi;
  LOG4CXX_INCLUDES="-I${LOG4CXX}/include"
+ #------------------------------------------------------------
+ # Check whether --with-log4cxx or --without-log4cxx was given.
+ if test "${with_log4cxx+set}" = set; then
+   withval="$with_log4cxx"
+   LOG4CXX=$with_log4cxx
+ fi;
+ LOG4CXX_LIBRARY="${LOG4CXX}/lib"
+ LOG4CXX_INCLUDES="-I${LOG4CXX}/include"
+ LOG4CXX_LDFLAGS=" ${LOG4CXX_LIBRARY}/liblog4cxx.so "
+ #------------------------------------------------------------
  echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
-Line 20410 
 s,@AUTOCONF@,$AUTOCONF,;t t
+Line 20479 
 s,@AUTOCONF@,$AUTOCONF,;t t
  s,@AUTOMAKE@,$AUTOMAKE,;t t
  s,@AUTOHEADER@,$AUTOHEADER,;t t
  s,@MAKEINFO@,$MAKEINFO,;t t
- s,@AMTAR@,$AMTAR,;t t
  s,@install_sh@,$install_sh,;t t
  s,@STRIP@,$STRIP,;t t
  s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
  s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+ s,@mkdir_p@,$mkdir_p,;t t
  s,@AWK@,$AWK,;t t
  s,@SET_MAKE@,$SET_MAKE,;t t
  s,@am__leading_dot@,$am__leading_dot,;t t
+ s,@AMTAR@,$AMTAR,;t t
+ s,@am__tar@,$am__tar,;t t
+ s,@am__untar@,$am__untar,;t t
  s,@build@,$build,;t t
  s,@build_cpu@,$build_cpu,;t t
  s,@build_vendor@,$build_vendor,;t t
-Line 20466 
 s,@HAS_DOXYFILE@,$HAS_DOXYFILE,;t t
+Line 20538 
 s,@HAS_DOXYFILE@,$HAS_DOXYFILE,;t t
  s,@ROOT_INCLUDES@,$ROOT_INCLUDES,;t t
  s,@ROOT_LDFLAGS@,$ROOT_LDFLAGS,;t t
  s,@ROOTCINT@,$ROOTCINT,;t t
+ s,@LOG4CXX_INCLUDES@,$LOG4CXX_INCLUDES,;t t
+ s,@LOG4CXX_LDFLAGS@,$LOG4CXX_LDFLAGS,;t t
+ s,@LOG4CXX_LIBRARY@,$LOG4CXX_LIBRARY,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  CEOF
-Line 21090 
 echo X"$mf" |
+Line 21165 
 echo X"$mf" |
    else
      continue
    fi
-   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+   # Extract the definition of DEPDIR, am__include, and am__quote
-   # Extract the definition of DEP_FILES from the Makefile without
+   # from the Makefile without running `make'.
-   # running `make'.
+   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
    test -z "$DEPDIR" && continue
+   am__include=`sed -n 's/^am__include = //p' < "$mf"`
+   test -z "am__include" && continue
+   am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    # When using ansi2knr, U may be empty or an underscore; expand it
-   U=`sed -n -e '/^U = / s///p' < "$mf"`
+   U=`sed -n 's/^U = //p' < "$mf"`
-   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+   # Find all dependency output files, they are included files with
-   # We invoke sed twice because it is the simplest approach to
+   # $(DEPDIR) in their names.  We invoke sed twice because it is the
-   # changing $(DEPDIR) to its actual value in the expansion.
+   # simplest approach to changing $(DEPDIR) to its actual value in the
-   for file in `sed -n -e '
+   # expansion.
-     /^DEP_FILES = .*\\\\$/ {
+   for file in `sed -n "
-       s/^DEP_FILES = //
+     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       :loop
-         s/\\\\$//
-         p
-         n
-         /\\\\$/ b loop
-       p
-     }
-     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue

 Legend:



Removed from v.4.0
 


changed lines


 
Added in v.5.0
 Legend:



Removed from v.4.0
 


changed lines


 
Added in v.5.0
-Removed from v.4.0
+Added in v.5.0

	ViewVC Help
Powered by ViewVC 1.1.23