Skip to content

Commit

Permalink
Make Clp a direct dependency and re-run autotools
Browse files Browse the repository at this point in the history
  • Loading branch information
tkralphs committed Jan 10, 2022
1 parent 98bfe3c commit 5fe8210
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 56 deletions.
11 changes: 5 additions & 6 deletions Cbc/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,11 @@ host_triplet = @host@
# specified. But we need to list it as subdirectory to make sure that it is
# included in the tarball
@ALWAYS_FALSE@am__append_1 = test
DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/cbc-uninstalled.pc.in \
$(srcdir)/cbc.pc.in $(srcdir)/osi-cbc-uninstalled.pc.in \
$(srcdir)/osi-cbc.pc.in $(top_srcdir)/configure \
$(top_srcdir)/doxydoc/doxygen.conf.in \
DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/cbc-uninstalled.pc.in $(srcdir)/cbc.pc.in \
$(srcdir)/osi-cbc-uninstalled.pc.in $(srcdir)/osi-cbc.pc.in \
$(top_srcdir)/configure $(top_srcdir)/doxydoc/doxygen.conf.in \
$(top_srcdir)/examples/Makefile.in AUTHORS INSTALL \
config.guess config.sub depcomp install-sh ltmain.sh missing
@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
Expand Down
28 changes: 14 additions & 14 deletions Cbc/configure
Original file line number Diff line number Diff line change
Expand Up @@ -21484,9 +21484,9 @@ if test $coin_has_clp = notGiven; then


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

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

CBCLIB_PCREQUIRES="osi-clp $CBCLIB_PCREQUIRES"
CBCLIB_PCREQUIRES="clp osi-clp $CBCLIB_PCREQUIRES"
CBCLIB_CFLAGS="$CLP_CFLAGS $CBCLIB_CFLAGS"
CBCLIB_LIBS="$CLP_LIBS $CBCLIB_LIBS"

CBCGENERIC_PCREQUIRES="osi-clp $CBCGENERIC_PCREQUIRES"
CBCGENERIC_PCREQUIRES="clp osi-clp $CBCGENERIC_PCREQUIRES"
CBCGENERIC_CFLAGS="$CLP_CFLAGS $CBCGENERIC_CFLAGS"
CBCGENERIC_LIBS="$CLP_LIBS $CBCGENERIC_LIBS"



else
CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-clp"`
CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "clp osi-clp"`
coin_has_clp=notGiven
echo "$as_me:$LINENO: result: not given: $CLP_PKG_ERRORS" >&5
echo "${ECHO_T}not given: $CLP_PKG_ERRORS" >&6
Expand Down Expand Up @@ -21558,8 +21558,8 @@ CLP_DATA_INSTALLED=
CLP_PCLIBS=
CLP_PCREQUIRES=

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

# we first expand the list of projects to process by adding all dependencies just behind the project which depends on it
# further, we collect the list of corresponding .pc files, but do this in reverse order, because we need this order afterwards
Expand Down Expand Up @@ -21760,15 +21760,15 @@ _ACEOF
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'`
fi

CLP_PCREQUIRES="osi-clp"
CLP_PCREQUIRES="clp osi-clp"

CBCLIB_PCREQUIRES="osi-clp $CBCLIB_PCREQUIRES"
CBCLIB_PCREQUIRES="clp osi-clp $CBCLIB_PCREQUIRES"
CBCLIB_CFLAGS="$CLP_CFLAGS $CBCLIB_CFLAGS"
CBCLIB_LIBS="$CLP_LIBS $CBCLIB_LIBS"
CBCLIB_CFLAGS_INSTALLED="$CLP_CFLAGS_INSTALLED $CBCLIB_CFLAGS_INSTALLED"
CBCLIB_LIBS_INSTALLED="$CLP_LIBS_INSTALLED $CBCLIB_LIBS_INSTALLED"

CBCGENERIC_PCREQUIRES="osi-clp $CBCGENERIC_PCREQUIRES"
CBCGENERIC_PCREQUIRES="clp osi-clp $CBCGENERIC_PCREQUIRES"
CBCGENERIC_CFLAGS="$CLP_CFLAGS $CBCGENERIC_CFLAGS"
CBCGENERIC_LIBS="$CLP_LIBS $CBCGENERIC_LIBS"
CBCGENERIC_CFLAGS_INSTALLED="$CLP_CFLAGS_INSTALLED $CBCGENERIC_CFLAGS_INSTALLED"
Expand Down
2 changes: 1 addition & 1 deletion Cbc/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fi

# Clp and OsiClp are inseparable here.

AC_COIN_CHECK_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
AC_COIN_CHECK_PACKAGE(Clp, [clp osi-clp], [CbcLib CbcGeneric])
if test $coin_has_clp != yes ; then
AC_MSG_ERROR("Required package Clp unavailable.")
fi
Expand Down
14 changes: 7 additions & 7 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure \
$(top_srcdir)/doxydoc/doxygen.conf.in AUTHORS INSTALL \
config.guess config.sub depcomp install-sh ltmain.sh missing
DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure $(top_srcdir)/doxydoc/doxygen.conf.in \
AUTHORS INSTALL config.guess config.sub depcomp install-sh \
ltmain.sh missing
@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
subdir = .
Expand Down Expand Up @@ -261,7 +261,7 @@ SUBDIRS = $(subdirs)
# Files that are generated and should be cleaned with make distclean
DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
$(VPATH_DISTCLEANFILES)
DocFiles = README AUTHORS LICENSE
DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md
DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
Expand Down Expand Up @@ -828,7 +828,7 @@ uninstall-all-doxygen-docs:
fi ; \
done ;

install-doc: $(DocFiles)
install-doc:
test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
for file in $(DocFiles); do \
if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
Expand Down
65 changes: 37 additions & 28 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ ac_subdirs_all="$ac_subdirs_all DyLP"
ac_subdirs_all="$ac_subdirs_all Vol"
ac_subdirs_all="$ac_subdirs_all Cgl"
ac_subdirs_all="$ac_subdirs_all Cbc"
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'
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'
ac_subst_files=''

# Initialize some variables set by options.
Expand Down Expand Up @@ -1026,6 +1026,10 @@ ac_env_CXXCPP_set=${CXXCPP+set}
ac_env_CXXCPP_value=$CXXCPP
ac_cv_env_CXXCPP_set=${CXXCPP+set}
ac_cv_env_CXXCPP_value=$CXXCPP
ac_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
ac_env_LT_LDFLAGS_value=$LT_LDFLAGS
ac_cv_env_LT_LDFLAGS_set=${LT_LDFLAGS+set}
ac_cv_env_LT_LDFLAGS_value=$LT_LDFLAGS
ac_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
ac_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS
ac_cv_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
Expand Down Expand Up @@ -1227,6 +1231,8 @@ Some influential environment variables:
MPIF77 Fortran MPI Compiler
CPP C preprocessor
CXXCPP C++ preprocessor
LT_LDFLAGS Flags passed to libtool when building libraries or executables
that are installed
COIN_SKIP_PROJECTS
Set to the subdirectories of projects that should be skipped in
the configuration
Expand Down Expand Up @@ -4174,7 +4180,7 @@ fi


# Provide some information about the compiler.
echo "$as_me:4177:" \
echo "$as_me:4183:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
Expand Down Expand Up @@ -6401,7 +6407,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6404 "configure"' > conftest.$ac_ext
echo '#line 6410 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
Expand Down Expand Up @@ -8365,11 +8371,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8368: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8374: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8372: \$? = $ac_status" >&5
echo "$as_me:8378: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -8633,11 +8639,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8636: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8642: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8640: \$? = $ac_status" >&5
echo "$as_me:8646: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -8737,11 +8743,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8740: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8746: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:8744: \$? = $ac_status" >&5
echo "$as_me:8750: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -11082,7 +11088,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11085 "configure"
#line 11091 "configure"
#include "confdefs.h"

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

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -13526,11 +13532,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13529: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13535: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13533: \$? = $ac_status" >&5
echo "$as_me:13539: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -13630,11 +13636,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:13633: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13639: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:13637: \$? = $ac_status" >&5
echo "$as_me:13643: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -15200,11 +15206,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15203: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15209: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15207: \$? = $ac_status" >&5
echo "$as_me:15213: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -15304,11 +15310,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15307: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15311: \$? = $ac_status" >&5
echo "$as_me:15317: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -17511,11 +17517,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17514: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17518: \$? = $ac_status" >&5
echo "$as_me:17524: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -17779,11 +17785,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17782: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17788: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:17786: \$? = $ac_status" >&5
echo "$as_me:17792: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -17883,11 +17889,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:17886: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17892: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:17890: \$? = $ac_status" >&5
echo "$as_me:17896: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -20840,11 +20846,14 @@ if test "$dependency_linking" = auto; then
fi
fi

# Set up LT_LDFLAGS, user can initialize and we augment below


if test "$dependency_linking" = yes ;
then
LT_LDFLAGS="-no-undefined"
LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
else
LT_LDFLAGS=
LT_LDFLAGS="$LT_LDFLAGS"
fi


Expand Down Expand Up @@ -23908,9 +23917,9 @@ s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
s,@dos2unix@,$dos2unix,;t t
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t
s,@subdirs@,$subdirs,;t t
s,@coin_have_doxygen@,$coin_have_doxygen,;t t
Expand Down

0 comments on commit 5fe8210

Please sign in to comment.