Skip to content

Commit 9a68f9c

Browse files
committed
Re-running autotools
1 parent 70a00f5 commit 9a68f9c

File tree

2 files changed

+44
-35
lines changed

2 files changed

+44
-35
lines changed

Makefile.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ PRE_UNINSTALL = :
5151
POST_UNINSTALL = :
5252
build_triplet = @build@
5353
host_triplet = @host@
54-
DIST_COMMON = README $(am__configure_deps) \
55-
$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
56-
$(srcdir)/Makefile.in $(top_srcdir)/configure \
57-
$(top_srcdir)/doxydoc/doxygen.conf.in INSTALL config.guess \
58-
config.sub depcomp install-sh ltmain.sh missing
54+
DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
55+
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
56+
$(top_srcdir)/configure $(top_srcdir)/doxydoc/doxygen.conf.in \
57+
AUTHORS INSTALL config.guess config.sub depcomp install-sh \
58+
ltmain.sh missing
5959
@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
6060
@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
6161
subdir = .
@@ -261,7 +261,7 @@ SUBDIRS = $(subdirs)
261261
# Files that are generated and should be cleaned with make distclean
262262
DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
263263
$(VPATH_DISTCLEANFILES)
264-
DocFiles = README AUTHORS LICENSE
264+
DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md
265265
DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
266266
COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
267267
COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
@@ -828,7 +828,7 @@ uninstall-all-doxygen-docs:
828828
fi ; \
829829
done ;
830830

831-
install-doc: $(DocFiles)
831+
install-doc:
832832
test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
833833
for file in $(DocFiles); do \
834834
if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \

configure

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ ac_subdirs_all="$ac_subdirs_all Data/Netlib"
484484
ac_subdirs_all="$ac_subdirs_all CoinUtils"
485485
ac_subdirs_all="$ac_subdirs_all Osi"
486486
ac_subdirs_all="$ac_subdirs_all Clp"
487-
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag dos2unix RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
487+
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag dos2unix RPATH_FLAGS LT_LDFLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE COIN_SKIP_PROJECTS subdirs coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
488488
ac_subst_files=''
489489

490490
# Initialize some variables set by options.
@@ -1021,6 +1021,10 @@ ac_env_CXXCPP_set=${CXXCPP+set}
10211021
ac_env_CXXCPP_value=$CXXCPP
10221022
ac_cv_env_CXXCPP_set=${CXXCPP+set}
10231023
ac_cv_env_CXXCPP_value=$CXXCPP
1024+
ac_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
1025+
ac_env_LT_LDFLAGS_value=$LT_LDFLAGS
1026+
ac_cv_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
1027+
ac_cv_env_LT_LDFLAGS_value=$LT_LDFLAGS
10241028
ac_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
10251029
ac_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS
10261030
ac_cv_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
@@ -1207,6 +1211,8 @@ Some influential environment variables:
12071211
MPIF77 Fortran MPI Compiler
12081212
CPP C preprocessor
12091213
CXXCPP C++ preprocessor
1214+
LT_LDFLAGS Flags passed to libtool when building libraries or executables
1215+
that are installed
12101216
COIN_SKIP_PROJECTS
12111217
Set to the subdirectories of projects that should be skipped in
12121218
the configuration
@@ -4154,7 +4160,7 @@ fi
41544160

41554161

41564162
# Provide some information about the compiler.
4157-
echo "$as_me:4157:" \
4163+
echo "$as_me:4163:" \
41584164
"checking for Fortran 77 compiler version" >&5
41594165
ac_compiler=`set X $ac_compile; echo $2`
41604166
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6381,7 +6387,7 @@ ia64-*-hpux*)
63816387
;;
63826388
*-*-irix6*)
63836389
# Find out which ABI we are using.
6384-
echo '#line 6384 "configure"' > conftest.$ac_ext
6390+
echo '#line 6390 "configure"' > conftest.$ac_ext
63856391
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
63866392
(eval $ac_compile) 2>&5
63876393
ac_status=$?
@@ -8345,11 +8351,11 @@ else
83458351
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
83468352
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
83478353
-e 's:$: $lt_compiler_flag:'`
8348-
(eval echo "\"\$as_me:8348: $lt_compile\"" >&5)
8354+
(eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
83498355
(eval "$lt_compile" 2>conftest.err)
83508356
ac_status=$?
83518357
cat conftest.err >&5
8352-
echo "$as_me:8352: \$? = $ac_status" >&5
8358+
echo "$as_me:8358: \$? = $ac_status" >&5
83538359
if (exit $ac_status) && test -s "$ac_outfile"; then
83548360
# The compiler can only warn and ignore the option if not recognized
83558361
# So say no if there are warnings other than the usual output.
@@ -8613,11 +8619,11 @@ else
86138619
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
86148620
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
86158621
-e 's:$: $lt_compiler_flag:'`
8616-
(eval echo "\"\$as_me:8616: $lt_compile\"" >&5)
8622+
(eval echo "\"\$as_me:8622: $lt_compile\"" >&5)
86178623
(eval "$lt_compile" 2>conftest.err)
86188624
ac_status=$?
86198625
cat conftest.err >&5
8620-
echo "$as_me:8620: \$? = $ac_status" >&5
8626+
echo "$as_me:8626: \$? = $ac_status" >&5
86218627
if (exit $ac_status) && test -s "$ac_outfile"; then
86228628
# The compiler can only warn and ignore the option if not recognized
86238629
# So say no if there are warnings other than the usual output.
@@ -8717,11 +8723,11 @@ else
87178723
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
87188724
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
87198725
-e 's:$: $lt_compiler_flag:'`
8720-
(eval echo "\"\$as_me:8720: $lt_compile\"" >&5)
8726+
(eval echo "\"\$as_me:8726: $lt_compile\"" >&5)
87218727
(eval "$lt_compile" 2>out/conftest.err)
87228728
ac_status=$?
87238729
cat out/conftest.err >&5
8724-
echo "$as_me:8724: \$? = $ac_status" >&5
8730+
echo "$as_me:8730: \$? = $ac_status" >&5
87258731
if (exit $ac_status) && test -s out/conftest2.$ac_objext
87268732
then
87278733
# The compiler can only warn and ignore the option if not recognized
@@ -11062,7 +11068,7 @@ else
1106211068
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1106311069
lt_status=$lt_dlunknown
1106411070
cat > conftest.$ac_ext <<EOF
11065-
#line 11065 "configure"
11071+
#line 11071 "configure"
1106611072
#include "confdefs.h"
1106711073

1106811074
#if HAVE_DLFCN_H
@@ -11162,7 +11168,7 @@ else
1116211168
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1116311169
lt_status=$lt_dlunknown
1116411170
cat > conftest.$ac_ext <<EOF
11165-
#line 11165 "configure"
11171+
#line 11171 "configure"
1116611172
#include "confdefs.h"
1116711173

1116811174
#if HAVE_DLFCN_H
@@ -13506,11 +13512,11 @@ else
1350613512
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1350713513
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1350813514
-e 's:$: $lt_compiler_flag:'`
13509-
(eval echo "\"\$as_me:13509: $lt_compile\"" >&5)
13515+
(eval echo "\"\$as_me:13515: $lt_compile\"" >&5)
1351013516
(eval "$lt_compile" 2>conftest.err)
1351113517
ac_status=$?
1351213518
cat conftest.err >&5
13513-
echo "$as_me:13513: \$? = $ac_status" >&5
13519+
echo "$as_me:13519: \$? = $ac_status" >&5
1351413520
if (exit $ac_status) && test -s "$ac_outfile"; then
1351513521
# The compiler can only warn and ignore the option if not recognized
1351613522
# So say no if there are warnings other than the usual output.
@@ -13610,11 +13616,11 @@ else
1361013616
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1361113617
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1361213618
-e 's:$: $lt_compiler_flag:'`
13613-
(eval echo "\"\$as_me:13613: $lt_compile\"" >&5)
13619+
(eval echo "\"\$as_me:13619: $lt_compile\"" >&5)
1361413620
(eval "$lt_compile" 2>out/conftest.err)
1361513621
ac_status=$?
1361613622
cat out/conftest.err >&5
13617-
echo "$as_me:13617: \$? = $ac_status" >&5
13623+
echo "$as_me:13623: \$? = $ac_status" >&5
1361813624
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1361913625
then
1362013626
# The compiler can only warn and ignore the option if not recognized
@@ -15180,11 +15186,11 @@ else
1518015186
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1518115187
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1518215188
-e 's:$: $lt_compiler_flag:'`
15183-
(eval echo "\"\$as_me:15183: $lt_compile\"" >&5)
15189+
(eval echo "\"\$as_me:15189: $lt_compile\"" >&5)
1518415190
(eval "$lt_compile" 2>conftest.err)
1518515191
ac_status=$?
1518615192
cat conftest.err >&5
15187-
echo "$as_me:15187: \$? = $ac_status" >&5
15193+
echo "$as_me:15193: \$? = $ac_status" >&5
1518815194
if (exit $ac_status) && test -s "$ac_outfile"; then
1518915195
# The compiler can only warn and ignore the option if not recognized
1519015196
# So say no if there are warnings other than the usual output.
@@ -15284,11 +15290,11 @@ else
1528415290
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1528515291
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1528615292
-e 's:$: $lt_compiler_flag:'`
15287-
(eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
15293+
(eval echo "\"\$as_me:15293: $lt_compile\"" >&5)
1528815294
(eval "$lt_compile" 2>out/conftest.err)
1528915295
ac_status=$?
1529015296
cat out/conftest.err >&5
15291-
echo "$as_me:15291: \$? = $ac_status" >&5
15297+
echo "$as_me:15297: \$? = $ac_status" >&5
1529215298
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1529315299
then
1529415300
# The compiler can only warn and ignore the option if not recognized
@@ -17491,11 +17497,11 @@ else
1749117497
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1749217498
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1749317499
-e 's:$: $lt_compiler_flag:'`
17494-
(eval echo "\"\$as_me:17494: $lt_compile\"" >&5)
17500+
(eval echo "\"\$as_me:17500: $lt_compile\"" >&5)
1749517501
(eval "$lt_compile" 2>conftest.err)
1749617502
ac_status=$?
1749717503
cat conftest.err >&5
17498-
echo "$as_me:17498: \$? = $ac_status" >&5
17504+
echo "$as_me:17504: \$? = $ac_status" >&5
1749917505
if (exit $ac_status) && test -s "$ac_outfile"; then
1750017506
# The compiler can only warn and ignore the option if not recognized
1750117507
# So say no if there are warnings other than the usual output.
@@ -17759,11 +17765,11 @@ else
1775917765
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1776017766
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1776117767
-e 's:$: $lt_compiler_flag:'`
17762-
(eval echo "\"\$as_me:17762: $lt_compile\"" >&5)
17768+
(eval echo "\"\$as_me:17768: $lt_compile\"" >&5)
1776317769
(eval "$lt_compile" 2>conftest.err)
1776417770
ac_status=$?
1776517771
cat conftest.err >&5
17766-
echo "$as_me:17766: \$? = $ac_status" >&5
17772+
echo "$as_me:17772: \$? = $ac_status" >&5
1776717773
if (exit $ac_status) && test -s "$ac_outfile"; then
1776817774
# The compiler can only warn and ignore the option if not recognized
1776917775
# So say no if there are warnings other than the usual output.
@@ -17863,11 +17869,11 @@ else
1786317869
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1786417870
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1786517871
-e 's:$: $lt_compiler_flag:'`
17866-
(eval echo "\"\$as_me:17866: $lt_compile\"" >&5)
17872+
(eval echo "\"\$as_me:17872: $lt_compile\"" >&5)
1786717873
(eval "$lt_compile" 2>out/conftest.err)
1786817874
ac_status=$?
1786917875
cat out/conftest.err >&5
17870-
echo "$as_me:17870: \$? = $ac_status" >&5
17876+
echo "$as_me:17876: \$? = $ac_status" >&5
1787117877
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1787217878
then
1787317879
# The compiler can only warn and ignore the option if not recognized
@@ -20820,11 +20826,14 @@ if test "$dependency_linking" = auto; then
2082020826
fi
2082120827
fi
2082220828

20829+
# Set up LT_LDFLAGS, user can initialize and we augment below
20830+
20831+
2082320832
if test "$dependency_linking" = yes ;
2082420833
then
20825-
LT_LDFLAGS="-no-undefined"
20834+
LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
2082620835
else
20827-
LT_LDFLAGS=
20836+
LT_LDFLAGS="$LT_LDFLAGS"
2082820837
fi
2082920838

2083020839

@@ -23324,9 +23333,9 @@ s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
2332423333
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
2332523334
s,@dos2unix@,$dos2unix,;t t
2332623335
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
23336+
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
2332723337
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
2332823338
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
23329-
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
2333023339
s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t
2333123340
s,@subdirs@,$subdirs,;t t
2333223341
s,@coin_have_doxygen@,$coin_have_doxygen,;t t

0 commit comments

Comments
 (0)