Skip to content

Commit 5fe8210

Browse files
committed
Make Clp a direct dependency and re-run autotools
1 parent 98bfe3c commit 5fe8210

File tree

5 files changed

+64
-56
lines changed

5 files changed

+64
-56
lines changed

Cbc/Makefile.in

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,11 @@ host_triplet = @host@
5757
# specified. But we need to list it as subdirectory to make sure that it is
5858
# included in the tarball
5959
@ALWAYS_FALSE@am__append_1 = test
60-
DIST_COMMON = README $(am__configure_deps) \
61-
$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
62-
$(srcdir)/Makefile.in $(srcdir)/cbc-uninstalled.pc.in \
63-
$(srcdir)/cbc.pc.in $(srcdir)/osi-cbc-uninstalled.pc.in \
64-
$(srcdir)/osi-cbc.pc.in $(top_srcdir)/configure \
65-
$(top_srcdir)/doxydoc/doxygen.conf.in \
60+
DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
61+
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62+
$(srcdir)/cbc-uninstalled.pc.in $(srcdir)/cbc.pc.in \
63+
$(srcdir)/osi-cbc-uninstalled.pc.in $(srcdir)/osi-cbc.pc.in \
64+
$(top_srcdir)/configure $(top_srcdir)/doxydoc/doxygen.conf.in \
6665
$(top_srcdir)/examples/Makefile.in AUTHORS INSTALL \
6766
config.guess config.sub depcomp install-sh ltmain.sh missing
6867
@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies

Cbc/configure

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21484,9 +21484,9 @@ if test $coin_has_clp = notGiven; then
2148421484

2148521485

2148621486
if test -n "$PKG_CONFIG" ; then
21487-
if $PKG_CONFIG --exists "osi-clp"; then
21488-
CLP_VERSIONS=`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null | tr '\n' ' '`
21489-
cflags=`$PKG_CONFIG --cflags "osi-clp" 2>/dev/null`
21487+
if $PKG_CONFIG --exists "clp osi-clp"; then
21488+
CLP_VERSIONS=`$PKG_CONFIG --modversion "clp osi-clp" 2>/dev/null | tr '\n' ' '`
21489+
cflags=`$PKG_CONFIG --cflags "clp osi-clp" 2>/dev/null`
2149021490
# pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
2149121491
# thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
2149221492
# but only do this if is not trivial
@@ -21495,8 +21495,8 @@ if test -n "$PKG_CONFIG" ; then
2149521495
cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
2149621496
fi
2149721497
CLP_CFLAGS="$cflags"
21498-
CLP_LIBS=`$PKG_CONFIG --libs "osi-clp" 2>/dev/null`
21499-
CLP_DATA=`$PKG_CONFIG --variable=datadir "osi-clp" 2>/dev/null`
21498+
CLP_LIBS=`$PKG_CONFIG --libs "clp osi-clp" 2>/dev/null`
21499+
CLP_DATA=`$PKG_CONFIG --variable=datadir "clp osi-clp" 2>/dev/null`
2150021500
coin_has_clp=yes
2150121501
echo "$as_me:$LINENO: result: yes: $CLP_VERSIONS" >&5
2150221502
echo "${ECHO_T}yes: $CLP_VERSIONS" >&6
@@ -21507,22 +21507,22 @@ echo "${ECHO_T}yes: $CLP_VERSIONS" >&6
2150721507
then
2150821508
CLP_LIBS=`echo " $CLP_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
2150921509
fi
21510-
CLP_PCREQUIRES="osi-clp"
21510+
CLP_PCREQUIRES="clp osi-clp"
2151121511

2151221512
# augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in CbcLib CbcGeneric
2151321513

21514-
CBCLIB_PCREQUIRES="osi-clp $CBCLIB_PCREQUIRES"
21514+
CBCLIB_PCREQUIRES="clp osi-clp $CBCLIB_PCREQUIRES"
2151521515
CBCLIB_CFLAGS="$CLP_CFLAGS $CBCLIB_CFLAGS"
2151621516
CBCLIB_LIBS="$CLP_LIBS $CBCLIB_LIBS"
2151721517

21518-
CBCGENERIC_PCREQUIRES="osi-clp $CBCGENERIC_PCREQUIRES"
21518+
CBCGENERIC_PCREQUIRES="clp osi-clp $CBCGENERIC_PCREQUIRES"
2151921519
CBCGENERIC_CFLAGS="$CLP_CFLAGS $CBCGENERIC_CFLAGS"
2152021520
CBCGENERIC_LIBS="$CLP_LIBS $CBCGENERIC_LIBS"
2152121521

2152221522

2152321523

2152421524
else
21525-
CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-clp"`
21525+
CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "clp osi-clp"`
2152621526
coin_has_clp=notGiven
2152721527
echo "$as_me:$LINENO: result: not given: $CLP_PKG_ERRORS" >&5
2152821528
echo "${ECHO_T}not given: $CLP_PKG_ERRORS" >&6
@@ -21558,8 +21558,8 @@ CLP_DATA_INSTALLED=
2155821558
CLP_PCLIBS=
2155921559
CLP_PCREQUIRES=
2156021560

21561-
# initial list of dependencies is "osi-clp", but we need to filter out version number specifications (= x, <= x, >= x, != x)
21562-
projtoprocess="osi-clp"
21561+
# initial list of dependencies is "clp osi-clp", but we need to filter out version number specifications (= x, <= x, >= x, != x)
21562+
projtoprocess="clp osi-clp"
2156321563

2156421564
# we first expand the list of projects to process by adding all dependencies just behind the project which depends on it
2156521565
# further, we collect the list of corresponding .pc files, but do this in reverse order, because we need this order afterwards
@@ -21760,15 +21760,15 @@ _ACEOF
2176021760
CLP_LIBS_INSTALLED=`echo " $CLP_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g'`
2176121761
fi
2176221762

21763-
CLP_PCREQUIRES="osi-clp"
21763+
CLP_PCREQUIRES="clp osi-clp"
2176421764

21765-
CBCLIB_PCREQUIRES="osi-clp $CBCLIB_PCREQUIRES"
21765+
CBCLIB_PCREQUIRES="clp osi-clp $CBCLIB_PCREQUIRES"
2176621766
CBCLIB_CFLAGS="$CLP_CFLAGS $CBCLIB_CFLAGS"
2176721767
CBCLIB_LIBS="$CLP_LIBS $CBCLIB_LIBS"
2176821768
CBCLIB_CFLAGS_INSTALLED="$CLP_CFLAGS_INSTALLED $CBCLIB_CFLAGS_INSTALLED"
2176921769
CBCLIB_LIBS_INSTALLED="$CLP_LIBS_INSTALLED $CBCLIB_LIBS_INSTALLED"
2177021770

21771-
CBCGENERIC_PCREQUIRES="osi-clp $CBCGENERIC_PCREQUIRES"
21771+
CBCGENERIC_PCREQUIRES="clp osi-clp $CBCGENERIC_PCREQUIRES"
2177221772
CBCGENERIC_CFLAGS="$CLP_CFLAGS $CBCGENERIC_CFLAGS"
2177321773
CBCGENERIC_LIBS="$CLP_LIBS $CBCGENERIC_LIBS"
2177421774
CBCGENERIC_CFLAGS_INSTALLED="$CLP_CFLAGS_INSTALLED $CBCGENERIC_CFLAGS_INSTALLED"

Cbc/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fi
6363

6464
# Clp and OsiClp are inseparable here.
6565

66-
AC_COIN_CHECK_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
66+
AC_COIN_CHECK_PACKAGE(Clp, [clp osi-clp], [CbcLib CbcGeneric])
6767
if test $coin_has_clp != yes ; then
6868
AC_MSG_ERROR("Required package Clp unavailable.")
6969
fi

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 AUTHORS INSTALL \
58-
config.guess 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
@@ -489,7 +489,7 @@ ac_subdirs_all="$ac_subdirs_all DyLP"
489489
ac_subdirs_all="$ac_subdirs_all Vol"
490490
ac_subdirs_all="$ac_subdirs_all Cgl"
491491
ac_subdirs_all="$ac_subdirs_all Cbc"
492-
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'
492+
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'
493493
ac_subst_files=''
494494

495495
# Initialize some variables set by options.
@@ -1026,6 +1026,10 @@ ac_env_CXXCPP_set=${CXXCPP+set}
10261026
ac_env_CXXCPP_value=$CXXCPP
10271027
ac_cv_env_CXXCPP_set=${CXXCPP+set}
10281028
ac_cv_env_CXXCPP_value=$CXXCPP
1029+
ac_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
1030+
ac_env_LT_LDFLAGS_value=$LT_LDFLAGS
1031+
ac_cv_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
1032+
ac_cv_env_LT_LDFLAGS_value=$LT_LDFLAGS
10291033
ac_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
10301034
ac_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS
10311035
ac_cv_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
@@ -1227,6 +1231,8 @@ Some influential environment variables:
12271231
MPIF77 Fortran MPI Compiler
12281232
CPP C preprocessor
12291233
CXXCPP C++ preprocessor
1234+
LT_LDFLAGS Flags passed to libtool when building libraries or executables
1235+
that are installed
12301236
COIN_SKIP_PROJECTS
12311237
Set to the subdirectories of projects that should be skipped in
12321238
the configuration
@@ -4174,7 +4180,7 @@ fi
41744180

41754181

41764182
# Provide some information about the compiler.
4177-
echo "$as_me:4177:" \
4183+
echo "$as_me:4183:" \
41784184
"checking for Fortran 77 compiler version" >&5
41794185
ac_compiler=`set X $ac_compile; echo $2`
41804186
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6401,7 +6407,7 @@ ia64-*-hpux*)
64016407
;;
64026408
*-*-irix6*)
64036409
# Find out which ABI we are using.
6404-
echo '#line 6404 "configure"' > conftest.$ac_ext
6410+
echo '#line 6410 "configure"' > conftest.$ac_ext
64056411
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
64066412
(eval $ac_compile) 2>&5
64076413
ac_status=$?
@@ -8365,11 +8371,11 @@ else
83658371
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
83668372
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
83678373
-e 's:$: $lt_compiler_flag:'`
8368-
(eval echo "\"\$as_me:8368: $lt_compile\"" >&5)
8374+
(eval echo "\"\$as_me:8374: $lt_compile\"" >&5)
83698375
(eval "$lt_compile" 2>conftest.err)
83708376
ac_status=$?
83718377
cat conftest.err >&5
8372-
echo "$as_me:8372: \$? = $ac_status" >&5
8378+
echo "$as_me:8378: \$? = $ac_status" >&5
83738379
if (exit $ac_status) && test -s "$ac_outfile"; then
83748380
# The compiler can only warn and ignore the option if not recognized
83758381
# So say no if there are warnings other than the usual output.
@@ -8633,11 +8639,11 @@ else
86338639
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
86348640
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
86358641
-e 's:$: $lt_compiler_flag:'`
8636-
(eval echo "\"\$as_me:8636: $lt_compile\"" >&5)
8642+
(eval echo "\"\$as_me:8642: $lt_compile\"" >&5)
86378643
(eval "$lt_compile" 2>conftest.err)
86388644
ac_status=$?
86398645
cat conftest.err >&5
8640-
echo "$as_me:8640: \$? = $ac_status" >&5
8646+
echo "$as_me:8646: \$? = $ac_status" >&5
86418647
if (exit $ac_status) && test -s "$ac_outfile"; then
86428648
# The compiler can only warn and ignore the option if not recognized
86438649
# So say no if there are warnings other than the usual output.
@@ -8737,11 +8743,11 @@ else
87378743
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
87388744
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
87398745
-e 's:$: $lt_compiler_flag:'`
8740-
(eval echo "\"\$as_me:8740: $lt_compile\"" >&5)
8746+
(eval echo "\"\$as_me:8746: $lt_compile\"" >&5)
87418747
(eval "$lt_compile" 2>out/conftest.err)
87428748
ac_status=$?
87438749
cat out/conftest.err >&5
8744-
echo "$as_me:8744: \$? = $ac_status" >&5
8750+
echo "$as_me:8750: \$? = $ac_status" >&5
87458751
if (exit $ac_status) && test -s out/conftest2.$ac_objext
87468752
then
87478753
# The compiler can only warn and ignore the option if not recognized
@@ -11082,7 +11088,7 @@ else
1108211088
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1108311089
lt_status=$lt_dlunknown
1108411090
cat > conftest.$ac_ext <<EOF
11085-
#line 11085 "configure"
11091+
#line 11091 "configure"
1108611092
#include "confdefs.h"
1108711093

1108811094
#if HAVE_DLFCN_H
@@ -11182,7 +11188,7 @@ else
1118211188
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1118311189
lt_status=$lt_dlunknown
1118411190
cat > conftest.$ac_ext <<EOF
11185-
#line 11185 "configure"
11191+
#line 11191 "configure"
1118611192
#include "confdefs.h"
1118711193

1118811194
#if HAVE_DLFCN_H
@@ -13526,11 +13532,11 @@ else
1352613532
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1352713533
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1352813534
-e 's:$: $lt_compiler_flag:'`
13529-
(eval echo "\"\$as_me:13529: $lt_compile\"" >&5)
13535+
(eval echo "\"\$as_me:13535: $lt_compile\"" >&5)
1353013536
(eval "$lt_compile" 2>conftest.err)
1353113537
ac_status=$?
1353213538
cat conftest.err >&5
13533-
echo "$as_me:13533: \$? = $ac_status" >&5
13539+
echo "$as_me:13539: \$? = $ac_status" >&5
1353413540
if (exit $ac_status) && test -s "$ac_outfile"; then
1353513541
# The compiler can only warn and ignore the option if not recognized
1353613542
# So say no if there are warnings other than the usual output.
@@ -13630,11 +13636,11 @@ else
1363013636
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1363113637
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1363213638
-e 's:$: $lt_compiler_flag:'`
13633-
(eval echo "\"\$as_me:13633: $lt_compile\"" >&5)
13639+
(eval echo "\"\$as_me:13639: $lt_compile\"" >&5)
1363413640
(eval "$lt_compile" 2>out/conftest.err)
1363513641
ac_status=$?
1363613642
cat out/conftest.err >&5
13637-
echo "$as_me:13637: \$? = $ac_status" >&5
13643+
echo "$as_me:13643: \$? = $ac_status" >&5
1363813644
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1363913645
then
1364013646
# The compiler can only warn and ignore the option if not recognized
@@ -15200,11 +15206,11 @@ else
1520015206
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1520115207
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1520215208
-e 's:$: $lt_compiler_flag:'`
15203-
(eval echo "\"\$as_me:15203: $lt_compile\"" >&5)
15209+
(eval echo "\"\$as_me:15209: $lt_compile\"" >&5)
1520415210
(eval "$lt_compile" 2>conftest.err)
1520515211
ac_status=$?
1520615212
cat conftest.err >&5
15207-
echo "$as_me:15207: \$? = $ac_status" >&5
15213+
echo "$as_me:15213: \$? = $ac_status" >&5
1520815214
if (exit $ac_status) && test -s "$ac_outfile"; then
1520915215
# The compiler can only warn and ignore the option if not recognized
1521015216
# So say no if there are warnings other than the usual output.
@@ -15304,11 +15310,11 @@ else
1530415310
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1530515311
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1530615312
-e 's:$: $lt_compiler_flag:'`
15307-
(eval echo "\"\$as_me:15307: $lt_compile\"" >&5)
15313+
(eval echo "\"\$as_me:15313: $lt_compile\"" >&5)
1530815314
(eval "$lt_compile" 2>out/conftest.err)
1530915315
ac_status=$?
1531015316
cat out/conftest.err >&5
15311-
echo "$as_me:15311: \$? = $ac_status" >&5
15317+
echo "$as_me:15317: \$? = $ac_status" >&5
1531215318
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1531315319
then
1531415320
# The compiler can only warn and ignore the option if not recognized
@@ -17511,11 +17517,11 @@ else
1751117517
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1751217518
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1751317519
-e 's:$: $lt_compiler_flag:'`
17514-
(eval echo "\"\$as_me:17514: $lt_compile\"" >&5)
17520+
(eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
1751517521
(eval "$lt_compile" 2>conftest.err)
1751617522
ac_status=$?
1751717523
cat conftest.err >&5
17518-
echo "$as_me:17518: \$? = $ac_status" >&5
17524+
echo "$as_me:17524: \$? = $ac_status" >&5
1751917525
if (exit $ac_status) && test -s "$ac_outfile"; then
1752017526
# The compiler can only warn and ignore the option if not recognized
1752117527
# So say no if there are warnings other than the usual output.
@@ -17779,11 +17785,11 @@ else
1777917785
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1778017786
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1778117787
-e 's:$: $lt_compiler_flag:'`
17782-
(eval echo "\"\$as_me:17782: $lt_compile\"" >&5)
17788+
(eval echo "\"\$as_me:17788: $lt_compile\"" >&5)
1778317789
(eval "$lt_compile" 2>conftest.err)
1778417790
ac_status=$?
1778517791
cat conftest.err >&5
17786-
echo "$as_me:17786: \$? = $ac_status" >&5
17792+
echo "$as_me:17792: \$? = $ac_status" >&5
1778717793
if (exit $ac_status) && test -s "$ac_outfile"; then
1778817794
# The compiler can only warn and ignore the option if not recognized
1778917795
# So say no if there are warnings other than the usual output.
@@ -17883,11 +17889,11 @@ else
1788317889
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1788417890
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1788517891
-e 's:$: $lt_compiler_flag:'`
17886-
(eval echo "\"\$as_me:17886: $lt_compile\"" >&5)
17892+
(eval echo "\"\$as_me:17892: $lt_compile\"" >&5)
1788717893
(eval "$lt_compile" 2>out/conftest.err)
1788817894
ac_status=$?
1788917895
cat out/conftest.err >&5
17890-
echo "$as_me:17890: \$? = $ac_status" >&5
17896+
echo "$as_me:17896: \$? = $ac_status" >&5
1789117897
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1789217898
then
1789317899
# The compiler can only warn and ignore the option if not recognized
@@ -20840,11 +20846,14 @@ if test "$dependency_linking" = auto; then
2084020846
fi
2084120847
fi
2084220848

20849+
# Set up LT_LDFLAGS, user can initialize and we augment below
20850+
20851+
2084320852
if test "$dependency_linking" = yes ;
2084420853
then
20845-
LT_LDFLAGS="-no-undefined"
20854+
LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
2084620855
else
20847-
LT_LDFLAGS=
20856+
LT_LDFLAGS="$LT_LDFLAGS"
2084820857
fi
2084920858

2085020859

@@ -23908,9 +23917,9 @@ s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
2390823917
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
2390923918
s,@dos2unix@,$dos2unix,;t t
2391023919
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
23920+
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
2391123921
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
2391223922
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
23913-
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
2391423923
s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t
2391523924
s,@subdirs@,$subdirs,;t t
2391623925
s,@coin_have_doxygen@,$coin_have_doxygen,;t t

0 commit comments

Comments
 (0)