master: autotools: fix more problems with autotools test.

bin/check_makefile.sh

@@ -36,13 +36,17 @@ then
     exit 1
 fi
 # -----------------------------------------------------------------------------
-echo "Checking include files listed in makefile.am"
+echo "Checking include files listed in include/makefile.am"
 echo "-------------------------------------------------------"
-git ls-files | sed -n -e '/cppad\/.*\.hpp$/p'  -e '/cppad\/.*\.hpp.in$/p' \
-    > check_makefile.1.$$
+git ls-files | sed -n \
+    -e '/^include\/cppad\/.*\.hpp$/p'  \
+    -e '/^include\/cppad\/.*\.hpp.in$/p' | \
+    sed -e 's|^include/||' > check_makefile.1.$$
+# LC_ALL='C' is used by sort.sh for sorting order
+export LC_ALL='C'
 sort -u check_makefile.1.$$ > check_makefile.2.$$
 #
-sed < makefile.am -n \
+sed < include/makefile.am -n \
     -e '/^nobase_myinclude_HEADERS *=/,/^# End nobase_myinclude_HEADERS/p' | \
     sed \
         -e '/nobase_myinclude_HEADERS/d' \

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cppad 20190912.
+# Generated by GNU Autoconf 2.69 for cppad 20190914.
 #
 # Report bugs to <cppad@list.coin-or.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cppad'
 PACKAGE_TARNAME='cppad'
-PACKAGE_VERSION='20190912'
-PACKAGE_STRING='cppad 20190912'
+PACKAGE_VERSION='20190914'
+PACKAGE_STRING='cppad 20190914'
 PACKAGE_BUGREPORT='cppad@list.coin-or.org'
 PACKAGE_URL=''
 
@@ -1357,7 +1357,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 cppad 20190912 to adapt to many kinds of systems.
+\`configure' configures cppad 20190914 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1427,7 +1427,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cppad 20190912:";;
+     short | recursive ) echo "Configuration of cppad 20190914:";;
    esac
   cat <<\_ACEOF
 
@@ -1549,7 +1549,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cppad configure 20190912
+cppad configure 20190914
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1922,7 +1922,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 cppad $as_me 20190912, which was
+It was created by cppad $as_me 20190914, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2812,7 +2812,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cppad'
- VERSION='20190912'
+ VERSION='20190914'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7013,7 +7013,7 @@ eigen_prefix=${EIGEN_DIR}
 
 ipopt_prefix=${IPOPT_DIR}
 
-ac_config_files="$ac_config_files include/cppad/configure.hpp include/cppad/local/is_pod.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/general/makefile example/abs_normal/makefile example/atomic_two/makefile example/atomic_three/makefile example/chkpoint_two/makefile example/ipopt_solve/makefile example/optimize/makefile example/sparse/makefile example/utility/makefile example/get_started/makefile include/makefile introduction/makefile example/multi_thread/makefile example/print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/compare_c/makefile test_more/general/makefile test_more/deprecated/makefile test_more/deprecated/atomic_two/makefile test_more/deprecated/chkpoint_one/makefile"
+ac_config_files="$ac_config_files include/cppad/configure.hpp include/cppad/local/is_pod.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile cppad_lib/makefile example/general/makefile example/abs_normal/makefile example/atomic_two/makefile example/atomic_three/makefile example/chkpoint_two/makefile example/ipopt_solve/makefile example/optimize/makefile example/sparse/makefile example/utility/makefile example/get_started/makefile include/makefile introduction/makefile example/multi_thread/makefile example/print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/compare_c/makefile test_more/general/makefile test_more/deprecated/makefile test_more/deprecated/atomic_two/makefile test_more/deprecated/chkpoint_one/makefile"
 
 
 ac_config_commands="$ac_config_commands configure.hpp"
@@ -7659,7 +7659,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 cppad $as_me 20190912, which was
+This file was extended by cppad $as_me 20190914, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7716,7 +7716,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="\\
-cppad config.status 20190912
+cppad config.status 20190914
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7860,6 +7860,7 @@ do
     "cppad_ipopt/example/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/example/makefile" ;;
     "cppad_ipopt/speed/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/speed/makefile" ;;
     "cppad_ipopt/test/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/test/makefile" ;;
+    "cppad_lib/makefile") CONFIG_FILES="$CONFIG_FILES cppad_lib/makefile" ;;
     "example/general/makefile") CONFIG_FILES="$CONFIG_FILES example/general/makefile" ;;
     "example/abs_normal/makefile") CONFIG_FILES="$CONFIG_FILES example/abs_normal/makefile" ;;
     "example/atomic_two/makefile") CONFIG_FILES="$CONFIG_FILES example/atomic_two/makefile" ;;

configure.ac

@@ -729,6 +729,7 @@ AC_CONFIG_FILES([
     cppad_ipopt/example/makefile
     cppad_ipopt/speed/makefile
     cppad_ipopt/test/makefile
+    cppad_lib/makefile
     example/general/makefile
     example/abs_normal/makefile
     example/atomic_two/makefile

cppad_lib/makefile.am

@@ -0,0 +1,25 @@
+# -----------------------------------------------------------------------------
+# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-19 Bradley M. Bell
+#
+# CppAD is distributed under the terms of the
+#              Eclipse Public License Version 2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary License when the conditions for such availability set forth
+# in the Eclipse Public License, Version 2.0 are satisfied:
+#       GNU General Public License, Version 2.0 or later.
+# -----------------------------------------------------------------------------
+# automake input file
+#
+# CppAD pusts all it's preprocessor definitions in the cppad/configure.hpp
+DEFS          =
+#
+AM_CXXFLAGS =  \
+	$(CXX_FLAGS) \
+	-I$(top_srcdir)/include
+#
+lib_LIBRARIES = libcppad_lib.a
+libcppad_lib_a_SOURCES = \
+	json_lexer.cpp \
+	json_operator.cpp \
+	json_parser.cpp