[yoda] 01/05: Imported Upstream version 1.0.2
Lifeng Sun
lifengsun-guest at alioth.debian.org
Fri Aug 30 15:14:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository yoda.
commit 7703693ff15d32e928a056a23ba05e7d1a2a0d54
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Aug 20 13:00:40 2013 +0800
Imported Upstream version 1.0.2
---
ChangeLog | 26 +
Makefile.in | 12 +-
aclocal.m4 | 61 +
ar-lib | 270 +++
bin/Makefile.am | 4 +
bin/Makefile.in | 16 +-
bin/aida2flat | 18 +-
bin/aida2yoda | 18 +-
bin/flat2yoda | 18 +-
bin/yoda-config | 2 +-
bin/yoda2aida | 20 +-
bin/yoda2flat | 18 +-
bin/yoda2root | 25 +
configure | 3606 ++++++++++++++++++++------------------
configure.ac | 85 +-
include/Makefile.in | 4 +
include/YODA/Axis1D.h | 10 +-
include/YODA/Axis2D.h | 6 +-
include/YODA/Config/YodaConfig.h | 4 +-
include/YODA/Histo1D.h | 2 +
include/YODA/Histo2D.h | 4 +
include/YODA/HistoBin1D.h | 2 +
include/YODA/HistoBin2D.h | 5 +-
include/YODA/Makefile.in | 4 +
include/YODA/Profile1D.h | 3 +
include/YODA/Profile2D.h | 4 +
include/YODA/ProfileBin1D.h | 2 +
include/YODA/ProfileBin2D.h | 3 +
include/YODA/Utils/BinSearcher.h | 15 +-
m4/boost.m4 | 4 +-
pyext/Makefile.am | 3 +
pyext/Makefile.in | 8 +-
pyext/setup.py.in | 26 +-
pyext/yoda/Makefile.am | 3 +-
pyext/yoda/Makefile.in | 7 +-
pyext/yoda/__init__.py | 7 +
pyext/yoda/include/Makefile.in | 4 +
pyext/yoda/pyroot_helpers.hh | 4 +-
pyext/yoda/script_helpers.py | 20 +
src/Histo1D.cc | 12 +-
src/Histo2D.cc | 6 +
src/Makefile.in | 19 +-
src/Profile1D.cc | 16 +-
src/Profile2D.cc | 18 +-
src/Scatter2D.cc | 20 +-
src/WriterYODA.cc | 3 +-
src/tinyxml/Makefile.in | 19 +-
tests/Makefile.in | 245 +--
48 files changed, 2684 insertions(+), 2027 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aff28e2..09c1359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
+2013-08-14 Andy Buckley <andy.buckley at cern.ch>
+
+ * Version 1.0.2.
+
+ * Some exception message improvements and improving the protection
+ of cosmetic mean calculations in WriterYODA.
+
+2013-07-12 Andy Buckley <andy.buckley at cern.ch>
+
+ * Adding ROOT detection in configure and otherwise updating Dave's
+ rootcompat module so that it'll compile. There might be an
+ inconvenient ROOT version dependency in the signature of one of
+ the PyROOT API functions that is used as a shim :-(
+
+2013-06-17 Andy Buckley <andy.buckley at cern.ch>
+
+ * Adding yoda.m4 from James Robinson.
+
+2013-06-06 Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+ * Improve "==" operator in Axis1D and Axis2D
+
2013-06-06 Andy Buckley <andy.buckley at cern.ch>
+ * Adding fillBin() methods to all 1D and 2D histos, and noting
+ that Bin types need a back-link to their axis to maintain
+ consistency.
+
* Release of version 1.0.1
2013-06-05 Andy Buckley <andy.buckley at cern.ch>
diff --git a/Makefile.in b/Makefile.in
index beb900a..190c14b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,8 +57,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Doxyfile.in \
$(top_srcdir)/include/YODA/Config/BuildConfig.h.in \
$(top_srcdir)/include/YODA/Config/DummyConfig.h.in \
$(top_srcdir)/include/YODA/Config/YodaConfig.h.in AUTHORS \
- COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
- depcomp install-sh ltmain.sh missing
+ COPYING ChangeLog INSTALL NEWS TODO ar-lib config.guess \
+ config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \
$(top_srcdir)/m4/cxx.m4 $(top_srcdir)/m4/cython.m4 \
@@ -139,7 +139,7 @@ am__relativize = \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
@@ -221,6 +221,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -573,7 +577,6 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -605,6 +608,7 @@ dist-zip: distdir
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
diff --git a/aclocal.m4 b/aclocal.m4
index 515ff11..7b43c3c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -59,6 +59,67 @@ m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed. If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+ [am_cv_ar_interface=ar
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+ [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
+ ])
+ ])
+
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ m4_default([$1],
+ [AC_MSG_ERROR([could not determine $AR interface])])
+ ;;
+esac
+AC_SUBST([AR])dnl
+])
+
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
diff --git a/ar-lib b/ar-lib
new file mode 100755
index 0000000..0f62c6f
--- /dev/null
+++ b/ar-lib
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda at lysator.liu.se>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+ echo "$me: $1" 1>&2
+ exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv in
+ mingw)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+ operation=$2
+ archive=$3
+ at_file_contents=`cat "$1"`
+ eval set x "$at_file_contents"
+ shift
+
+ for member
+ do
+ $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+ done
+}
+
+case $1 in
+ '')
+ func_error "no command. Try '$0 --help' for more information."
+ ;;
+ -h | --h*)
+ cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "$me, version $scriptversion"
+ exit $?
+ ;;
+esac
+
+if test $# -lt 3; then
+ func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+ if test $# -lt 2; then
+ func_error "you must specify a program, an action and an archive"
+ fi
+ case $1 in
+ -lib | -LIB \
+ | -ltcg | -LTCG \
+ | -machine* | -MACHINE* \
+ | -subsystem* | -SUBSYSTEM* \
+ | -verbose | -VERBOSE \
+ | -wx* | -WX* )
+ AR="$AR $1"
+ shift
+ ;;
+ *)
+ action=$1
+ shift
+ break
+ ;;
+ esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+ case $action in
+ d*) delete=yes ;;
+ x*) extract=yes ;;
+ t*) list=yes ;;
+ q*) quick=yes ;;
+ r*) replace=yes ;;
+ s*) index=yes ;;
+ S*) ;; # the index is always updated implicitly
+ c*) create=yes ;;
+ u*) ;; # TODO: don't ignore the update modifier
+ v*) ;; # TODO: don't ignore the verbose modifier
+ *)
+ func_error "unknown action specified"
+ ;;
+ esac
+ action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+ yes,* | ,yes)
+ ;;
+ yesyes*)
+ func_error "more than one action specified"
+ ;;
+ *)
+ func_error "no action specified"
+ ;;
+esac
+
+if test -n "$delete"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ for member
+ do
+ case $1 in
+ @*)
+ func_at_file "${1#@}" -REMOVE "$archive"
+ ;;
+ *)
+ func_file_conv "$1"
+ $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+ ;;
+ esac
+ done
+
+elif test -n "$extract"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ if test $# -gt 0; then
+ for member
+ do
+ case $1 in
+ @*)
+ func_at_file "${1#@}" -EXTRACT "$archive"
+ ;;
+ *)
+ func_file_conv "$1"
+ $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+ ;;
+ esac
+ done
+ else
+ $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+ do
+ $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+ done
+ fi
+
+elif test -n "$quick$replace"; then
+ if test ! -f "$orig_archive"; then
+ if test -z "$create"; then
+ echo "$me: creating $orig_archive"
+ fi
+ orig_archive=
+ else
+ orig_archive=$archive
+ fi
+
+ for member
+ do
+ case $1 in
+ @*)
+ func_file_conv "${1#@}"
+ set x "$@" "@$file"
+ ;;
+ *)
+ func_file_conv "$1"
+ set x "$@" "$file"
+ ;;
+ esac
+ shift
+ shift
+ done
+
+ if test -n "$orig_archive"; then
+ $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+ else
+ $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+ fi
+
+elif test -n "$list"; then
+ if test ! -f "$orig_archive"; then
+ func_error "archive not found"
+ fi
+ $AR -NOLOGO -LIST "$archive" || exit $?
+fi
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 05a3ad1..8ccb33d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -12,3 +12,7 @@ uninstall-local:
else
EXTRA_DIST = yoda-completion
endif
+
+if ENABLE_ROOT
+dist_bin_SCRIPTS += yoda2root
+endif
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 297d4a4..2d12995 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -52,10 +52,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+ at ENABLE_ROOT_TRUE@am__append_1 = yoda2root
subdir = bin
-DIST_COMMON = $(am__dist_pkgdata_DATA_DIST) $(dist_bin_SCRIPTS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/yoda-config.in
+DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) \
+ $(am__dist_pkgdata_DATA_DIST) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/yoda-config.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/boost.m4 \
$(top_srcdir)/m4/cxx.m4 $(top_srcdir)/m4/cython.m4 \
@@ -72,6 +73,8 @@ CONFIG_HEADER = $(top_builddir)/include/YODA/Config/DummyConfig.h \
$(top_builddir)/include/YODA/Config/BuildConfig.h
CONFIG_CLEAN_FILES = yoda-config
CONFIG_CLEAN_VPATH_FILES =
+am__dist_bin_SCRIPTS_DIST = yoda-config yoda2aida yoda2flat aida2yoda \
+ aida2flat flat2yoda yodamerge yoda2root
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -193,6 +196,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -257,7 +264,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-dist_bin_SCRIPTS = yoda-config yoda2aida yoda2flat aida2yoda aida2flat flat2yoda yodamerge
+dist_bin_SCRIPTS = yoda-config yoda2aida yoda2flat aida2yoda aida2flat \
+ flat2yoda yodamerge $(am__append_1)
@ENABLE_PYEXT_TRUE at dist_pkgdata_DATA = yoda-completion
@ENABLE_PYEXT_TRUE at bashcomp_dir = $(prefix)/etc/bash_completion.d
@ENABLE_PYEXT_FALSE at EXTRA_DIST = yoda-completion
diff --git a/bin/aida2flat b/bin/aida2flat
index 2331b43..88ccc2a 100755
--- a/bin/aida2flat
+++ b/bin/aida2flat
@@ -7,24 +7,12 @@ Convert an AIDA data file to a 'flat', human-readable data format.
"""
import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
parser = optparse.OptionParser(usage=__doc__)
opts, args = parser.parse_args()
-
-INFILE = None
-OUTFILE = None
-
-if len(args) == 1:
- INFILE = args[0]
- if INFILE.endswith(".aida"):
- OUTFILE = INFILE.replace(".aida", ".dat")
- else:
- OUTFILE = INFILE + ".dat"
- OUTFILE = os.path.basename(OUTFILE)
-elif len(args) == 2:
- INFILE = args[0]
- OUTFILE = args[1]
-else:
+INFILE, OUTFILE = parse_x2y_args(args, ".aida", ".dat")
+if not INFILE or not OUTFILE:
sys.stderr.write("You must specify the AIDA and FLAT file names\n")
sys.exit(1)
diff --git a/bin/aida2yoda b/bin/aida2yoda
index dd534cc..cb18e1c 100755
--- a/bin/aida2yoda
+++ b/bin/aida2yoda
@@ -7,24 +7,12 @@ Convert an AIDA data file to the YODA data format.
"""
import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
parser = optparse.OptionParser(usage=__doc__)
opts, args = parser.parse_args()
-
-INFILE = None
-OUTFILE = None
-
-if len(args) == 1:
- INFILE = args[0]
- if INFILE.endswith(".aida"):
- OUTFILE = INFILE.replace(".aida", ".yoda")
- else:
- OUTFILE = INFILE + ".yoda"
- OUTFILE = os.path.basename(OUTFILE)
-elif len(args) == 2:
- INFILE = args[0]
- OUTFILE = args[1]
-else:
+INFILE, OUTFILE = parse_x2y_args(args, ".aida", ".yoda")
+if not INFILE or not OUTFILE:
sys.stderr.write("You must specify the AIDA and YODA file names\n")
sys.exit(1)
diff --git a/bin/flat2yoda b/bin/flat2yoda
index 4b2d4bf..a7c58d2 100755
--- a/bin/flat2yoda
+++ b/bin/flat2yoda
@@ -7,24 +7,12 @@ Convert a FLAT data file to the YODA data format.
"""
import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
parser = optparse.OptionParser(usage=__doc__)
opts, args = parser.parse_args()
-
-INFILE = None
-OUTFILE = None
-
-if len(args) == 1:
- INFILE = args[0]
- if INFILE.endswith(".dat"):
- OUTFILE = INFILE.replace(".dat", ".yoda")
- else:
- OUTFILE = INFILE + ".yoda"
- OUTFILE = os.path.basename(OUTFILE)
-elif len(args) == 2:
- INFILE = args[0]
- OUTFILE = args[1]
-else:
+INFILE, OUTFILE = parse_x2y_args(args, ".dat", ".yoda")
+if not INFILE or not OUTFILE:
sys.stderr.write("You must specify the FLAT and YODA file names\n")
sys.exit(1)
diff --git a/bin/yoda-config b/bin/yoda-config
index 16c18b6..8cef65b 100644
--- a/bin/yoda-config
+++ b/bin/yoda-config
@@ -51,6 +51,6 @@ test -n "$tmp" && OUT="$OUT -L${exec_prefix}/lib -lYODA"
## Version
tmp=$( echo "$*" | egrep -- '--\<version\>')
-test -n "$tmp" && echo 1.0.1 && exit 0
+test -n "$tmp" && echo 1.0.2 && exit 0
echo $OUT
diff --git a/bin/yoda2aida b/bin/yoda2aida
index 87caa9f..f2852c6 100755
--- a/bin/yoda2aida
+++ b/bin/yoda2aida
@@ -3,28 +3,16 @@
"""\
%prog yodafile [aidafile]
-Convert a YODA data file to the old AIDA data format.
+Convert a YODA data file to the old AIDA XML data format.
"""
import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
parser = optparse.OptionParser(usage=__doc__)
opts, args = parser.parse_args()
-
-INFILE = None
-OUTFILE = None
-
-if len(args) == 1:
- INFILE = args[0]
- if INFILE.endswith(".yoda"):
- OUTFILE = INFILE.replace(".yoda", ".aida")
- else:
- OUTFILE = INFILE + ".aida"
- OUTFILE = os.path.basename(OUTFILE)
-elif len(args) == 2:
- INFILE = args[0]
- OUTFILE = args[1]
-else:
+INFILE, OUTFILE = parse_x2y_args(args, ".yoda", ".aida")
+if not INFILE or not OUTFILE:
sys.stderr.write("You must specify the YODA and AIDA file names\n")
sys.exit(1)
diff --git a/bin/yoda2flat b/bin/yoda2flat
index e214e4d..0dc8f97 100755
--- a/bin/yoda2flat
+++ b/bin/yoda2flat
@@ -7,24 +7,12 @@ Convert a YODA data file to a 'flat', more human-readable data format.
"""
import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
parser = optparse.OptionParser(usage=__doc__)
opts, args = parser.parse_args()
-
-INFILE = None
-OUTFILE = None
-
-if len(args) == 1:
- INFILE = args[0]
- if INFILE.endswith(".yoda"):
- OUTFILE = INFILE.replace(".yoda", ".dat")
- else:
- OUTFILE = INFILE + ".dat"
- OUTFILE = os.path.basename(OUTFILE)
-elif len(args) == 2:
- INFILE = args[0]
- OUTFILE = args[1]
-else:
+INFILE, OUTFILE = parse_x2y_args(args, ".yoda", ".dat")
+if not INFILE or not OUTFILE:
sys.stderr.write("You must specify the YODA and FLAT file names\n")
sys.exit(1)
diff --git a/bin/yoda2root b/bin/yoda2root
new file mode 100644
index 0000000..57a2861
--- /dev/null
+++ b/bin/yoda2root
@@ -0,0 +1,25 @@
+#! /usr/bin/env python
+
+"""\
+%prog yodafile [rootfile]
+
+Convert a YODA data file to the ROOT data format.
+"""
+
+import yoda, os, sys, optparse
+from yoda.script_helpers import parse_x2y_args
+
+parser = optparse.OptionParser(usage=__doc__)
+opts, args = parser.parse_args()
+INFILE, OUTFILE = parse_x2y_args(args, ".yoda", ".root")
+if not INFILE or not OUTFILE:
+ sys.stderr.write("You must specify the YODA and ROOT file names\n")
+ sys.exit(1)
+
+import ROOT
+of = ROOT.TFile(OUTFILE, "recreate")
+analysisobjects = yoda.readYODA(INFILE)
+rootobjects = [yoda.to_root(ao) for ao in analysisobjects]
+#print rootobjects
+of.Write()
+of.Close()
diff --git a/configure b/configure
index ee4177e..8e08283 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for YODA 1.0.1.
+# Generated by GNU Autoconf 2.69 for YODA 1.0.2.
#
# Report bugs to <yoda at projects.hepforge.org>.
#
@@ -650,8 +650,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='YODA'
PACKAGE_TARNAME='YODA'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='YODA 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='YODA 1.0.2'
PACKAGE_BUGREPORT='yoda at projects.hepforge.org'
PACKAGE_URL=''
@@ -696,14 +696,14 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
EMPTY
+WITH_DOXYGEN_FALSE
+WITH_DOXYGEN_TRUE
+DOXYGEN
AM_CXXFLAGS
AM_CPPFLAGS
-BOOST_CPPFLAGS
-DISTCHECK_CONFIGURE_FLAGS
-BOOST_ROOT
-PYEXT_CXXFLAGS
ENABLE_PYEXT_FALSE
ENABLE_PYEXT_TRUE
+PYEXT_CXXFLAGS
pkgpyexecdir
pyexecdir
pkgpythondir
@@ -716,9 +716,15 @@ PYTHON_VERSION
PYTHON
PYTHON_USE_FALSE
PYTHON_USE_TRUE
-WITH_DOXYGEN_FALSE
-WITH_DOXYGEN_TRUE
-DOXYGEN
+ENABLE_ROOT_FALSE
+ENABLE_ROOT_TRUE
+ROOT_LIBS
+ROOT_LDFLAGS
+ROOT_CXXFLAGS
+ROOTCONFIG
+BOOST_CPPFLAGS
+DISTCHECK_CONFIGURE_FLAGS
+BOOST_ROOT
LIB_SUFFIX
CXXCPP
CPP
@@ -729,8 +735,6 @@ NMEDIT
DSYMUTIL
MANIFEST_TOOL
RANLIB
-ac_ct_AR
-AR
DLLTOOL
OBJDUMP
NM
@@ -741,12 +745,6 @@ FGREP
EGREP
GREP
SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-ac_ct_CC
-CFLAGS
-CC
host_os
host_vendor
host_cpu
@@ -760,6 +758,16 @@ LN_S
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+LIBPATHVARNAME
+WITH_OSX_FALSE
+WITH_OSX_TRUE
+SWVERS
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
@@ -769,15 +777,13 @@ am__include
DEPDIR
OBJEXT
EXEEXT
-ac_ct_CXX
+ac_ct_CC
CPPFLAGS
LDFLAGS
-CXXFLAGS
-CXX
-LIBPATHVARNAME
-WITH_OSX_FALSE
-WITH_OSX_TRUE
-SWVERS
+CFLAGS
+CC
+ac_ct_AR
+AR
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -856,24 +862,25 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_debug
-enable_pyext
with_boost
+enable_root
+enable_pyext
'
ac_precious_vars='build_alias
host_alias
target_alias
-CXX
-CXXFLAGS
+CC
+CFLAGS
LDFLAGS
LIBS
CPPFLAGS
+CXX
+CXXFLAGS
CCC
-CC
-CFLAGS
CPP
CXXCPP
-PYTHON
-BOOST_ROOT'
+BOOST_ROOT
+PYTHON'
# Initialize some variables set by options.
@@ -1414,7 +1421,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures YODA 1.0.1 to adapt to many kinds of systems.
+\`configure' configures YODA 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1484,7 +1491,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of YODA 1.0.1:";;
+ short | recursive ) echo "Configuration of YODA 1.0.2:";;
esac
cat <<\_ACEOF
@@ -1502,6 +1509,8 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-debug build with debugging symbols [default=no]
+ --enable-root build Python extension with ROOT interfacing
+ [default=yes]
--disable-pyext don't build Python module (default=build)
Optional Packages:
@@ -1515,19 +1524,19 @@ Optional Packages:
--with-boost=DIR prefix of Boost 1.47.0 [guess]
Some influential environment variables:
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
+ CC C compiler command
+ CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
- CC C compiler command
- CFLAGS C compiler flags
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
CPP C preprocessor
CXXCPP C++ preprocessor
- PYTHON Python Executable Path
BOOST_ROOT Location of Boost installation
+ PYTHON Python Executable Path
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1595,7 +1604,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-YODA configure 1.0.1
+YODA configure 1.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1609,10 +1618,10 @@ fi
## Autoconf initialization. ##
## ------------------------ ##
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
+# ac_fn_c_try_compile LINENO
+# --------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
+ac_fn_c_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext
@@ -1632,7 +1641,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then :
ac_retval=0
@@ -1645,12 +1654,12 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_cxx_try_compile
+} # ac_fn_c_try_compile
-# ac_fn_c_try_compile LINENO
-# --------------------------
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
+ac_fn_cxx_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
rm -f conftest.$ac_objext
@@ -1670,7 +1679,7 @@ $as_echo "$ac_try_echo"; } >&5
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then :
ac_retval=0
@@ -1683,7 +1692,7 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
-} # ac_fn_c_try_compile
+} # ac_fn_cxx_try_compile
# ac_fn_c_try_link LINENO
# -----------------------
@@ -2085,7 +2094,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by YODA $as_me 1.0.1, which was
+It was created by YODA $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2900,7 +2909,7 @@ fi
# Define the identity of the package.
PACKAGE='YODA'
- VERSION='1.0.1'
+ VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -2980,49 +2989,84 @@ else
fi
AM_BACKSLASH='\'
+DEPDIR="${am__leading_dot}deps"
+ac_config_commands="$ac_config_commands depfiles"
-ac_config_headers="$ac_config_headers include/YODA/Config/DummyConfig.h include/YODA/Config/YodaConfig.h include/YODA/Config/BuildConfig.h"
-
-
-cat >>confdefs.h <<_ACEOF
-#define YODA_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define YODA_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define YODA_STRING "$PACKAGE_STRING"
-_ACEOF
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
-cat >>confdefs.h <<_ACEOF
-#define YODA_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
-cat >>confdefs.h <<_ACEOF
-#define YODA_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+ enableval=$enable_dependency_tracking;
+fi
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
-## OS X
- LIBPATHVARNAME="LD_LIBRARY_PATH"
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}sw_vers", so it can be a program name with args.
-set dummy ${ac_tool_prefix}sw_vers; ac_word=$2
+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
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_SWVERS+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$SWVERS"; then
- ac_cv_prog_SWVERS="$SWVERS" # Let the user override the test.
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3031,7 +3075,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_SWVERS="${ac_tool_prefix}sw_vers"
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -3041,10 +3085,10 @@ IFS=$as_save_IFS
fi
fi
-SWVERS=$ac_cv_prog_SWVERS
-if test -n "$SWVERS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWVERS" >&5
-$as_echo "$SWVERS" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -3052,17 +3096,17 @@ fi
fi
-if test -z "$ac_cv_prog_SWVERS"; then
- ac_ct_SWVERS=$SWVERS
- # Extract the first word of "sw_vers", so it can be a program name with args.
-set dummy sw_vers; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_SWVERS+:} false; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_SWVERS"; then
- ac_cv_prog_ac_ct_SWVERS="$ac_ct_SWVERS" # Let the user override the test.
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3071,7 +3115,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_SWVERS="sw_vers"
+ ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -3081,17 +3125,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_SWVERS=$ac_cv_prog_ac_ct_SWVERS
-if test -n "$ac_ct_SWVERS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SWVERS" >&5
-$as_echo "$ac_ct_SWVERS" >&6; }
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_SWVERS" = x; then
- SWVERS=""
+ if test "x$ac_ct_CC" = x; then
+ CC=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3099,67 +3143,122 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- SWVERS=$ac_ct_SWVERS
+ CC=$ac_ct_CC
fi
else
- SWVERS="$ac_cv_prog_SWVERS"
+ CC="$ac_cv_prog_CC"
fi
- if test x$SWVERS != x; then
- PROD_NAME=$($SWVERS -productName | cut -f 2 -d:)
- fi
- if test "$PROD_NAME" = "Mac OS X"; then
- WITH_OSX_TRUE=
- WITH_OSX_FALSE='#'
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- WITH_OSX_TRUE='#'
- WITH_OSX_FALSE=
-fi
-
- if test "$PROD_NAME" = "Mac OS X"; then
- MACOSX_DEPLOYMENT_TARGET=$($SWVERS -productVersion | cut -f 1,2 -d.)
- { $as_echo "$as_me:${as_lineno-$LINENO}: MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET" >&5
-$as_echo "$as_me: MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET" >&6;}
- AM_CXXFLAGS="$AM_CXXFLAGS -Dunix"
- LIBPATHVARNAME="DYLD_LIBRARY_PATH"
- fi
-
-
-
-## Set default compiler flags
-if test "x$CXXFLAGS" == "x"; then CXXFLAGS="-O3"; fi
-
-## Make compiler error messages more readable if gfilt is installed.
-#AC_CEDAR_CXXFILTER
-
-## Checks for programs.
-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
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $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
-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
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $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
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$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 ${ac_cv_prog_CXX+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3168,7 +3267,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -3178,32 +3277,32 @@ IFS=$as_save_IFS
fi
fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$CXX" && break
+ test -n "$CC" && break
done
fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
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 ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -3212,7 +3311,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
+ ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -3222,21 +3321,21 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$ac_ct_CXX" && break
+ test -n "$ac_ct_CC" && break
done
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
+ if test "x$ac_ct_CC" = x; then
+ CC=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3244,14 +3343,20 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CXX=$ac_ct_CXX
+ CC=$ac_ct_CC
fi
fi
- fi
fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
for ac_option in --version -v -V -qversion; do
@@ -3291,8 +3396,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3362,14 +3467,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
+as_fn_error 77 "C compiler cannot create executables
See \`config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
@@ -3463,7 +3568,7 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
+as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details" "$LINENO" 5; }
fi
@@ -3525,9 +3630,9 @@ fi
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3544,33 +3649,33 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
ac_compiler_gnu=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
- GXX=yes
+ GCC=yes
else
- GXX=
+ GCC=
fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3582,10 +3687,10 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
else
- CXXFLAGS=""
+ CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3597,11 +3702,11 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
else
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- CXXFLAGS="-g"
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3613,107 +3718,134 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
else
- CXXFLAGS="-g"
+ CFLAGS="-g"
fi
else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
else
- CXXFLAGS=
+ CFLAGS=
fi
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
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
- enableval=$enable_dependency_tracking;
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+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
-depcc="$CXX" am_compiler_list=
+depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3736,7 +3868,7 @@ else
# directory.
mkdir sub
- am_cv_CXX_dependencies_compiler_type=none
+ am_cv_CC_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -3809,7 +3941,7 @@ else
# 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
+ am_cv_CC_dependencies_compiler_type=$depmode
break
fi
fi
@@ -3818,252 +3950,229 @@ else
cd ..
rm -rf conftest.dir
else
- am_cv_CXX_dependencies_compiler_type=none
+ am_cv_CC_dependencies_compiler_type=none
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar lib "link -lib"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$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 ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$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
-# 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
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
- enable_static=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar lib "link -lib"
+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 ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$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
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+ test -n "$ac_ct_AR" && break
+done
-
-
-
-enable_dlopen=yes
-
-
-
-case `pwd` in
- *\ * | *\ *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
esac
+ AR=$ac_ct_AR
+ fi
+fi
+: ${AR=ar}
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+ ;;
esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO ""
-}
-case "$ECHO" in
- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
+ac_config_headers="$ac_config_headers include/YODA/Config/DummyConfig.h include/YODA/Config/YodaConfig.h include/YODA/Config/BuildConfig.h"
+cat >>confdefs.h <<_ACEOF
+#define YODA_VERSION "$PACKAGE_VERSION"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define YODA_NAME "$PACKAGE_NAME"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define YODA_STRING "$PACKAGE_STRING"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define YODA_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define YODA_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+## OS X
-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
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ LIBPATHVARNAME="LD_LIBRARY_PATH"
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}sw_vers", so it can be a program name with args.
+set dummy ${ac_tool_prefix}sw_vers; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_prog_SWVERS+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$SWVERS"; then
+ ac_cv_prog_SWVERS="$SWVERS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4072,7 +4181,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ ac_cv_prog_SWVERS="${ac_tool_prefix}sw_vers"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4082,10 +4191,10 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+SWVERS=$ac_cv_prog_SWVERS
+if test -n "$SWVERS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWVERS" >&5
+$as_echo "$SWVERS" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -4093,17 +4202,17 @@ fi
fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+if test -z "$ac_cv_prog_SWVERS"; then
+ ac_ct_SWVERS=$SWVERS
+ # Extract the first word of "sw_vers", so it can be a program name with args.
+set dummy sw_vers; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if ${ac_cv_prog_ac_ct_SWVERS+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$ac_ct_SWVERS"; then
+ ac_cv_prog_ac_ct_SWVERS="$ac_ct_SWVERS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4112,7 +4221,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
+ ac_cv_prog_ac_ct_SWVERS="sw_vers"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4122,17 +4231,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ac_ct_SWVERS=$ac_cv_prog_ac_ct_SWVERS
+if test -n "$ac_ct_SWVERS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SWVERS" >&5
+$as_echo "$ac_ct_SWVERS" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_CC" = x; then
- CC=""
+ if test "x$ac_ct_SWVERS" = x; then
+ SWVERS=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4140,122 +4249,67 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CC=$ac_ct_CC
+ SWVERS=$ac_ct_SWVERS
fi
else
- CC="$ac_cv_prog_CC"
+ SWVERS="$ac_cv_prog_SWVERS"
fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ if test x$SWVERS != x; then
+ PROD_NAME=$($SWVERS -productName | cut -f 2 -d:)
fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ if test "$PROD_NAME" = "Mac OS X"; then
+ WITH_OSX_TRUE=
+ WITH_OSX_FALSE='#'
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ WITH_OSX_TRUE='#'
+ WITH_OSX_FALSE=
fi
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ if test "$PROD_NAME" = "Mac OS X"; then
+ MACOSX_DEPLOYMENT_TARGET=$($SWVERS -productVersion | cut -f 1,2 -d.)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET" >&5
+$as_echo "$as_me: MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET" >&6;}
+ AM_CXXFLAGS="$AM_CXXFLAGS -Dunix"
+ LIBPATHVARNAME="DYLD_LIBRARY_PATH"
fi
-done
- done
-IFS=$as_save_IFS
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
+## Set default compiler flags
+if test "x$CXXFLAGS" = "x"; then CXXFLAGS="-O3"; fi
+
+## Make compiler error messages more readable if gfilt is installed.
+#AC_CEDAR_CXXFILTER
+
+## Checks for programs.
+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_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
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$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 ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4264,7 +4318,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4274,32 +4328,32 @@ IFS=$as_save_IFS
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$CC" && break
+ test -n "$CXX" && break
done
fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
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 ${ac_cv_prog_ac_ct_CC+:} false; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4308,7 +4362,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4318,21 +4372,21 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$ac_ct_CC" && break
+ test -n "$ac_ct_CXX" && break
done
- if test "x$ac_ct_CC" = x; then
- CC=""
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4340,20 +4394,14 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CC=$ac_ct_CC
+ CXX=$ac_ct_CXX
fi
fi
+ fi
fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
set X $ac_compile
ac_compiler=$2
for ac_option in --version -v -V -qversion; do
@@ -4377,9 +4425,9 @@ $as_echo "$ac_try_echo"; } >&5
test $ac_status = 0; }
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4396,33 +4444,33 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
ac_compiler_gnu=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
- GCC=yes
+ GXX=yes
else
- GCC=
+ GXX=
fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4434,10 +4482,10 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
else
- CFLAGS=""
+ CXXFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4449,11 +4497,11 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
else
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4465,134 +4513,44 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
else
- CFLAGS=
+ CXXFLAGS="-g"
fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
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
-depcc="$CC" am_compiler_list=
+depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4615,7 +4573,7 @@ else
# directory.
mkdir sub
- am_cv_CC_dependencies_compiler_type=none
+ am_cv_CXX_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -4688,7 +4646,7 @@ else
# 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
+ am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
fi
@@ -4697,96 +4655,60 @@ else
cd ..
rm -rf conftest.dir
else
- am_cv_CC_dependencies_compiler_type=none
+ am_cv_CXX_dependencies_compiler_type=none
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- { ac_script=; unset ac_script;}
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- 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_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
- $ac_path_SED_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- ac_cv_path_SED=$SED
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
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=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
@@ -4795,97 +4717,203 @@ Xsed="$SED -e 1s/^X//"
+enable_dlopen=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_path_GREP=$GREP
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
*)
ac_count=0
$as_echo_n 0123456789 >"conftest.in"
@@ -4894,14 +4922,14 @@ case `"$ac_path_EGREP" --version 2>&1` in
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
@@ -4909,38 +4937,180 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
- $ac_path_EGREP_found && break 3
+ $ac_path_SED_found && break 3
done
done
done
IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
- ac_cv_path_EGREP=$EGREP
+ ac_cv_path_SED=$SED
fi
- fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
- then ac_cv_path_FGREP="$GREP -F"
- else
- if test -z "$FGREP"; then
- ac_path_FGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+ then ac_cv_path_FGREP="$GREP -F"
+ else
+ if test -z "$FGREP"; then
+ ac_path_FGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6881,7 +7051,6 @@ $as_echo "${lt_sysroot:-no}" >&6; }
-
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
@@ -15432,235 +15601,436 @@ else
enable_debug=no
fi
-if test x$enable_debug == xyes; then
+if test x$enable_debug = xyes; then
AM_CXXFLAGS="$AM_CXXFLAGS -g"
fi
-## Build Doxygen if possible
-# Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DOXYGEN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $DOXYGEN in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
- ;;
- *)
- 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_DOXYGEN="$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
-
- ;;
-esac
-fi
-DOXYGEN=$ac_cv_path_DOXYGEN
-if test -n "$DOXYGEN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "$DOXYGEN"; then
- WITH_DOXYGEN_TRUE=
- WITH_DOXYGEN_FALSE='#'
-else
- WITH_DOXYGEN_TRUE='#'
- WITH_DOXYGEN_FALSE=
-fi
-
+## Required Boost C++ utility library
+echo "$as_me: this is boost.m4 serial 18" >&5
+boost_save_IFS=$IFS
+boost_version_req=1.47.0
+IFS=.
+set x $boost_version_req 0 0 0
+IFS=$boost_save_IFS
+shift
+boost_version_req=`expr "$1" '*' 100000 + "$2" '*' 100 + "$3"`
+boost_version_req_string=$1.$2.$3
-## Python extension
-# Check whether --enable-pyext was given.
-if test "${enable_pyext+set}" = set; then :
- enableval=$enable_pyext;
-else
- enable_pyext=yes
+# Check whether --with-boost was given.
+if test "${with_boost+set}" = set; then :
+ withval=$with_boost;
fi
-
-
- az_python_use=false
- if test x"$az_python_use" = x"true"; then
- PYTHON_USE_TRUE=
- PYTHON_USE_FALSE='#'
-else
- PYTHON_USE_TRUE='#'
- PYTHON_USE_FALSE=
+# If BOOST_ROOT is set and the user has not provided a value to
+# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
+if test x"$BOOST_ROOT" != x; then
+ if test x"$with_boost" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&5
+$as_echo "$as_me: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&6;}
+ with_boost=$BOOST_ROOT
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&5
+$as_echo "$as_me: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&6;}
+ fi
fi
-
-
-## Basic Python checks
-if test x$enable_pyext == xyes; then
-
-
- # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
+DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"
+boost_save_CPPFLAGS=$CPPFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req_string" >&5
+$as_echo_n "checking for Boost headers version >= $boost_version_req_string... " >&6; }
+if ${boost_cv_inc_path+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $PYTHON in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
- ;;
- *)
- 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PYTHON="$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
+ boost_cv_inc_path=no
+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <boost/version.hpp>
+#if !defined BOOST_VERSION
+# error BOOST_VERSION is not defined
+#elif BOOST_VERSION < $boost_version_req
+# error Boost headers version < $boost_version_req
+#endif
- ;;
-esac
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # If the user provided a value to --with-boost, use it and only it.
+ case $with_boost in #(
+ ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
+ /usr/include C:/Boost/include;; #(
+ *) set x "$with_boost/include" "$with_boost";;
+ esac
+ shift
+ for boost_dir
+ do
+ # Without --layout=system, Boost (or at least some versions) installs
+ # itself in <prefix>/include/boost-<version>. This inner loop helps to
+ # find headers in such directories.
+ #
+ # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
+ # order followed by ${boost_dir}. The final '.' is a sentinel for
+ # searching $boost_dir" itself. Entries are whitespace separated.
+ #
+ # I didn't indent this loop on purpose (to avoid over-indented code)
+ boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
+ && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
+ && echo .`
+ for boost_inc in $boost_layout_system_search_list
+ do
+ if test x"$boost_inc" != x.; then
+ boost_inc="$boost_dir/$boost_inc"
+ else
+ boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
+ fi
+ if test x"$boost_inc" != x; then
+ # We are going to check whether the version of Boost installed
+ # in $boost_inc is usable by running a compilation that
+ # #includes it. But if we pass a -I/some/path in which Boost
+ # is not installed, the compiler will just skip this -I and
+ # use other locations (either from CPPFLAGS, or from its list
+ # of system include directories). As a result we would use
+ # header installed on the machine instead of the /some/path
+ # specified by the user. So in that precise case (trying
+ # $boost_inc), make sure the version.hpp exists.
+ #
+ # Use test -e as there can be symlinks.
+ test -e "$boost_inc/boost/version.hpp" || continue
+ CPPFLAGS="$CPPFLAGS -I$boost_inc"
+ fi
+ if ac_fn_cxx_try_compile "$LINENO"; then :
+ boost_cv_inc_path=yes
+else
+ boost_cv_version=no
fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+rm -f core conftest.err conftest.$ac_objext
+ if test x"$boost_cv_inc_path" = xyes; then
+ if test x"$boost_inc" != x; then
+ boost_cv_inc_path=$boost_inc
+ fi
+ break 2
+ fi
+ done
+ done
+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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_inc_path" >&5
+$as_echo "$boost_cv_inc_path" >&6; }
+ case $boost_cv_inc_path in #(
+ no)
+ boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
+ as_fn_error $? "$boost_errmsg" "$LINENO" 5
+
+ ;;#(
+ yes)
+ BOOST_CPPFLAGS=
+ ;;#(
+ *)
+ BOOST_CPPFLAGS="-I$boost_cv_inc_path"
+ ;;
+ esac
+ if test x"$boost_cv_inc_path" != xno; then
+
+$as_echo "#define HAVE_BOOST 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost's header version" >&5
+$as_echo_n "checking for Boost's header version... " >&6; }
+if ${boost_cv_lib_version+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <boost/version.hpp>
+boost-lib-version = BOOST_LIB_VERSION
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ tr -d '\r' |
+ $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
+ boost_cv_lib_version=`cat conftest.i`
fi
+rm -rf conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
+$as_echo "$boost_cv_lib_version" >&6; }
+ # e.g. "134" for 1_34_1 or "135" for 1_35
+ boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+ case $boost_major_version in #(
+ '' | *[!0-9]*)
+ as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5
+ ;;
+ esac
+fi
+CPPFLAGS=$boost_save_CPPFLAGS
- if test -z "$PYTHON"
- then
- as_fn_error $? "Python Executable not found" "$LINENO" 5
- else
- az_python_use=true
- fi
- if test "$az_python_use" = "true"; then
- PYTHON_USE_TRUE=
- PYTHON_USE_FALSE='#'
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/foreach.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/foreach.hpp" >&6;}
else
- PYTHON_USE_TRUE='#'
- PYTHON_USE_FALSE=
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/foreach.hpp" "ac_cv_header_boost_foreach_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_foreach_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_FOREACH_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/foreach.hpp" "$LINENO" 5
fi
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/scoped_ptr.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/scoped_ptr.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/scoped_ptr.hpp" "ac_cv_header_boost_scoped_ptr_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_scoped_ptr_hpp" = xyes; then :
- if test -n "$PYTHON"
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5
-$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
+$as_echo "#define HAVE_BOOST_SCOPED_PTR_HPP 1" >>confdefs.h
+else
+ as_fn_error $? "cannot find boost/scoped_ptr.hpp" "$LINENO" 5
+fi
- if test -z "$PYTHON"
- then
- as_fn_error $? "Python Executable not found" "$LINENO" 5
- else
- cat >conftest.py <<_ACEOF
-import sys, string
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
-if sys.hexversion >= minverhex:
- sys.exit( 0 )
-else:
- sys.exit( 1 )
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
-_ACEOF
- az_python_output=`$PYTHON conftest.py`
- az_python_cc=$?
- rm conftest.py
- if test -f "conftest.pyc"
- then
- rm conftest.pyc
- fi
- fi
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/shared_ptr.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/shared_ptr.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes; then :
- if test $az_python_cc -eq 0
- then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else as_fn_error $? "too old" "$LINENO" 5
+$as_echo "#define HAVE_BOOST_SHARED_PTR_HPP 1" >>confdefs.h
+else
+ as_fn_error $? "cannot find boost/shared_ptr.hpp" "$LINENO" 5
+fi
- fi
- fi
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
- PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
- YODA_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/lexical_cast.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/lexical_cast.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/lexical_cast.hpp" "ac_cv_header_boost_lexical_cast_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_lexical_cast_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_LEXICAL_CAST_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/lexical_cast.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/assign.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/assign.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/assign.hpp" "ac_cv_header_boost_assign_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_assign_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_ASSIGN_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/assign.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/spirit/include/qi.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/spirit/include/qi.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/qi.hpp" "ac_cv_header_boost_spirit_include_qi_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_spirit_include_qi_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_SPIRIT_INCLUDE_QI_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/spirit/include/qi.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/spirit/include/phoenix_operator.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/spirit/include/phoenix_operator.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/phoenix_operator.hpp" "ac_cv_header_boost_spirit_include_phoenix_operator_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_spirit_include_phoenix_operator_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_SPIRIT_INCLUDE_PHOENIX_OPERATOR_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/spirit/include/phoenix_operator.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/fusion/include/adapt_struct.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/fusion/include/adapt_struct.hpp" >&6;}
+else
+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
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/fusion/include/adapt_struct.hpp" "ac_cv_header_boost_fusion_include_adapt_struct_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_fusion_include_adapt_struct_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_FUSION_INCLUDE_ADAPT_STRUCT_HPP 1" >>confdefs.h
- ## Test for Python header
- if test -x "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
-$as_echo_n "checking for Python include path... " >&6; }
- python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
-$as_echo "$python_incpath" >&6; }
- python_header="$python_incpath/Python.h"
- if test -z "$python_incpath"; then
- as_fn_error $? "Can't build Python extension since include directory cannot be determined from distutils" "$LINENO" 5
- enable_pyext=no
- elif test ! -e "$python_header"; then
- as_fn_error $? "Can't build Python extension since header file $python_header cannot be found" "$LINENO" 5
- enable_pyext=no
- fi
- else
- as_fn_error $? "Can't build Python extension since python can't be found" "$LINENO" 5
- enable_pyext=no
- fi
+else
+ as_fn_error $? "cannot find boost/fusion/include/adapt_struct.hpp" "$LINENO" 5
fi
-## Cython checks (Probably need some help...)
-# TODO: "Tarball users" should ideally not need to have Cython installed
-if test x$enable_pyext == xyes; then
+CPPFLAGS=$boost_save_CPPFLAGS
+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
+fi
+## Optional ROOT compatibility
+# Check whether --enable-root was given.
+if test "${enable_root+set}" = set; then :
+ enableval=$enable_root; enable_root=yes
+fi
- # Find any Python interpreter.
- if test -z "$PYTHON"; then
- for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test "x$enable_root" = "xyes"; then
+ # 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 ${ac_cv_path_PYTHON+:} false; then :
+if ${ac_cv_path_ROOTCONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $PYTHON in
+ case $ROOTCONFIG in
[\\/]* | ?:[\\/]*)
- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ac_cv_path_ROOTCONFIG="$ROOTCONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15670,7 +16040,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_ROOTCONFIG="$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
@@ -15681,706 +16051,517 @@ IFS=$as_save_IFS
;;
esac
fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+ROOTCONFIG=$ac_cv_path_ROOTCONFIG
+if test -n "$ROOTCONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ROOTCONFIG" >&5
+$as_echo "$ROOTCONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- test -n "$PYTHON" && break
-done
-test -n "$PYTHON" || PYTHON=":"
-
- fi
- am_display_PYTHON=python
-
-
- if test "$PYTHON" = :; then
- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+ if test "x$ROOTCONFIG" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: root-config not found -- not building extra ROOT compatibility tools" >&5
+$as_echo "$as_me: WARNING: root-config not found -- not building extra ROOT compatibility tools" >&2;}
+ enable_root=no;
else
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
- PYTHON_VERSION=$am_cv_python_version
-
-
-
- PYTHON_PREFIX='${prefix}'
-
- PYTHON_EXEC_PREFIX='${exec_prefix}'
+ # TODO: Test for existence of TPython, instance_from_void API, etc.
+ #AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"
+ ROOT_CXXFLAGS=`$ROOTCONFIG --cflags`
+ ROOT_LDFLAGS=`$ROOTCONFIG --ldflags`
+ ROOT_LIBS=`$ROOTCONFIG --libs`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
+ fi
+fi
+ if test x$enable_root = xyes; then
+ ENABLE_ROOT_TRUE=
+ ENABLE_ROOT_FALSE='#'
else
- am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+ ENABLE_ROOT_TRUE='#'
+ ENABLE_ROOT_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
- PYTHON_PLATFORM=$am_cv_python_platform
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
+## Python extension
+# Check whether --enable-pyext was given.
+if test "${enable_pyext+set}" = set; then :
+ enableval=$enable_pyext;
else
- if test "x$prefix" = xNONE
- then
- am_py_prefix=$ac_default_prefix
- else
- am_py_prefix=$prefix
- fi
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
- case $am_cv_python_pythondir in
- $am_py_prefix*)
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
- ;;
- *)
- case $am_py_prefix in
- /usr|/System*) ;;
- *)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
- ;;
- esac
- ;;
- esac
-
+ enable_pyext=yes
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
- pythondir=$am_cv_python_pythondir
-
-
-
- pkgpythondir=\${pythondir}/$PACKAGE
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
+ az_python_use=false
+ if test x"$az_python_use" = x"true"; then
+ PYTHON_USE_TRUE=
+ PYTHON_USE_FALSE='#'
else
- if test "x$exec_prefix" = xNONE
- then
- am_py_exec_prefix=$am_py_prefix
- else
- am_py_exec_prefix=$exec_prefix
- fi
- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
- case $am_cv_python_pyexecdir in
- $am_py_exec_prefix*)
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
- ;;
- *)
- case $am_py_exec_prefix in
- /usr|/System*) ;;
- *)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
- ;;
- esac
- ;;
- esac
-
+ PYTHON_USE_TRUE='#'
+ PYTHON_USE_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
- pyexecdir=$am_cv_python_pyexecdir
-
-
-
- pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
- fi
+## Basic Python checks
+if test x$enable_pyext = xyes; then
-_msg=" >= 0.18"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cython$_msg" >&5
-$as_echo_n "checking for Cython$_msg... " >&6; }
-if ${py_cv_cython+:} false; then :
+ # Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PYTHON="$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
-
-prog="import Cython.Compiler.Version; print Cython.Compiler.Version.version"
-CYTHON_VERSION=`$PYTHON -c "$prog" 2>&5`
-
-py_cv_cython=no
-if test "x$CYTHON_VERSION" != "x"; then
- py_cv_cython=yes
-fi
-
-if test "x$py_cv_cython" = "xyes"; then
- as_arg_v1=$CYTHON_VERSION
-as_arg_v2=0.18
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
- 1) :
- py_cv_cython=no ;; #(
- 0) :
- ;; #(
- 2) :
- ;; #(
- *) :
- ;;
+ ;;
esac
fi
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_cython" >&5
-$as_echo "$py_cv_cython" >&6; }
-
-if test "x$py_cv_cython" = "xyes"; then
- CYTHON_FOUND=yes
- :
-else
- CYTHON_FOUND=no
- :
-fi
-
- if test x$CYTHON_FOUND != xyes; then
- as_fn_error $? "Can't build Python extension since Cython >= 0.18 could not be found" "$LINENO" 5
- enable_pyext=no
- else
- cython_compiler=$CXX
- fi
-fi
-## Finish Python extension testing
-if test x$enable_pyext == xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: All Python build checks successful: 'yoda' Python extension will be built" >&5
-$as_echo "$as_me: All Python build checks successful: 'yoda' Python extension will be built" >&6;}
-fi
- if test x$enable_pyext == xyes; then
- ENABLE_PYEXT_TRUE=
- ENABLE_PYEXT_FALSE='#'
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
else
- ENABLE_PYEXT_TRUE='#'
- ENABLE_PYEXT_FALSE=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-## Set extra Python extension build flags (to cope with Cython output code oddities)
-PYEXT_CXXFLAGS=
+ if test -z "$PYTHON"
+ then
+ as_fn_error $? "Python Executable not found" "$LINENO" 5
+ else
+ az_python_use=true
+ fi
+ if test "$az_python_use" = "true"; then
+ PYTHON_USE_TRUE=
+ PYTHON_USE_FALSE='#'
+else
+ PYTHON_USE_TRUE='#'
+ PYTHON_USE_FALSE=
+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
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the $CXX compiler accepts the -Wno-unused-but-set-variable flag" >&5
-$as_echo_n "checking if the $CXX compiler accepts the -Wno-unused-but-set-variable flag... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int
-main ()
-{
-return 0;
- ;
- return 0;
-}
-_ACEOF
- flag_ok=no
- #$CXX -Wno-unused-but-set-variable conftest.cpp >&5 2>/dev/null && flag_ok=yes
- stat_string=`$CXX -Wno-unused-but-set-variable conftest.cpp 2>&1 1>&5` ; test -z "$stat_string" && flag_ok=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
-$as_echo "$flag_ok" >&6; }
- if test x$flag_ok = xyes; then
- true
- PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-unused-but-set-variable"
- else
- true
- 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
+ if test -n "$PYTHON"
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5
+$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
- 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
+ if test -z "$PYTHON"
+ then
+ as_fn_error $? "Python Executable not found" "$LINENO" 5
+ else
+ cat >conftest.py <<_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the $CXX compiler accepts the -Wno-sign-compare flag" >&5
-$as_echo_n "checking if the $CXX compiler accepts the -Wno-sign-compare flag... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+import sys, string
+# split strings by '.' and convert to numeric. Append some zeros
+# because we need at least 4 digits for the hex conversion.
+minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+minverhex = 0
+for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+if sys.hexversion >= minverhex:
+ sys.exit( 0 )
+else:
+ sys.exit( 1 )
-int
-main ()
-{
-return 0;
- ;
- return 0;
-}
_ACEOF
- flag_ok=no
- #$CXX -Wno-sign-compare conftest.cpp >&5 2>/dev/null && flag_ok=yes
- stat_string=`$CXX -Wno-sign-compare conftest.cpp 2>&1 1>&5` ; test -z "$stat_string" && flag_ok=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
-$as_echo "$flag_ok" >&6; }
- if test x$flag_ok = xyes; then
- true
- PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-sign-compare"
- else
- true
-
- 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
-
+ az_python_output=`$PYTHON conftest.py`
+ az_python_cc=$?
+ rm conftest.py
+ if test -f "conftest.pyc"
+ then
+ rm conftest.pyc
+ fi
+ fi
+ if test $az_python_cc -eq 0
+ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else as_fn_error $? "too old" "$LINENO" 5
-## Optional ROOT analysis framework
-#AC_ARG_ENABLE([ROOT], [AC_HELP_STRING(--enable-root, [build with ROOT output [default=yes]])], [], [enable_root=yes])
-#if test "x$enable_root" != "xno"; then
-# AC_SEARCH_ROOT([with_root=yes
-# AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"
-# AC_TEST_ROOT], [AC_MSG_WARN([ROOT functionalities not available])])
-# AM_CONDITIONAL(WITH_ROOT, [test x$with_root == xyes])
-#fi
+ fi
+ fi
-## Boost C++ utility library
+ PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info[:2]));"`
-echo "$as_me: this is boost.m4 serial 17" >&5
-boost_save_IFS=$IFS
-boost_version_req=1.47.0
-IFS=.
-set x $boost_version_req 0 0 0
-IFS=$boost_save_IFS
-shift
-boost_version_req=`expr "$1" '*' 100000 + "$2" '*' 100 + "$3"`
-boost_version_req_string=$1.$2.$3
+ YODA_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
-# Check whether --with-boost was given.
-if test "${with_boost+set}" = set; then :
- withval=$with_boost;
-fi
-# If BOOST_ROOT is set and the user has not provided a value to
-# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
-if test x"$BOOST_ROOT" != x; then
- if test x"$with_boost" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&5
-$as_echo "$as_me: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&6;}
- with_boost=$BOOST_ROOT
+ ## Test for Python header
+ if test -x "$PYTHON"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5
+$as_echo_n "checking for Python include path... " >&6; }
+ python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_incpath" >&5
+$as_echo "$python_incpath" >&6; }
+ python_header="$python_incpath/Python.h"
+ if test -z "$python_incpath"; then
+ as_fn_error $? "Can't build Python extension since include directory cannot be determined from distutils" "$LINENO" 5
+ enable_pyext=no
+ elif test ! -e "$python_header"; then
+ as_fn_error $? "Can't build Python extension since header file $python_header cannot be found" "$LINENO" 5
+ enable_pyext=no
+ fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&5
-$as_echo "$as_me: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&6;}
+ as_fn_error $? "Can't build Python extension since python can't be found" "$LINENO" 5
+ enable_pyext=no
fi
fi
-DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"
-boost_save_CPPFLAGS=$CPPFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req_string" >&5
-$as_echo_n "checking for Boost headers version >= $boost_version_req_string... " >&6; }
-if ${boost_cv_inc_path+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- boost_cv_inc_path=no
-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
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <boost/version.hpp>
-#if !defined BOOST_VERSION
-# error BOOST_VERSION is not defined
-#elif BOOST_VERSION < $boost_version_req
-# error Boost headers version < $boost_version_req
-#endif
-int
-main ()
-{
+## Cython checks
+# TODO: "Tarball users" should ideally not need to have Cython installed
+if test x$enable_pyext == xyes; then
+
- ;
- return 0;
-}
-_ACEOF
- # If the user provided a value to --with-boost, use it and only it.
- case $with_boost in #(
- ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
- /usr/include C:/Boost/include;; #(
- *) set x "$with_boost/include" "$with_boost";;
- esac
- shift
- for boost_dir
- do
- # Without --layout=system, Boost (or at least some versions) installs
- # itself in <prefix>/include/boost-<version>. This inner loop helps to
- # find headers in such directories.
- #
- # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
- # order followed by ${boost_dir}. The final '.' is a sentinel for
- # searching $boost_dir" itself. Entries are whitespace separated.
- #
- # I didn't indent this loop on purpose (to avoid over-indented code)
- boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
- && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
- && echo .`
- for boost_inc in $boost_layout_system_search_list
- do
- if test x"$boost_inc" != x.; then
- boost_inc="$boost_dir/$boost_inc"
- else
- boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
- fi
- if test x"$boost_inc" != x; then
- # We are going to check whether the version of Boost installed
- # in $boost_inc is usable by running a compilation that
- # #includes it. But if we pass a -I/some/path in which Boost
- # is not installed, the compiler will just skip this -I and
- # use other locations (either from CPPFLAGS, or from its list
- # of system include directories). As a result we would use
- # header installed on the machine instead of the /some/path
- # specified by the user. So in that precise case (trying
- # $boost_inc), make sure the version.hpp exists.
- #
- # Use test -e as there can be symlinks.
- test -e "$boost_inc/boost/version.hpp" || continue
- CPPFLAGS="$CPPFLAGS -I$boost_inc"
- fi
- if ac_fn_cxx_try_compile "$LINENO"; then :
- boost_cv_inc_path=yes
-else
- boost_cv_version=no
-fi
-rm -f core conftest.err conftest.$ac_objext
- if test x"$boost_cv_inc_path" = xyes; then
- if test x"$boost_inc" != x; then
- boost_cv_inc_path=$boost_inc
- fi
- break 2
- fi
- done
- done
-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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_inc_path" >&5
-$as_echo "$boost_cv_inc_path" >&6; }
- case $boost_cv_inc_path in #(
- no)
- boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
- as_fn_error $? "$boost_errmsg" "$LINENO" 5
- ;;#(
- yes)
- BOOST_CPPFLAGS=
- ;;#(
- *)
- BOOST_CPPFLAGS="-I$boost_cv_inc_path"
- ;;
- esac
- if test x"$boost_cv_inc_path" != xno; then
-$as_echo "#define HAVE_BOOST 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost's header version" >&5
-$as_echo_n "checking for Boost's header version... " >&6; }
-if ${boost_cv_lib_version+:} false; then :
+ # Find any Python interpreter.
+ if test -z "$PYTHON"; then
+ for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
+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 ${ac_cv_path_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <boost/version.hpp>
-boost-lib-version = BOOST_LIB_VERSION
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- tr -d '\r' |
- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
- boost_cv_lib_version=`cat conftest.i`
-fi
-rm -rf conftest*
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PYTHON="$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
+ ;;
+esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
-$as_echo "$boost_cv_lib_version" >&6; }
- # e.g. "134" for 1_34_1 or "135" for 1_35
- boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
- case $boost_major_version in #(
- '' | *[!0-9]*)
- as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5
- ;;
- esac
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-CPPFLAGS=$boost_save_CPPFLAGS
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/foreach.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/foreach.hpp" >&6;}
-else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/foreach.hpp" "ac_cv_header_boost_foreach_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_foreach_hpp" = xyes; then :
-$as_echo "#define HAVE_BOOST_FOREACH_HPP 1" >>confdefs.h
+ test -n "$PYTHON" && break
+done
+test -n "$PYTHON" || PYTHON=":"
-else
- as_fn_error $? "cannot find boost/foreach.hpp" "$LINENO" 5
-fi
+ fi
+ am_display_PYTHON=python
-CPPFLAGS=$boost_save_CPPFLAGS
-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
-fi
+ if test "$PYTHON" = :; then
+ as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+ else
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/scoped_ptr.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/scoped_ptr.hpp" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if ${am_cv_python_version+:} false; then :
+ $as_echo_n "(cached) " >&6
else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/scoped_ptr.hpp" "ac_cv_header_boost_scoped_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_scoped_ptr_hpp" = xyes; then :
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+ PYTHON_VERSION=$am_cv_python_version
-$as_echo "#define HAVE_BOOST_SCOPED_PTR_HPP 1" >>confdefs.h
-else
- as_fn_error $? "cannot find boost/scoped_ptr.hpp" "$LINENO" 5
-fi
+ PYTHON_PREFIX='${prefix}'
-CPPFLAGS=$boost_save_CPPFLAGS
-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
-fi
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/shared_ptr.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/shared_ptr.hpp" >&6;}
-else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes; then :
-$as_echo "#define HAVE_BOOST_SHARED_PTR_HPP 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if ${am_cv_python_platform+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- as_fn_error $? "cannot find boost/shared_ptr.hpp" "$LINENO" 5
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+ PYTHON_PLATFORM=$am_cv_python_platform
-CPPFLAGS=$boost_save_CPPFLAGS
-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
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if ${am_cv_python_pythondir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+ pythondir=$am_cv_python_pythondir
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/lexical_cast.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/lexical_cast.hpp" >&6;}
-else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/lexical_cast.hpp" "ac_cv_header_boost_lexical_cast_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_lexical_cast_hpp" = xyes; then :
+ pkgpythondir=\${pythondir}/$PACKAGE
-$as_echo "#define HAVE_BOOST_LEXICAL_CAST_HPP 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if ${am_cv_python_pyexecdir+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- as_fn_error $? "cannot find boost/lexical_cast.hpp" "$LINENO" 5
+ if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+ pyexecdir=$am_cv_python_pyexecdir
-CPPFLAGS=$boost_save_CPPFLAGS
-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
-fi
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/assign.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/assign.hpp" >&6;}
-else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/assign.hpp" "ac_cv_header_boost_assign_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_assign_hpp" = xyes; then :
+ pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
+
+ fi
+
-$as_echo "#define HAVE_BOOST_ASSIGN_HPP 1" >>confdefs.h
+
+_msg=" >= 0.18"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cython$_msg" >&5
+$as_echo_n "checking for Cython$_msg... " >&6; }
+if ${py_cv_cython+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- as_fn_error $? "cannot find boost/assign.hpp" "$LINENO" 5
+
+
+prog="import Cython.Compiler.Version; print Cython.Compiler.Version.version"
+CYTHON_VERSION=`$PYTHON -c "$prog" 2>&5`
+
+py_cv_cython=no
+if test "x$CYTHON_VERSION" != "x"; then
+ py_cv_cython=yes
fi
+if test "x$py_cv_cython" = "xyes"; then
+ as_arg_v1=$CYTHON_VERSION
+as_arg_v2=0.18
+awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+case $? in #(
+ 1) :
+ py_cv_cython=no ;; #(
+ 0) :
+ ;; #(
+ 2) :
+ ;; #(
+ *) :
+ ;;
+esac
+fi
-CPPFLAGS=$boost_save_CPPFLAGS
-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
fi
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/spirit/include/qi.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/spirit/include/qi.hpp" >&6;}
-else
-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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/qi.hpp" "ac_cv_header_boost_spirit_include_qi_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_spirit_include_qi_hpp" = xyes; then :
-$as_echo "#define HAVE_BOOST_SPIRIT_INCLUDE_QI_HPP 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_cython" >&5
+$as_echo "$py_cv_cython" >&6; }
+if test "x$py_cv_cython" = "xyes"; then
+ CYTHON_FOUND=yes
+ :
else
- as_fn_error $? "cannot find boost/spirit/include/qi.hpp" "$LINENO" 5
+ CYTHON_FOUND=no
+ :
fi
+ PYEXT_CXXFLAGS=
+ if test x$CYTHON_FOUND != xyes; then
+ as_fn_error $? "Can't build Python extension since Cython >= 0.18 could not be found" "$LINENO" 5
+ enable_pyext=no
+ else
+ cython_compiler=$CXX
+ ## Set extra Python extension build flags (to cope with Cython output code oddities)
-CPPFLAGS=$boost_save_CPPFLAGS
-ac_ext=cpp
+ 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
-fi
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/spirit/include/phoenix_operator.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/spirit/include/phoenix_operator.hpp" >&6;}
-else
-ac_ext=cpp
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the $CXX compiler accepts the -Wno-unused-but-set-variable flag" >&5
+$as_echo_n "checking if the $CXX compiler accepts the -Wno-unused-but-set-variable flag... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+ flag_ok=no
+ #$CXX -Wno-unused-but-set-variable conftest.cpp >&5 2>/dev/null && flag_ok=yes
+ stat_string=`$CXX -Wno-unused-but-set-variable conftest.cpp 2>&1 1>&5` ; test -z "$stat_string" && flag_ok=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
+$as_echo "$flag_ok" >&6; }
+ if test x$flag_ok = xyes; then
+ true
+ PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-unused-but-set-variable"
+ else
+ true
+
+ 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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/phoenix_operator.hpp" "ac_cv_header_boost_spirit_include_phoenix_operator_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_spirit_include_phoenix_operator_hpp" = xyes; then :
-$as_echo "#define HAVE_BOOST_SPIRIT_INCLUDE_PHOENIX_OPERATOR_HPP 1" >>confdefs.h
-
-else
- as_fn_error $? "cannot find boost/spirit/include/phoenix_operator.hpp" "$LINENO" 5
-fi
-CPPFLAGS=$boost_save_CPPFLAGS
-ac_ext=cpp
+ 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
-fi
-if test x"$boost_cv_inc_path" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/fusion/include/adapt_struct.hpp" >&5
-$as_echo "$as_me: Boost not available, not searching for boost/fusion/include/adapt_struct.hpp" >&6;}
-else
-ac_ext=cpp
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the $CXX compiler accepts the -Wno-sign-compare flag" >&5
+$as_echo_n "checking if the $CXX compiler accepts the -Wno-sign-compare flag... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+ flag_ok=no
+ #$CXX -Wno-sign-compare conftest.cpp >&5 2>/dev/null && flag_ok=yes
+ stat_string=`$CXX -Wno-sign-compare conftest.cpp 2>&1 1>&5` ; test -z "$stat_string" && flag_ok=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
+$as_echo "$flag_ok" >&6; }
+ if test x$flag_ok = xyes; then
+ true
+ PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-sign-compare"
+ else
+ true
+
+ 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
-boost_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/fusion/include/adapt_struct.hpp" "ac_cv_header_boost_fusion_include_adapt_struct_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_fusion_include_adapt_struct_hpp" = xyes; then :
-$as_echo "#define HAVE_BOOST_FUSION_INCLUDE_ADAPT_STRUCT_HPP 1" >>confdefs.h
-else
- as_fn_error $? "cannot find boost/fusion/include/adapt_struct.hpp" "$LINENO" 5
+ fi
fi
+## Finish Python extension testing
+if test x$enable_pyext == xyes; then
-CPPFLAGS=$boost_save_CPPFLAGS
-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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: All Python build checks successful: 'yoda' Python extension will be built" >&5
+$as_echo "$as_me: All Python build checks successful: 'yoda' Python extension will be built" >&6;}
+fi
+ if test x$enable_pyext == xyes; then
+ ENABLE_PYEXT_TRUE=
+ ENABLE_PYEXT_FALSE='#'
+else
+ ENABLE_PYEXT_TRUE='#'
+ ENABLE_PYEXT_FALSE=
fi
@@ -16392,6 +16573,57 @@ AM_CPPFLAGS="$AM_CPPFLAGS $BOOST_CPPFLAGS"
+## Build Doxygen if possible
+# Extract the first word of "doxygen", so it can be a program name with args.
+set dummy doxygen; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DOXYGEN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $DOXYGEN in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+ ;;
+ *)
+ 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DOXYGEN="$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
+
+ ;;
+esac
+fi
+DOXYGEN=$ac_cv_path_DOXYGEN
+if test -n "$DOXYGEN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "$DOXYGEN"; then
+ WITH_DOXYGEN_TRUE=
+ WITH_DOXYGEN_FALSE='#'
+else
+ WITH_DOXYGEN_TRUE='#'
+ WITH_DOXYGEN_FALSE=
+fi
+
+
+
## Build file output
EMPTY=""
@@ -16526,24 +16758,24 @@ else
am__EXEEXT_FALSE=
fi
-if test -z "${WITH_OSX_TRUE}" && test -z "${WITH_OSX_FALSE}"; then
- as_fn_error $? "conditional \"WITH_OSX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${WITH_DOXYGEN_TRUE}" && test -z "${WITH_DOXYGEN_FALSE}"; then
- as_fn_error $? "conditional \"WITH_DOXYGEN\" was never defined.
+if test -z "${WITH_OSX_TRUE}" && test -z "${WITH_OSX_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_OSX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_ROOT_TRUE}" && test -z "${ENABLE_ROOT_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_ROOT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${PYTHON_USE_TRUE}" && test -z "${PYTHON_USE_FALSE}"; then
@@ -16558,6 +16790,10 @@ if test -z "${ENABLE_PYEXT_TRUE}" && test -z "${ENABLE_PYEXT_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_PYEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WITH_DOXYGEN_TRUE}" && test -z "${WITH_DOXYGEN_FALSE}"; then
+ as_fn_error $? "conditional \"WITH_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -16955,7 +17191,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by YODA $as_me 1.0.1, which was
+This file was extended by YODA $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17021,7 +17257,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-YODA config.status 1.0.1
+YODA config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -17525,10 +17761,10 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"include/YODA/Config/DummyConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/YODA/Config/DummyConfig.h" ;;
"include/YODA/Config/YodaConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/YODA/Config/YodaConfig.h" ;;
"include/YODA/Config/BuildConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/YODA/Config/BuildConfig.h" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
diff --git a/configure.ac b/configure.ac
index c7cd217..84db1d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
## Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([YODA],[1.0.1],[yoda at projects.hepforge.org],[YODA])
-AM_INIT_AUTOMAKE
+AC_INIT([YODA],[1.0.2],[yoda at projects.hepforge.org],[YODA])
+AM_INIT_AUTOMAKE([subdir-objects -Wall dist-bzip2])
#AC_CONFIG_SRCDIR([src/Bin1D.cc])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([include/YODA/Config/DummyConfig.h include/YODA/Config/YodaConfig.h include/YODA/Config/BuildConfig.h])
@@ -18,7 +19,7 @@ AC_DEFINE_UNQUOTED(YODA_BUGREPORT, "$PACKAGE_BUGREPORT", "YODA contact email add
AC_CEDAR_OSX
## Set default compiler flags
-if test "x$CXXFLAGS" == "x"; then CXXFLAGS="-O3"; fi
+if test "x$CXXFLAGS" = "x"; then CXXFLAGS="-O3"; fi
## Make compiler error messages more readable if gfilt is installed.
#AC_CEDAR_CXXFILTER
@@ -44,14 +45,41 @@ AC_CEDAR_CHECKCXXFLAG([-std=c++98], [AM_CXXFLAGS="$AM_CXXFLAGS -std=c++98"])
## Debug flag (default=none)
AC_ARG_ENABLE([debug], [AC_HELP_STRING(--enable-debug, [build with debugging symbols @<:@default=no@:>@])], [], [enable_debug=no])
-if test x$enable_debug == xyes; then
+if test x$enable_debug = xyes; then
[AM_CXXFLAGS="$AM_CXXFLAGS -g"]
fi
-## Build Doxygen if possible
-AC_PATH_PROG(DOXYGEN, doxygen)
-AM_CONDITIONAL(WITH_DOXYGEN, test "$DOXYGEN")
+## Required Boost C++ utility library
+BOOST_REQUIRE([1.47.0])
+BOOST_FOREACH
+BOOST_SMART_PTR
+BOOST_FIND_HEADER([boost/lexical_cast.hpp])
+BOOST_FIND_HEADER([boost/assign.hpp])
+BOOST_FIND_HEADER([boost/spirit/include/qi.hpp])
+BOOST_FIND_HEADER([boost/spirit/include/phoenix_operator.hpp])
+BOOST_FIND_HEADER([boost/fusion/include/adapt_struct.hpp])
+
+
+## Optional ROOT compatibility
+AC_ARG_ENABLE([root], [AC_HELP_STRING(--enable-root, [build Python extension with ROOT interfacing @<:@default=yes@:>@])], [enable_root=yes], [])
+if test "x$enable_root" = "xyes"; then
+ AC_PATH_PROG(ROOTCONFIG, [root-config])
+ if test "x$ROOTCONFIG" = "x"; then
+ AC_MSG_WARN([root-config not found -- not building extra ROOT compatibility tools])
+ enable_root=no;
+ else
+ # TODO: Test for existence of TPython, instance_from_void API, etc.
+ #AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"
+ ROOT_CXXFLAGS=`$ROOTCONFIG --cflags`
+ ROOT_LDFLAGS=`$ROOTCONFIG --ldflags`
+ ROOT_LIBS=`$ROOTCONFIG --libs`
+ AC_SUBST(ROOT_CXXFLAGS)
+ AC_SUBST(ROOT_LDFLAGS)
+ AC_SUBST(ROOT_LIBS)
+ fi
+fi
+AM_CONDITIONAL(ENABLE_ROOT, [test x$enable_root = xyes])
## Python extension
@@ -60,7 +88,7 @@ AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext,
[], [enable_pyext=yes])
AZ_PYTHON_DEFAULT
## Basic Python checks
-if test x$enable_pyext == xyes; then
+if test x$enable_pyext = xyes; then
AZ_PYTHON_PATH
AZ_PYTHON_VERSION_ENSURE([2.4])
PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info@<:@:2@:>@));"`
@@ -85,50 +113,30 @@ if test x$enable_pyext == xyes; then
enable_pyext=no
fi
fi
-## Cython checks (Probably need some help...)
+
+## Cython checks
# TODO: "Tarball users" should ideally not need to have Cython installed
if test x$enable_pyext == xyes; then
AM_CHECK_CYTHON([0.18], [:], [:])
+ PYEXT_CXXFLAGS=
if test x$CYTHON_FOUND != xyes; then
AC_MSG_ERROR([Can't build Python extension since Cython >= 0.18 could not be found])
enable_pyext=no
else
cython_compiler=$CXX
+ ## Set extra Python extension build flags (to cope with Cython output code oddities)
+ AC_CEDAR_CHECKCXXFLAG([-Wno-unused-but-set-variable], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-unused-but-set-variable"])
+ AC_CEDAR_CHECKCXXFLAG([-Wno-sign-compare], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-sign-compare"])
fi
fi
+
## Finish Python extension testing
if test x$enable_pyext == xyes; then
+ AC_SUBST(PYEXT_CXXFLAGS)
AC_MSG_NOTICE([All Python build checks successful: 'yoda' Python extension will be built])
fi
AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes])
-## Set extra Python extension build flags (to cope with Cython output code oddities)
-PYEXT_CXXFLAGS=
-AC_CEDAR_CHECKCXXFLAG([-Wno-unused-but-set-variable], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-unused-but-set-variable"])
-AC_CEDAR_CHECKCXXFLAG([-Wno-sign-compare], [PYEXT_CXXFLAGS="$PYEXT_CXXFLAGS -Wno-sign-compare"])
-AC_SUBST(PYEXT_CXXFLAGS)
-
-
-## Optional ROOT analysis framework
-#AC_ARG_ENABLE([ROOT], [AC_HELP_STRING(--enable-root, [build with ROOT output @<:@default=yes@:>@])], [], [enable_root=yes])
-#if test "x$enable_root" != "xno"; then
-# AC_SEARCH_ROOT([with_root=yes
-# AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"
-# AC_TEST_ROOT], [AC_MSG_WARN([ROOT functionalities not available])])
-# AM_CONDITIONAL(WITH_ROOT, [test x$with_root == xyes])
-#fi
-
-
-## Boost C++ utility library
-BOOST_REQUIRE([1.47.0])
-BOOST_FOREACH
-BOOST_SMART_PTR
-BOOST_FIND_HEADER([boost/lexical_cast.hpp])
-BOOST_FIND_HEADER([boost/assign.hpp])
-BOOST_FIND_HEADER([boost/spirit/include/qi.hpp])
-BOOST_FIND_HEADER([boost/spirit/include/phoenix_operator.hpp])
-BOOST_FIND_HEADER([boost/fusion/include/adapt_struct.hpp])
-
## Extend and substitute the default build flags after lib testing
AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
@@ -137,6 +145,11 @@ AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS)
+## Build Doxygen if possible
+AC_PATH_PROG(DOXYGEN, doxygen)
+AM_CONDITIONAL(WITH_DOXYGEN, test "$DOXYGEN")
+
+
## Build file output
AC_EMPTY_SUBST
AC_CONFIG_FILES([Makefile Doxyfile])
diff --git a/include/Makefile.in b/include/Makefile.in
index d475822..effe3f3 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -198,6 +198,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/include/YODA/Axis1D.h b/include/YODA/Axis1D.h
index 6216632..33f7522 100644
--- a/include/YODA/Axis1D.h
+++ b/include/YODA/Axis1D.h
@@ -341,9 +341,11 @@ namespace YODA {
/// Check if two of the Axis have the same binning
bool operator == (const Axis1D& other) const {
- for(size_t i=0; i < numBins(); i++)
- if (bin(i).lowEdge() != other.bin(i).lowEdge() ||
- bin(i).highEdge() != other.bin(i).highEdge())
+ if (numBins() != other.numBins())
+ return false;
+ for (size_t i=0; i < numBins(); i++)
+ if (!(fuzzyEquals(bin(i).lowEdge(), other.bin(i).lowEdge()) &&
+ fuzzyEquals(bin(i).highEdge(), other.bin(i).highEdge())))
return false;
return true;
@@ -415,7 +417,7 @@ namespace YODA {
double new_low = currentBin.lowEdge();
double reldiff = (new_low - last_high) / currentBin.width();
double eps = 1.0e-10;
- if( reldiff < -eps ) {
+ if ( reldiff < -eps ) {
throw RangeError("Bin edges overlap");
} else if ( reldiff > eps ) {
indexes.push_back(-1);
diff --git a/include/YODA/Axis2D.h b/include/YODA/Axis2D.h
index 013a256..8ecf53c 100644
--- a/include/YODA/Axis2D.h
+++ b/include/YODA/Axis2D.h
@@ -431,7 +431,9 @@ namespace YODA {
// similar method?)
bool operator == (const Axis2D& other) const {
- for(size_t i=0; i < numBins(); i++)
+ if (numBins() != other.numBins())
+ return false;
+ for (size_t i=0; i < numBins(); i++)
if (!(fuzzyEquals(bin(i).lowEdgeX(), other.bin(i).lowEdgeX()) &&
fuzzyEquals(bin(i).highEdgeX(), other.bin(i).highEdgeX()) &&
fuzzyEquals(bin(i).lowEdgeY(), other.bin(i).lowEdgeY()) &&
@@ -523,7 +525,7 @@ namespace YODA {
Utils::BinSearcher ySearcher(ycuts);
// Iterate through bins and find out which
- for(size_t i=0; i < bins.size(); i++) {
+ for (size_t i=0; i < bins.size(); i++) {
Bin &bin = bins[i];
size_t xiMin= xSearcher.index(bin.xMin()) - 1;
size_t xiMax= xSearcher.index(bin.xMax()) - 1;
diff --git a/include/YODA/Config/YodaConfig.h b/include/YODA/Config/YodaConfig.h
index dfcd5ac..9276688 100644
--- a/include/YODA/Config/YodaConfig.h
+++ b/include/YODA/Config/YodaConfig.h
@@ -10,13 +10,13 @@
#define YODA_NAME "YODA"
/* Define to the full name and version of this package. */
-#define YODA_STRING "YODA 1.0.1"
+#define YODA_STRING "YODA 1.0.2"
/* Define to the one symbol short name of this package. */
#define YODA_TARNAME "YODA"
/* Define to the version of this package. */
-#define YODA_VERSION "1.0.1"
+#define YODA_VERSION "1.0.2"
#endif
diff --git a/include/YODA/Histo1D.h b/include/YODA/Histo1D.h
index 29b1db6..d6bd129 100644
--- a/include/YODA/Histo1D.h
+++ b/include/YODA/Histo1D.h
@@ -118,6 +118,8 @@ namespace YODA {
/// Fill histo by value and weight
void fill(double x, double weight=1.0);
+ /// Fill histo bin i with the given weight
+ void fillBin(size_t i, double weight=1.0);
/// @brief Reset the histogram.
///
diff --git a/include/YODA/Histo2D.h b/include/YODA/Histo2D.h
index 0e4a4e4..faebc05 100644
--- a/include/YODA/Histo2D.h
+++ b/include/YODA/Histo2D.h
@@ -106,6 +106,10 @@ namespace YODA {
/// Fill histo with weight at (x,y)
void fill(double x, double y, double weight=1.0);
+ /// Fill histo x-y bin i with the given weight
+ void fillBin(size_t i, double weight=1.0);
+
+
/// @brief Reset the histogram.
///
/// Keep the binning but set all bin contents and related quantities to zero
diff --git a/include/YODA/HistoBin1D.h b/include/YODA/HistoBin1D.h
index 6d984c5..052711c 100644
--- a/include/YODA/HistoBin1D.h
+++ b/include/YODA/HistoBin1D.h
@@ -67,6 +67,7 @@ namespace YODA {
//@{
/// Fill this bin with weight @a weight at position @a x.
+ /// @todo Need to also fill the totalDbn...
void fill(double x, double weight=1.0) {
assert( _edges.first < _edges.second );
assert( x >= _edges.first && x < _edges.second );
@@ -74,6 +75,7 @@ namespace YODA {
}
/// Fill this bin with weight @a weight.
+ /// @todo Need to also fill the totalDbn...
void fillBin(double weight=1.0) {
fill(midpoint(), weight);
}
diff --git a/include/YODA/HistoBin2D.h b/include/YODA/HistoBin2D.h
index 1609e83..9e65357 100644
--- a/include/YODA/HistoBin2D.h
+++ b/include/YODA/HistoBin2D.h
@@ -60,16 +60,19 @@ namespace YODA {
//@{
/// A fill() function accepting coordinates as spearate numbers
+ /// @todo Need to also fill the totalDbn...
void fill(double x, double y, double weight=1.0) {
- _dbn.fill(x, y, weight);
+ _dbn.fill(x, y, weight);
}
/// A fill() function accepting the coordinates as std::pair
+ /// @todo Need to also fill the totalDbn...
void fill(std::pair<double,double> coords, double weight=1.0) {
_dbn.fill(coords.first, coords.second, weight);
}
/// A function that fills this particular bin.
+ /// @todo Need to also fill the totalDbn...
void fillBin(double weight=1.0) {
_dbn.fill(midpoint(), weight);
}
diff --git a/include/YODA/Makefile.in b/include/YODA/Makefile.in
index 9c511c3..b9bde44 100644
--- a/include/YODA/Makefile.in
+++ b/include/YODA/Makefile.in
@@ -192,6 +192,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/include/YODA/Profile1D.h b/include/YODA/Profile1D.h
index ddae4b8..5a1aa45 100644
--- a/include/YODA/Profile1D.h
+++ b/include/YODA/Profile1D.h
@@ -123,6 +123,9 @@ namespace YODA {
/// Fill histo by value and weight
void fill(double x, double y, double weight=1.0);
+ /// Fill histo x bin i with the given y value and weight
+ void fillBin(size_t i, double y, double weight=1.0);
+
/// @brief Reset the histogram
///
diff --git a/include/YODA/Profile2D.h b/include/YODA/Profile2D.h
index 0dbbb83..2e644a5 100644
--- a/include/YODA/Profile2D.h
+++ b/include/YODA/Profile2D.h
@@ -117,6 +117,10 @@ namespace YODA {
/// Fill histo by value and weight
void fill(double x, double y, double z, double weight=1.0);
+ /// Fill histo x-y bin i with the given z value and weight
+ void fillBin(size_t i, double z, double weight=1.0);
+
+
/// @brief Reset the histogram
///
/// Keep the binning but reset the statistics
diff --git a/include/YODA/ProfileBin1D.h b/include/YODA/ProfileBin1D.h
index dc9789a..c6f6ad6 100644
--- a/include/YODA/ProfileBin1D.h
+++ b/include/YODA/ProfileBin1D.h
@@ -65,6 +65,7 @@ namespace YODA {
//@{
/// Fill histo by x and y values and weight.
+ /// @todo Need to also fill the totalDbn...
void fill(double x, double y, double weight=1.0) {
assert( _edges.first < _edges.second );
assert( x >= _edges.first && x < _edges.second );
@@ -72,6 +73,7 @@ namespace YODA {
}
/// Fill histo with @a weight and y-value @c y at x = bin midpoint.
+ /// @todo Need to also fill the totalDbn...
void fillBin(double y, double weight=1.0) {
fill(midpoint(), y, weight);
}
diff --git a/include/YODA/ProfileBin2D.h b/include/YODA/ProfileBin2D.h
index 97f6ef7..fbfeee0 100644
--- a/include/YODA/ProfileBin2D.h
+++ b/include/YODA/ProfileBin2D.h
@@ -63,17 +63,20 @@ namespace YODA {
//@{
/// Fill by x, y, z values and weight
+ /// @todo Need to also fill the totalDbn...
void fill(double x, double y, double z, double weight=1.0) {
assert(x >= xMin() && x <= xMax() && y >= yMin() && y <= yMax());
_dbn.fill(x, y, z, weight);
}
/// A fill() function accepting the x,y coordinates as std::pair
+ /// @todo Need to also fill the totalDbn...
void fill(std::pair<double,double> coords, double z, double weight=1.0) {
_dbn.fill(coords.first, coords.second, z, weight);
}
/// Fill the bin at the midpoint with a given z value
+ /// @todo Need to also fill the totalDbn...
void fillBin(double z, double weight=1.0){
fill(midpoint(), z, weight);
}
diff --git a/include/YODA/Utils/BinSearcher.h b/include/YODA/Utils/BinSearcher.h
index 1a7756a..71a68e8 100644
--- a/include/YODA/Utils/BinSearcher.h
+++ b/include/YODA/Utils/BinSearcher.h
@@ -12,6 +12,7 @@
namespace YODA {
namespace Utils {
+
const size_t SEARCH_SIZE = 16;
const size_t BISECT_LINEAR_THRESHOLD = 32;
@@ -39,7 +40,7 @@ namespace YODA {
}
size_t operator() (double x) const {
- return (size_t) _m * (x - _c);
+ return (size_t)(int) floor(_m * (x - _c));
}
protected:
@@ -178,7 +179,7 @@ namespace YODA {
size_t estimate(const double x) const {
double y = (*_est)(x);
- size_t yi = (y < 0) ? 0 : y;
+ size_t yi = (size_t)(int) floor((y < 0) ? 0 : y);
return (yi > _max) ? _max : yi;
}
@@ -210,7 +211,7 @@ namespace YODA {
// Linear search in the forward direction
size_t _linsearch_forward(double *arr, double key, size_t n) const {
- for (size_t i=0; i<n; i++)
+ for (size_t i = 0; i < n; i++)
if (arr[i] > key) return i;
return n;
}
@@ -218,16 +219,14 @@ namespace YODA {
// Linear search in the backward direction
size_t _linsearch_backward(double *arr, double key, size_t n) const {
arr -= n;
- for (size_t i=0; i < n; i++)
+ for (size_t i = 0; i < n; i++)
if (arr[n - 1 - i] <= key) return i;
return n;
}
// Bisection search, adapted from C++ std lib implementation
- size_t _bisect(double *arr,
- const double key, size_t min, size_t max) const {
+ size_t _bisect(double *arr, const double key, size_t min, size_t max) const {
size_t len = max - min;
-
size_t middle;
while (len > BISECT_LINEAR_THRESHOLD) {
size_t half = len >> 1;
@@ -246,6 +245,8 @@ namespace YODA {
boost::shared_array<double> _lows;
size_t _max;
};
+
+
}
}
diff --git a/m4/boost.m4 b/m4/boost.m4
index 476948d..c8eb65a 100644
--- a/m4/boost.m4
+++ b/m4/boost.m4
@@ -22,7 +22,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_define([_BOOST_SERIAL], [m4_translit([
-# serial 17
+# serial 18
], [#
], [])])
@@ -410,7 +410,7 @@ dnl generated only once above (before we start the for loops).
AC_CACHE_VAL([boost_cv_rpath_link_ldflag],
[for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
- LIBS="$Boost_lib_LIBS $boost_save_LIBS"
+ LIBS="$boost_save_LIBS $Boost_lib_LIBS"
_BOOST_AC_LINK_IFELSE([],
[boost_rpath_link_ldflag_found=yes
break],
diff --git a/pyext/Makefile.am b/pyext/Makefile.am
index a20e1cb..f847a81 100644
--- a/pyext/Makefile.am
+++ b/pyext/Makefile.am
@@ -3,6 +3,9 @@ EXTRA_DIST = template.py
if ENABLE_PYEXT
PYEXT_ENV = CC="$(CC)" CXX="$(CXX)" ARCHFLAGS=""
+if ENABLE_ROOT
+ PYEXT_ENV += BUILD_ROOTCOMPAT="yes"
+endif
## always force setup.py, it's not good at guessing what needs to rebuild
all-local:
diff --git a/pyext/Makefile.in b/pyext/Makefile.in
index 047f0c2..24b0607 100644
--- a/pyext/Makefile.in
+++ b/pyext/Makefile.in
@@ -50,6 +50,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+ at ENABLE_PYEXT_TRUE@@ENABLE_ROOT_TRUE at am__append_1 = BUILD_ROOTCOMPAT="yes"
subdir = pyext
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/setup.py.in
@@ -199,6 +200,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -265,7 +270,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = yoda
EXTRA_DIST = template.py
- at ENABLE_PYEXT_TRUE@PYEXT_ENV = CC="$(CC)" CXX="$(CXX)" ARCHFLAGS=""
+ at ENABLE_PYEXT_TRUE@PYEXT_ENV = CC="$(CC)" CXX="$(CXX)" ARCHFLAGS="" \
+ at ENABLE_PYEXT_TRUE@ $(am__append_1)
all: all-recursive
.SUFFIXES:
diff --git a/pyext/setup.py.in b/pyext/setup.py.in
index 157df17..b971e43 100644
--- a/pyext/setup.py.in
+++ b/pyext/setup.py.in
@@ -12,7 +12,7 @@ import os.path
incdir = os.path.abspath('@top_srcdir@/include')
srcdir = os.path.abspath('@top_srcdir@/src')
libdir = os.path.abspath("@top_builddir@/src/.libs")
-statics = os.path.join('yoda', 'errors.cpp')
+static_files = ['yoda/errors.cpp'] #, 'yoda/script_helpers.py']
BASE_COMPILE_ARGS = \
"-I at prefix@/include @BOOST_CPPFLAGS@ @PYEXT_CXXFLAGS@".split()
@@ -20,7 +20,7 @@ BASE_LINK_ARGS = ["-L at prefix@/lib"]
# Dependencies used to trigger rebuild
header_files = glob('../include/YODA/*.h') + glob('../include/YODA/Utils/*.h')
-core_depends = glob('yoda/include/*.pyx') + header_files
+core_depends = glob('yoda/include/*.pyx') + glob('yoda/*.py') + header_files
## A helper function (since we have two modules now...)
def ext(name, depends=[], statics=[],
@@ -47,19 +47,23 @@ make_templates('Axis2D_BIN2D_DBN',
make_templates('Bin1D_DBN', DBN=('Dbn1D', 'Dbn2D'))
make_templates('Bin2D_DBN', DBN=('Dbn2D', 'Dbn3D'))
-root_ext = ext('rootcompat', depends=core_depends,
- extra_compile_args="-pthread -m64 -I/usr/include/root".split(),
- extra_link_args= """-L/usr/lib/root -lGui -lCore -lCint -lRIO
- -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript
- -lMatrix -lPhysics -lMathCore -lThread -pthread -lm -ldl
- -rdynamic -lPyROOT""".split())
-
extns = [
ext('util'),
- ext('core', statics=[statics], depends=core_depends),
- # root_ext, # Enable building of root extension
+ ext('core', statics=static_files, depends=core_depends),
]
+## Enable building of ROOT extension if ROOT is present
+if os.environ.has_key("BUILD_ROOTCOMPAT"):
+ try:
+ # import ROOT
+ # TODO: Need to test for and use root-config in configure
+ root_ext = ext('rootcompat', depends=core_depends,
+ extra_compile_args="@ROOT_CXXFLAGS@".split(),
+ extra_link_args= """@ROOT_LDFLAGS@ @ROOT_LIBS@ -lPyROOT""".split())
+ extns.append(root_ext)
+ except:
+ pass
+
setup(name = PKGNAME,
ext_modules = extns,
cmdclass = dict(build_ext=build_ext),
diff --git a/pyext/yoda/Makefile.am b/pyext/yoda/Makefile.am
index 0b059d2..6cb6728 100644
--- a/pyext/yoda/Makefile.am
+++ b/pyext/yoda/Makefile.am
@@ -5,7 +5,8 @@ EXTRA_DIST = \
util.pxd util.pyx \
errors.cpp errors.hh \
pyroot_helpers.hh merge.hh \
- rootcompat.pxd rootcompat.pyx
+ rootcompat.pxd rootcompat.pyx \
+ script_helpers.py
clean-local:
@rm -rf core.cpp core.h util.cpp
diff --git a/pyext/yoda/Makefile.in b/pyext/yoda/Makefile.in
index 3cb6b9b..5f880a6 100644
--- a/pyext/yoda/Makefile.in
+++ b/pyext/yoda/Makefile.in
@@ -198,6 +198,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -269,7 +273,8 @@ EXTRA_DIST = \
util.pxd util.pyx \
errors.cpp errors.hh \
pyroot_helpers.hh merge.hh \
- rootcompat.pxd rootcompat.pyx
+ rootcompat.pxd rootcompat.pyx \
+ script_helpers.py
all: all-recursive
diff --git a/pyext/yoda/__init__.py b/pyext/yoda/__init__.py
index 23e9999..ff4070d 100644
--- a/pyext/yoda/__init__.py
+++ b/pyext/yoda/__init__.py
@@ -1 +1,8 @@
+## Pull in core YODA C++/Python extension functionality
from yoda.core import *
+
+## Try to pull in optional ROOT compatibility
+try:
+ from yoda.rootcompat import *
+except:
+ pass
diff --git a/pyext/yoda/include/Makefile.in b/pyext/yoda/include/Makefile.in
index 3aa4194..7df16f4 100644
--- a/pyext/yoda/include/Makefile.in
+++ b/pyext/yoda/include/Makefile.in
@@ -158,6 +158,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/pyext/yoda/pyroot_helpers.hh b/pyext/yoda/pyroot_helpers.hh
index 66cc4e1..026d2f9 100644
--- a/pyext/yoda/pyroot_helpers.hh
+++ b/pyext/yoda/pyroot_helpers.hh
@@ -5,5 +5,7 @@
// One useful shim to help us
inline PyObject* root_to_py_owned(TObject* root_obj) {
- return TPython::ObjectProxy_FromVoidPtr(root_obj, root_obj->ClassName(), kFALSE);
+ return TPython::ObjectProxy_FromVoidPtr(root_obj, root_obj->ClassName());
+ /// @todo Different signatures in different ROOT versions?
+ //return TPython::ObjectProxy_FromVoidPtr(root_obj, root_obj->ClassName(), kFALSE);
}
diff --git a/pyext/yoda/script_helpers.py b/pyext/yoda/script_helpers.py
new file mode 100644
index 0000000..64eb731
--- /dev/null
+++ b/pyext/yoda/script_helpers.py
@@ -0,0 +1,20 @@
+import os
+
+def parse_x2y_args(args, xextn, yextn):
+ """Helper function for working out input and output filename for YODA
+ converter scripts, where the output name is optional: a default output name
+ will be constructed by replacing the input file extension (xextn) with the
+ output one (yextn). The x/yextn arguments should include the leading dot."""
+ infile = None
+ outfile = None
+ if len(args) == 1:
+ infile = args[0]
+ if infile.endswith(xextn):
+ outfile = infile.replace(xextn, yextn)
+ else:
+ outfile = infile + yextn
+ outfile = os.path.basename(outfile)
+ elif len(args) == 2:
+ infile = args[0]
+ outfile = args[1]
+ return infile, outfile
diff --git a/src/Histo1D.cc b/src/Histo1D.cc
index e74c8e1..460ae50 100644
--- a/src/Histo1D.cc
+++ b/src/Histo1D.cc
@@ -15,14 +15,13 @@ namespace YODA {
void Histo1D::fill(double x, double weight) {
- if ( isnan(x) ) throw RangeError("X is NaN");
- if ( isinf(x) ) throw RangeError("X is Inf");
+ if ( std::isnan(x) ) throw RangeError("X is NaN");
+ if ( std::isinf(x) ) throw RangeError("X is Inf");
// Fill the overall distribution
_axis.totalDbn().fill(x, weight);
// Fill the bins and overflows
try {
- HistoBin1D& b = binAt(x);
- b.fill(x, weight);
+ binAt(x).fill(x, weight);
} catch (const RangeError& re) {
if (x < _axis.xMin()) _axis.underflow().fill(x, weight);
else if (x >= _axis.xMax()) _axis.overflow().fill(x, weight);
@@ -32,6 +31,11 @@ namespace YODA {
}
+ void Histo1D::fillBin(size_t i, double weight) {
+ fill(bin(i).midpoint(), weight);
+ }
+
+
/// @todo Improve/centralise this statistical aggregation by exposing the Dbn1D/2D objects
/// in the bins and using their native += operators to do the aggregation.
diff --git a/src/Histo2D.cc b/src/Histo2D.cc
index 3463f8e..2904c0e 100644
--- a/src/Histo2D.cc
+++ b/src/Histo2D.cc
@@ -34,6 +34,12 @@ namespace YODA {
}
+ void Histo2D::fillBin(size_t i, double weight) {
+ pair<double, double> mid = bin(i).midpoint();
+ fill(mid.first, mid.second, weight);
+ }
+
+
double Histo2D::sumW(bool includeoverflows) const {
if (includeoverflows) return _axis.totalDbn().sumW();
double sumw = 0;
diff --git a/src/Makefile.in b/src/Makefile.in
index 7c4e460..1e14dc2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -261,6 +261,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -440,22 +444,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libYODA_la-WriterYODA.Plo at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
diff --git a/src/Profile1D.cc b/src/Profile1D.cc
index 96a37e2..d8ce4b2 100644
--- a/src/Profile1D.cc
+++ b/src/Profile1D.cc
@@ -14,16 +14,15 @@ namespace YODA {
void Profile1D::fill(double x, double y, double weight) {
- if ( isnan(x) ) throw RangeError("X is NaN");
- if ( isinf(x) ) throw RangeError("X is Inf");
- if ( isnan(y) ) throw RangeError("Y is NaN");
- if ( isinf(y) ) throw RangeError("Y is Inf");
+ if ( std::isnan(x) ) throw RangeError("X is NaN");
+ if ( std::isinf(x) ) throw RangeError("X is Inf");
+ if ( std::isnan(y) ) throw RangeError("Y is NaN");
+ if ( std::isinf(y) ) throw RangeError("Y is Inf");
// Fill the overall distribution
_axis.totalDbn().fill(x, y, weight);
// Fill the bins and overflows
try {
- ProfileBin1D& b = binAt(x);
- b.fill(x, y, weight);
+ binAt(x).fill(x, y, weight);
} catch (const RangeError& re) {
if (x < _axis.xMin()) _axis.underflow().fill(x, y, weight);
else if (x >= _axis.xMax()) _axis.overflow().fill(x, y, weight);
@@ -33,6 +32,11 @@ namespace YODA {
}
+ void Profile1D::fillBin(size_t i, double y, double weight) {
+ fill(bin(i).midpoint(), y, weight);
+ }
+
+
double Profile1D::sumW(bool includeoverflows) const {
if (includeoverflows) return _axis.totalDbn().sumW();
double sumw = 0;
diff --git a/src/Profile2D.cc b/src/Profile2D.cc
index 6cb5fd9..d01d512 100644
--- a/src/Profile2D.cc
+++ b/src/Profile2D.cc
@@ -13,12 +13,12 @@ namespace YODA {
void Profile2D::fill(double x, double y, double z, double weight) {
- if ( isnan(x) ) throw RangeError("X is NaN");
- if ( isinf(x) ) throw RangeError("X is Inf");
- if ( isnan(y) ) throw RangeError("Y is NaN");
- if ( isinf(y) ) throw RangeError("Y is Inf");
- if ( isnan(z) ) throw RangeError("Z is NaN");
- if ( isinf(z) ) throw RangeError("Z is Inf");
+ if ( std::isnan(x) ) throw RangeError("X is NaN");
+ if ( std::isinf(x) ) throw RangeError("X is Inf");
+ if ( std::isnan(y) ) throw RangeError("Y is NaN");
+ if ( std::isinf(y) ) throw RangeError("Y is Inf");
+ if ( std::isnan(z) ) throw RangeError("Z is NaN");
+ if ( std::isinf(z) ) throw RangeError("Z is Inf");
// Fill the overall distribution
_axis.totalDbn().fill(x, y, z, weight);
// Fill the bins and overflows
@@ -36,6 +36,12 @@ namespace YODA {
}
+ void Profile2D::fillBin(size_t i, double z, double weight) {
+ pair<double, double> mid = bin(i).midpoint();
+ fill(mid.first, mid.second, z, weight);
+ }
+
+
double Profile2D::sumW(bool includeoverflows) const {
if (includeoverflows) return _axis.totalDbn().sumW2();
double sumw = 0;
diff --git a/src/Scatter2D.cc b/src/Scatter2D.cc
index 7a2821a..67444a3 100644
--- a/src/Scatter2D.cc
+++ b/src/Scatter2D.cc
@@ -67,13 +67,16 @@ namespace YODA {
const Point2D& p1 = first.point(i);
const Point2D& p2 = second.point(i);
if (!fuzzyEquals(p1.xMin(), p2.xMin()) || !fuzzyEquals(p1.xMax(), p2.xMax()))
- throw BinningError("Point x 'bins' are not equivalent");
- const double x = (p1.x() + p2.x())/2.0;
+ throw BinningError("Point x 'bins' are not equivalent in " + first.path() + " + " + second.path());
+ // Use the midpoint of the "bin" for the new central x value, in the absence of better information
+ const double x = (p1.xMin() + p1.xMax()) / 2.0;
+ const double exminus = x - p1.xMin();
+ const double explus = p1.xMax() - x;
//
const double y = p1.y() + p2.y();
/// @todo Deal with +/- errors separately?
const double ey = sqrt( sqr(p1.yErrAvg()) + sqr(p2.yErrAvg()) );
- tmp.addPoint(x, y, p1.xErrMinus(), p1.xErrPlus(), ey, ey);
+ tmp.addPoint(x, y, exminus, explus, ey, ey);
}
assert(tmp.numPoints() == first.numPoints());
return tmp;
@@ -87,13 +90,16 @@ namespace YODA {
const Point2D& p1 = first.point(i);
const Point2D& p2 = second.point(i);
if (!fuzzyEquals(p1.xMin(), p2.xMin()) || !fuzzyEquals(p1.xMax(), p2.xMax()))
- throw BinningError("Point x 'bins' are not equivalent");
- const double x = (p1.x() + p2.x())/2.0;
+ throw BinningError("Point x 'bins' are not equivalent in " + first.path() + " - " + second.path());
+ // Use the midpoint of the "bin" for the new central x value, in the absence of better information
+ const double x = (p1.xMin() + p1.xMax()) / 2.0;
+ const double exminus = x - p1.xMin();
+ const double explus = p1.xMax() - x;
//
const double y = p1.y() - p2.y();
/// @todo Deal with +/- errors separately?
const double ey = sqrt( sqr(p1.yErrAvg()) + sqr(p2.yErrAvg()) );
- tmp.addPoint(x, y, p1.xErrMinus(), p1.xErrPlus(), ey, ey);
+ tmp.addPoint(x, y, exminus, explus, ey, ey);
}
assert(tmp.numPoints() == first.numPoints());
return tmp;
@@ -109,7 +115,7 @@ namespace YODA {
// Assemble the x value and error
if (!fuzzyEquals(p1.xMin(), p2.xMin()) || !fuzzyEquals(p1.xMax(), p2.xMax()))
- throw BinningError("Point x 'bins' are not equivalent");
+ throw BinningError("Point x 'bins' are not equivalent in " + numer.path() + " / " + denom.path());
// Use the midpoint of the "bin" for the new central x value, in the absence of better information
const double x = (p1.xMin() + p1.xMax()) / 2.0;
const double exminus = x - p1.xMin();
diff --git a/src/WriterYODA.cc b/src/WriterYODA.cc
index 9500ce5..363c8e7 100644
--- a/src/WriterYODA.cc
+++ b/src/WriterYODA.cc
@@ -59,8 +59,9 @@ namespace YODA {
os << "# BEGIN YODA_HISTO1D " << h.path() << "\n";
_writeAnnotations(os, h);
- if ( h.totalDbn().numEntries() > 0 )
+ if ( h.totalDbn().effNumEntries() > 0 ) {
os << "# Mean: " << h.mean() << "\n";
+ }
os << "# Area: " << h.integral() << "\n";
os << "# xlow\t xhigh\t sumw\t sumw2\t sumwx\t sumwx2\t numEntries\n";
os << "Total \tTotal \t";
diff --git a/src/tinyxml/Makefile.in b/src/tinyxml/Makefile.in
index a4770d7..68666e0 100644
--- a/src/tinyxml/Makefile.in
+++ b/src/tinyxml/Makefile.in
@@ -190,6 +190,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -316,22 +320,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtinyxml_la-tinyxmlparser.Plo at am__quote@
.cpp.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 14dd62f..9e3b999 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -94,19 +94,20 @@ am__v_lt_0 = --silent
am_testhisto1Db_OBJECTS = TestHisto1Db.$(OBJEXT)
testhisto1Db_OBJECTS = $(am_testhisto1Db_OBJECTS)
testhisto1Db_LDADD = $(LDADD)
-am_testhisto1Dcreate_OBJECTS = H1DCreate.$(OBJEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_testhisto1Dcreate_OBJECTS = Histo1D/H1DCreate.$(OBJEXT)
testhisto1Dcreate_OBJECTS = $(am_testhisto1Dcreate_OBJECTS)
testhisto1Dcreate_LDADD = $(LDADD)
-am_testhisto1Dfill_OBJECTS = H1DFill.$(OBJEXT)
+am_testhisto1Dfill_OBJECTS = Histo1D/H1DFill.$(OBJEXT)
testhisto1Dfill_OBJECTS = $(am_testhisto1Dfill_OBJECTS)
testhisto1Dfill_LDADD = $(LDADD)
-am_testhisto1Dmodify_OBJECTS = H1DModify.$(OBJEXT)
+am_testhisto1Dmodify_OBJECTS = Histo1D/H1DModify.$(OBJEXT)
testhisto1Dmodify_OBJECTS = $(am_testhisto1Dmodify_OBJECTS)
testhisto1Dmodify_LDADD = $(LDADD)
am_testhisto2Da_OBJECTS = TestHisto2Da.$(OBJEXT)
testhisto2Da_OBJECTS = $(am_testhisto2Da_OBJECTS)
testhisto2Da_LDADD = $(LDADD)
-am_testhisto2Dcreate_OBJECTS = H2DCreate.$(OBJEXT)
+am_testhisto2Dcreate_OBJECTS = Histo2D/H2DCreate.$(OBJEXT)
testhisto2Dcreate_OBJECTS = $(am_testhisto2Dcreate_OBJECTS)
testhisto2Dcreate_LDADD = $(LDADD)
am_testindexedset_OBJECTS = TestIndexedSet.$(OBJEXT)
@@ -115,19 +116,19 @@ testindexedset_LDADD = $(LDADD)
am_testprofile1Da_OBJECTS = TestProfile1Da.$(OBJEXT)
testprofile1Da_OBJECTS = $(am_testprofile1Da_OBJECTS)
testprofile1Da_LDADD = $(LDADD)
-am_testprofile1Dcreate_OBJECTS = P1DCreate.$(OBJEXT)
+am_testprofile1Dcreate_OBJECTS = Profile1D/P1DCreate.$(OBJEXT)
testprofile1Dcreate_OBJECTS = $(am_testprofile1Dcreate_OBJECTS)
testprofile1Dcreate_LDADD = $(LDADD)
-am_testprofile1Dfill_OBJECTS = P1DFill.$(OBJEXT)
+am_testprofile1Dfill_OBJECTS = Profile1D/P1DFill.$(OBJEXT)
testprofile1Dfill_OBJECTS = $(am_testprofile1Dfill_OBJECTS)
testprofile1Dfill_LDADD = $(LDADD)
-am_testprofile1Dmodify_OBJECTS = P1DModify.$(OBJEXT)
+am_testprofile1Dmodify_OBJECTS = Profile1D/P1DModify.$(OBJEXT)
testprofile1Dmodify_OBJECTS = $(am_testprofile1Dmodify_OBJECTS)
testprofile1Dmodify_LDADD = $(LDADD)
-am_testscatter2Dcreate_OBJECTS = S2DCreate.$(OBJEXT)
+am_testscatter2Dcreate_OBJECTS = Scatter2D/S2DCreate.$(OBJEXT)
testscatter2Dcreate_OBJECTS = $(am_testscatter2Dcreate_OBJECTS)
testscatter2Dcreate_LDADD = $(LDADD)
-am_testscatter2Dmodify_OBJECTS = S2DModify.$(OBJEXT)
+am_testscatter2Dmodify_OBJECTS = Scatter2D/S2DModify.$(OBJEXT)
testscatter2Dmodify_OBJECTS = $(am_testscatter2Dmodify_OBJECTS)
testscatter2Dmodify_LDADD = $(LDADD)
am_testsortedvector_OBJECTS = TestSortedVector.$(OBJEXT)
@@ -264,6 +265,10 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
+ROOTCONFIG = @ROOTCONFIG@
+ROOT_CXXFLAGS = @ROOT_CXXFLAGS@
+ROOT_LDFLAGS = @ROOT_LDFLAGS@
+ROOT_LIBS = @ROOT_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -412,18 +417,38 @@ testhisto1Da$(EXEEXT): $(testhisto1Da_OBJECTS) $(testhisto1Da_DEPENDENCIES) $(EX
testhisto1Db$(EXEEXT): $(testhisto1Db_OBJECTS) $(testhisto1Db_DEPENDENCIES) $(EXTRA_testhisto1Db_DEPENDENCIES)
@rm -f testhisto1Db$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto1Db_OBJECTS) $(testhisto1Db_LDADD) $(LIBS)
+Histo1D/$(am__dirstamp):
+ @$(MKDIR_P) Histo1D
+ @: > Histo1D/$(am__dirstamp)
+Histo1D/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) Histo1D/$(DEPDIR)
+ @: > Histo1D/$(DEPDIR)/$(am__dirstamp)
+Histo1D/H1DCreate.$(OBJEXT): Histo1D/$(am__dirstamp) \
+ Histo1D/$(DEPDIR)/$(am__dirstamp)
testhisto1Dcreate$(EXEEXT): $(testhisto1Dcreate_OBJECTS) $(testhisto1Dcreate_DEPENDENCIES) $(EXTRA_testhisto1Dcreate_DEPENDENCIES)
@rm -f testhisto1Dcreate$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto1Dcreate_OBJECTS) $(testhisto1Dcreate_LDADD) $(LIBS)
+Histo1D/H1DFill.$(OBJEXT): Histo1D/$(am__dirstamp) \
+ Histo1D/$(DEPDIR)/$(am__dirstamp)
testhisto1Dfill$(EXEEXT): $(testhisto1Dfill_OBJECTS) $(testhisto1Dfill_DEPENDENCIES) $(EXTRA_testhisto1Dfill_DEPENDENCIES)
@rm -f testhisto1Dfill$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto1Dfill_OBJECTS) $(testhisto1Dfill_LDADD) $(LIBS)
+Histo1D/H1DModify.$(OBJEXT): Histo1D/$(am__dirstamp) \
+ Histo1D/$(DEPDIR)/$(am__dirstamp)
testhisto1Dmodify$(EXEEXT): $(testhisto1Dmodify_OBJECTS) $(testhisto1Dmodify_DEPENDENCIES) $(EXTRA_testhisto1Dmodify_DEPENDENCIES)
@rm -f testhisto1Dmodify$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto1Dmodify_OBJECTS) $(testhisto1Dmodify_LDADD) $(LIBS)
testhisto2Da$(EXEEXT): $(testhisto2Da_OBJECTS) $(testhisto2Da_DEPENDENCIES) $(EXTRA_testhisto2Da_DEPENDENCIES)
@rm -f testhisto2Da$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto2Da_OBJECTS) $(testhisto2Da_LDADD) $(LIBS)
+Histo2D/$(am__dirstamp):
+ @$(MKDIR_P) Histo2D
+ @: > Histo2D/$(am__dirstamp)
+Histo2D/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) Histo2D/$(DEPDIR)
+ @: > Histo2D/$(DEPDIR)/$(am__dirstamp)
+Histo2D/H2DCreate.$(OBJEXT): Histo2D/$(am__dirstamp) \
+ Histo2D/$(DEPDIR)/$(am__dirstamp)
testhisto2Dcreate$(EXEEXT): $(testhisto2Dcreate_OBJECTS) $(testhisto2Dcreate_DEPENDENCIES) $(EXTRA_testhisto2Dcreate_DEPENDENCIES)
@rm -f testhisto2Dcreate$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testhisto2Dcreate_OBJECTS) $(testhisto2Dcreate_LDADD) $(LIBS)
@@ -433,18 +458,40 @@ testindexedset$(EXEEXT): $(testindexedset_OBJECTS) $(testindexedset_DEPENDENCIES
testprofile1Da$(EXEEXT): $(testprofile1Da_OBJECTS) $(testprofile1Da_DEPENDENCIES) $(EXTRA_testprofile1Da_DEPENDENCIES)
@rm -f testprofile1Da$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testprofile1Da_OBJECTS) $(testprofile1Da_LDADD) $(LIBS)
+Profile1D/$(am__dirstamp):
+ @$(MKDIR_P) Profile1D
+ @: > Profile1D/$(am__dirstamp)
+Profile1D/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) Profile1D/$(DEPDIR)
+ @: > Profile1D/$(DEPDIR)/$(am__dirstamp)
+Profile1D/P1DCreate.$(OBJEXT): Profile1D/$(am__dirstamp) \
+ Profile1D/$(DEPDIR)/$(am__dirstamp)
testprofile1Dcreate$(EXEEXT): $(testprofile1Dcreate_OBJECTS) $(testprofile1Dcreate_DEPENDENCIES) $(EXTRA_testprofile1Dcreate_DEPENDENCIES)
@rm -f testprofile1Dcreate$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testprofile1Dcreate_OBJECTS) $(testprofile1Dcreate_LDADD) $(LIBS)
+Profile1D/P1DFill.$(OBJEXT): Profile1D/$(am__dirstamp) \
+ Profile1D/$(DEPDIR)/$(am__dirstamp)
testprofile1Dfill$(EXEEXT): $(testprofile1Dfill_OBJECTS) $(testprofile1Dfill_DEPENDENCIES) $(EXTRA_testprofile1Dfill_DEPENDENCIES)
@rm -f testprofile1Dfill$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testprofile1Dfill_OBJECTS) $(testprofile1Dfill_LDADD) $(LIBS)
+Profile1D/P1DModify.$(OBJEXT): Profile1D/$(am__dirstamp) \
+ Profile1D/$(DEPDIR)/$(am__dirstamp)
testprofile1Dmodify$(EXEEXT): $(testprofile1Dmodify_OBJECTS) $(testprofile1Dmodify_DEPENDENCIES) $(EXTRA_testprofile1Dmodify_DEPENDENCIES)
@rm -f testprofile1Dmodify$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testprofile1Dmodify_OBJECTS) $(testprofile1Dmodify_LDADD) $(LIBS)
+Scatter2D/$(am__dirstamp):
+ @$(MKDIR_P) Scatter2D
+ @: > Scatter2D/$(am__dirstamp)
+Scatter2D/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) Scatter2D/$(DEPDIR)
+ @: > Scatter2D/$(DEPDIR)/$(am__dirstamp)
+Scatter2D/S2DCreate.$(OBJEXT): Scatter2D/$(am__dirstamp) \
+ Scatter2D/$(DEPDIR)/$(am__dirstamp)
testscatter2Dcreate$(EXEEXT): $(testscatter2Dcreate_OBJECTS) $(testscatter2Dcreate_DEPENDENCIES) $(EXTRA_testscatter2Dcreate_DEPENDENCIES)
@rm -f testscatter2Dcreate$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testscatter2Dcreate_OBJECTS) $(testscatter2Dcreate_LDADD) $(LIBS)
+Scatter2D/S2DModify.$(OBJEXT): Scatter2D/$(am__dirstamp) \
+ Scatter2D/$(DEPDIR)/$(am__dirstamp)
testscatter2Dmodify$(EXEEXT): $(testscatter2Dmodify_OBJECTS) $(testscatter2Dmodify_DEPENDENCIES) $(EXTRA_testscatter2Dmodify_DEPENDENCIES)
@rm -f testscatter2Dmodify$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testscatter2Dmodify_OBJECTS) $(testscatter2Dmodify_LDADD) $(LIBS)
@@ -457,19 +504,19 @@ testweights$(EXEEXT): $(testweights_OBJECTS) $(testweights_DEPENDENCIES) $(EXTRA
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f Histo1D/H1DCreate.$(OBJEXT)
+ -rm -f Histo1D/H1DFill.$(OBJEXT)
+ -rm -f Histo1D/H1DModify.$(OBJEXT)
+ -rm -f Histo2D/H2DCreate.$(OBJEXT)
+ -rm -f Profile1D/P1DCreate.$(OBJEXT)
+ -rm -f Profile1D/P1DFill.$(OBJEXT)
+ -rm -f Profile1D/P1DModify.$(OBJEXT)
+ -rm -f Scatter2D/S2DCreate.$(OBJEXT)
+ -rm -f Scatter2D/S2DModify.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/H1DCreate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/H1DFill.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/H1DModify.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/H2DCreate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/P1DCreate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/P1DFill.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/P1DModify.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/S2DCreate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/S2DModify.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestHisto1Da.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestHisto1Db.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestHisto2Da.Po at am__quote@
@@ -477,154 +524,40 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestProfile1Da.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestSortedVector.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TestWeights.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Histo1D/$(DEPDIR)/H1DCreate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Histo1D/$(DEPDIR)/H1DFill.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Histo1D/$(DEPDIR)/H1DModify.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Histo2D/$(DEPDIR)/H2DCreate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Profile1D/$(DEPDIR)/P1DCreate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Profile1D/$(DEPDIR)/P1DFill.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Profile1D/$(DEPDIR)/P1DModify.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Scatter2D/$(DEPDIR)/S2DCreate.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at Scatter2D/$(DEPDIR)/S2DModify.Po at am__quote@
.cc.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-H1DCreate.o: Histo1D/H1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DCreate.o -MD -MP -MF $(DEPDIR)/H1DCreate.Tpo -c -o H1DCreate.o `test -f 'Histo1D/H1DCreate.cc' || echo '$(srcdir)/'`Histo1D/H1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DCreate.Tpo $(DEPDIR)/H1DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DCreate.cc' object='H1DCreate.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DCreate.o `test -f 'Histo1D/H1DCreate.cc' || echo '$(srcdir)/'`Histo1D/H1DCreate.cc
-
-H1DCreate.obj: Histo1D/H1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DCreate.obj -MD -MP -MF $(DEPDIR)/H1DCreate.Tpo -c -o H1DCreate.obj `if test -f 'Histo1D/H1DCreate.cc'; then $(CYGPATH_W) 'Histo1D/H1DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DCreate.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DCreate.Tpo $(DEPDIR)/H1DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DCreate.cc' object='H1DCreate.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DCreate.obj `if test -f 'Histo1D/H1DCreate.cc'; then $(CYGPATH_W) 'Histo1D/H1DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DCreate.cc'; fi`
-
-H1DFill.o: Histo1D/H1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DFill.o -MD -MP -MF $(DEPDIR)/H1DFill.Tpo -c -o H1DFill.o `test -f 'Histo1D/H1DFill.cc' || echo '$(srcdir)/'`Histo1D/H1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DFill.Tpo $(DEPDIR)/H1DFill.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DFill.cc' object='H1DFill.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DFill.o `test -f 'Histo1D/H1DFill.cc' || echo '$(srcdir)/'`Histo1D/H1DFill.cc
-
-H1DFill.obj: Histo1D/H1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DFill.obj -MD -MP -MF $(DEPDIR)/H1DFill.Tpo -c -o H1DFill.obj `if test -f 'Histo1D/H1DFill.cc'; then $(CYGPATH_W) 'Histo1D/H1DFill.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DFill.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DFill.Tpo $(DEPDIR)/H1DFill.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DFill.cc' object='H1DFill.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DFill.obj `if test -f 'Histo1D/H1DFill.cc'; then $(CYGPATH_W) 'Histo1D/H1DFill.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DFill.cc'; fi`
-
-H1DModify.o: Histo1D/H1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DModify.o -MD -MP -MF $(DEPDIR)/H1DModify.Tpo -c -o H1DModify.o `test -f 'Histo1D/H1DModify.cc' || echo '$(srcdir)/'`Histo1D/H1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DModify.Tpo $(DEPDIR)/H1DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DModify.cc' object='H1DModify.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DModify.o `test -f 'Histo1D/H1DModify.cc' || echo '$(srcdir)/'`Histo1D/H1DModify.cc
-
-H1DModify.obj: Histo1D/H1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H1DModify.obj -MD -MP -MF $(DEPDIR)/H1DModify.Tpo -c -o H1DModify.obj `if test -f 'Histo1D/H1DModify.cc'; then $(CYGPATH_W) 'Histo1D/H1DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DModify.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H1DModify.Tpo $(DEPDIR)/H1DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo1D/H1DModify.cc' object='H1DModify.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H1DModify.obj `if test -f 'Histo1D/H1DModify.cc'; then $(CYGPATH_W) 'Histo1D/H1DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Histo1D/H1DModify.cc'; fi`
-
-H2DCreate.o: Histo2D/H2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H2DCreate.o -MD -MP -MF $(DEPDIR)/H2DCreate.Tpo -c -o H2DCreate.o `test -f 'Histo2D/H2DCreate.cc' || echo '$(srcdir)/'`Histo2D/H2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H2DCreate.Tpo $(DEPDIR)/H2DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo2D/H2DCreate.cc' object='H2DCreate.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H2DCreate.o `test -f 'Histo2D/H2DCreate.cc' || echo '$(srcdir)/'`Histo2D/H2DCreate.cc
-
-H2DCreate.obj: Histo2D/H2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT H2DCreate.obj -MD -MP -MF $(DEPDIR)/H2DCreate.Tpo -c -o H2DCreate.obj `if test -f 'Histo2D/H2DCreate.cc'; then $(CYGPATH_W) 'Histo2D/H2DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Histo2D/H2DCreate.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/H2DCreate.Tpo $(DEPDIR)/H2DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Histo2D/H2DCreate.cc' object='H2DCreate.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o H2DCreate.obj `if test -f 'Histo2D/H2DCreate.cc'; then $(CYGPATH_W) 'Histo2D/H2DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Histo2D/H2DCreate.cc'; fi`
-
-P1DCreate.o: Profile1D/P1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DCreate.o -MD -MP -MF $(DEPDIR)/P1DCreate.Tpo -c -o P1DCreate.o `test -f 'Profile1D/P1DCreate.cc' || echo '$(srcdir)/'`Profile1D/P1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DCreate.Tpo $(DEPDIR)/P1DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DCreate.cc' object='P1DCreate.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DCreate.o `test -f 'Profile1D/P1DCreate.cc' || echo '$(srcdir)/'`Profile1D/P1DCreate.cc
-
-P1DCreate.obj: Profile1D/P1DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DCreate.obj -MD -MP -MF $(DEPDIR)/P1DCreate.Tpo -c -o P1DCreate.obj `if test -f 'Profile1D/P1DCreate.cc'; then $(CYGPATH_W) 'Profile1D/P1DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DCreate.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DCreate.Tpo $(DEPDIR)/P1DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DCreate.cc' object='P1DCreate.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DCreate.obj `if test -f 'Profile1D/P1DCreate.cc'; then $(CYGPATH_W) 'Profile1D/P1DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DCreate.cc'; fi`
-
-P1DFill.o: Profile1D/P1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DFill.o -MD -MP -MF $(DEPDIR)/P1DFill.Tpo -c -o P1DFill.o `test -f 'Profile1D/P1DFill.cc' || echo '$(srcdir)/'`Profile1D/P1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DFill.Tpo $(DEPDIR)/P1DFill.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DFill.cc' object='P1DFill.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DFill.o `test -f 'Profile1D/P1DFill.cc' || echo '$(srcdir)/'`Profile1D/P1DFill.cc
-
-P1DFill.obj: Profile1D/P1DFill.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DFill.obj -MD -MP -MF $(DEPDIR)/P1DFill.Tpo -c -o P1DFill.obj `if test -f 'Profile1D/P1DFill.cc'; then $(CYGPATH_W) 'Profile1D/P1DFill.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DFill.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DFill.Tpo $(DEPDIR)/P1DFill.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DFill.cc' object='P1DFill.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DFill.obj `if test -f 'Profile1D/P1DFill.cc'; then $(CYGPATH_W) 'Profile1D/P1DFill.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DFill.cc'; fi`
-
-P1DModify.o: Profile1D/P1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DModify.o -MD -MP -MF $(DEPDIR)/P1DModify.Tpo -c -o P1DModify.o `test -f 'Profile1D/P1DModify.cc' || echo '$(srcdir)/'`Profile1D/P1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DModify.Tpo $(DEPDIR)/P1DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DModify.cc' object='P1DModify.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DModify.o `test -f 'Profile1D/P1DModify.cc' || echo '$(srcdir)/'`Profile1D/P1DModify.cc
-
-P1DModify.obj: Profile1D/P1DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT P1DModify.obj -MD -MP -MF $(DEPDIR)/P1DModify.Tpo -c -o P1DModify.obj `if test -f 'Profile1D/P1DModify.cc'; then $(CYGPATH_W) 'Profile1D/P1DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DModify.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/P1DModify.Tpo $(DEPDIR)/P1DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Profile1D/P1DModify.cc' object='P1DModify.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o P1DModify.obj `if test -f 'Profile1D/P1DModify.cc'; then $(CYGPATH_W) 'Profile1D/P1DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Profile1D/P1DModify.cc'; fi`
-
-S2DCreate.o: Scatter2D/S2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT S2DCreate.o -MD -MP -MF $(DEPDIR)/S2DCreate.Tpo -c -o S2DCreate.o `test -f 'Scatter2D/S2DCreate.cc' || echo '$(srcdir)/'`Scatter2D/S2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/S2DCreate.Tpo $(DEPDIR)/S2DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Scatter2D/S2DCreate.cc' object='S2DCreate.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o S2DCreate.o `test -f 'Scatter2D/S2DCreate.cc' || echo '$(srcdir)/'`Scatter2D/S2DCreate.cc
-
-S2DCreate.obj: Scatter2D/S2DCreate.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT S2DCreate.obj -MD -MP -MF $(DEPDIR)/S2DCreate.Tpo -c -o S2DCreate.obj `if test -f 'Scatter2D/S2DCreate.cc'; then $(CYGPATH_W) 'Scatter2D/S2DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Scatter2D/S2DCreate.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/S2DCreate.Tpo $(DEPDIR)/S2DCreate.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Scatter2D/S2DCreate.cc' object='S2DCreate.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o S2DCreate.obj `if test -f 'Scatter2D/S2DCreate.cc'; then $(CYGPATH_W) 'Scatter2D/S2DCreate.cc'; else $(CYGPATH_W) '$(srcdir)/Scatter2D/S2DCreate.cc'; fi`
-
-S2DModify.o: Scatter2D/S2DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT S2DModify.o -MD -MP -MF $(DEPDIR)/S2DModify.Tpo -c -o S2DModify.o `test -f 'Scatter2D/S2DModify.cc' || echo '$(srcdir)/'`Scatter2D/S2DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/S2DModify.Tpo $(DEPDIR)/S2DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Scatter2D/S2DModify.cc' object='S2DModify.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o S2DModify.o `test -f 'Scatter2D/S2DModify.cc' || echo '$(srcdir)/'`Scatter2D/S2DModify.cc
-
-S2DModify.obj: Scatter2D/S2DModify.cc
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT S2DModify.obj -MD -MP -MF $(DEPDIR)/S2DModify.Tpo -c -o S2DModify.obj `if test -f 'Scatter2D/S2DModify.cc'; then $(CYGPATH_W) 'Scatter2D/S2DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Scatter2D/S2DModify.cc'; fi`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/S2DModify.Tpo $(DEPDIR)/S2DModify.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Scatter2D/S2DModify.cc' object='S2DModify.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o S2DModify.obj `if test -f 'Scatter2D/S2DModify.cc'; then $(CYGPATH_W) 'Scatter2D/S2DModify.cc'; else $(CYGPATH_W) '$(srcdir)/Scatter2D/S2DModify.cc'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
@@ -838,6 +771,14 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -rm -f Histo1D/$(DEPDIR)/$(am__dirstamp)
+ -rm -f Histo1D/$(am__dirstamp)
+ -rm -f Histo2D/$(DEPDIR)/$(am__dirstamp)
+ -rm -f Histo2D/$(am__dirstamp)
+ -rm -f Profile1D/$(DEPDIR)/$(am__dirstamp)
+ -rm -f Profile1D/$(am__dirstamp)
+ -rm -f Scatter2D/$(DEPDIR)/$(am__dirstamp)
+ -rm -f Scatter2D/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -848,7 +789,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf ./$(DEPDIR) Histo1D/$(DEPDIR) Histo2D/$(DEPDIR) Profile1D/$(DEPDIR) Scatter2D/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -894,7 +835,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf ./$(DEPDIR) Histo1D/$(DEPDIR) Histo2D/$(DEPDIR) Profile1D/$(DEPDIR) Scatter2D/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yoda.git
More information about the debian-science-commits
mailing list