Changeset 3099 for ThirdParty/Glpk


Ignore:
Timestamp:
Nov 21, 2013 2:55:50 PM (6 years ago)
Author:
stefan
Message:

conditional addition of dependent libraries into project libs via LIBADD

Location:
ThirdParty/Glpk/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.am

    r2639 r3099  
    152152  -I$(GLPKDIR)
    153153
     154if DEPENDENCY_LINKING
     155libcoinglpk_la_LIBADD = $(GLPK_PCLIBS)
     156endif
     157
    154158libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    155159
  • ThirdParty/Glpk/trunk/Makefile.in

    r2887 r3099  
    8282libLTLIBRARIES_INSTALL = $(INSTALL)
    8383LTLIBRARIES = $(lib_LTLIBRARIES)
    84 libcoinglpk_la_LIBADD =
     84am__DEPENDENCIES_1 =
     85@DEPENDENCY_LINKING_TRUE@libcoinglpk_la_DEPENDENCIES =  \
     86@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    8587am_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
    8688        glpapi04.lo glpapi05.lo glpapi06.lo glpapi07.lo glpapi08.lo \
     
    174176DEFS = @DEFS@
    175177DEPDIR = @DEPDIR@
     178DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     179DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    176180ECHO = @ECHO@
    177181ECHO_C = @ECHO_C@
     
    420424  -I$(GLPKDIR)
    421425
     426@DEPENDENCY_LINKING_TRUE@libcoinglpk_la_LIBADD = $(GLPK_PCLIBS)
    422427libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    423428thirdpartyincludedir = $(includedir)/coin/ThirdParty
  • ThirdParty/Glpk/trunk/configure

    r3059 r3099  
    473473#endif"
    474474
    475 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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV 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 PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver GLPKDIR GLPK_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV 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 PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS glpkmajorver glpkminorver GLPKDIR GLPK_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2007320073# AC_MSG_NOTICE([End of INIT_AUTO_TOOLS.])
    2007420074
     20075# Check whether --enable-dependency-linking or --disable-dependency-linking was given.
     20076if test "${enable_dependency_linking+set}" = set; then
     20077  enableval="$enable_dependency_linking"
     20078  dependency_linking="$enableval"
     20079else
     20080  dependency_linking=no
     20081fi;
     20082
    2007520083# ToDo
    2007620084# For now, don't use the -no-undefined flag, since the Makefiles are
    2007720085# not yet set up that way.  But we need to fix this, when we want
    2007820086# to comile DLLs under Windows.
    20079 LT_LDFLAGS=
     20087if test "$dependency_linking" = yes ;
     20088then
     20089  LT_LDFLAGS="-no-undefined"
     20090else
     20091  LT_LDFLAGS=
     20092fi
     20093
     20094
     20095
     20096if test "$dependency_linking" = yes; then
     20097  DEPENDENCY_LINKING_TRUE=
     20098  DEPENDENCY_LINKING_FALSE='#'
     20099else
     20100  DEPENDENCY_LINKING_TRUE='#'
     20101  DEPENDENCY_LINKING_FALSE=
     20102fi
     20103
    2008020104
    2008120105# Check if we want to set the library version
     
    2215622180Usually this means the macro was only invoked conditionally." >&5
    2215722181echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
     22182Usually this means the macro was only invoked conditionally." >&2;}
     22183   { (exit 1); exit 1; }; }
     22184fi
     22185if test -z "${DEPENDENCY_LINKING_TRUE}" && test -z "${DEPENDENCY_LINKING_FALSE}"; then
     22186  { { echo "$as_me:$LINENO: error: conditional \"DEPENDENCY_LINKING\" was never defined.
     22187Usually this means the macro was only invoked conditionally." >&5
     22188echo "$as_me: error: conditional \"DEPENDENCY_LINKING\" was never defined.
    2215822189Usually this means the macro was only invoked conditionally." >&2;}
    2215922190   { (exit 1); exit 1; }; }
     
    2279422825s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
    2279522826s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
     22827s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
     22828s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t
    2279622829s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2279722830s,@glpkmajorver@,$glpkmajorver,;t t
Note: See TracChangeset for help on using the changeset viewer.