Changeset 2310


Ignore:
Timestamp:
Jun 19, 2011 10:23:22 AM (8 years ago)
Author:
stefan
Message:

sync with trunk rev2309

Location:
ThirdParty/Glpk/stable/1.8
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/stable/1.8

  • ThirdParty/Glpk/stable/1.8/Makefile.am

    r2213 r2310  
    134134
    135135thirdpartyincludedir = $(includedir)/coin/ThirdParty
    136 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
     136thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h $(GLPKDIR)/src/amd/amd.h
    137137
    138138pkgconfiglibdir = $(libdir)/pkgconfig
    139139pkgconfiglib_DATA = coinglpk.pc
    140 
    141 if COIN_HAS_PKGCONFIG
    142 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
    143        
    144 install-data-hook:
    145         @$(mkdir_p) "$(addlibsdir)"
    146         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    147         $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
    148        
    149 uninstall-hook:
    150         rm -f $(addlibsdir)/glpk_addlibs.txt
    151 endif
    152140
    153141test:
  • ThirdParty/Glpk/stable/1.8/Makefile.in

    r2068 r2310  
    5959        $(top_srcdir)/configure config.guess config.sub depcomp \
    6060        install-sh ltmain.sh missing
    61 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    62 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     61@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     62@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6363subdir = .
    6464ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    400400libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    401401thirdpartyincludedir = $(includedir)/coin/ThirdParty
    402 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
     402thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h $(GLPKDIR)/src/amd/amd.h
    403403pkgconfiglibdir = $(libdir)/pkgconfig
    404404pkgconfiglib_DATA = coinglpk.pc
    405 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Glpk
    406405
    407406########################################################################
     
    14901489        $(am__remove_distdir)
    14911490        mkdir $(distdir)
    1492         $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/BuildTools
     1491        $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/$(GLPKDIR)/src/amd $(distdir)/. $(distdir)/BuildTools
    14931492        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14941493        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    16471646        @echo "This command is intended for maintainers to use"
    16481647        @echo "it deletes files that may require special tools to rebuild."
    1649 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    1650 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    16511648clean: clean-am
    16521649
     
    16731670install-data-am: install-pkgconfiglibDATA \
    16741671        install-thirdpartyincludeHEADERS
    1675         @$(NORMAL_INSTALL)
    1676         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    16771672
    16781673install-exec-am: install-libLTLIBRARIES
     
    17061701uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    17071702        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    1708         @$(NORMAL_INSTALL)
    1709         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    17101703
    17111704.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    17161709        distdir distuninstallcheck dvi dvi-am html html-am info \
    17171710        info-am install install-am install-data install-data-am \
    1718         install-data-hook install-exec install-exec-am install-info \
    1719         install-info-am install-libLTLIBRARIES install-man \
    1720         install-pkgconfiglibDATA install-strip \
    1721         install-thirdpartyincludeHEADERS installcheck installcheck-am \
    1722         installdirs maintainer-clean maintainer-clean-generic \
    1723         mostlyclean mostlyclean-compile mostlyclean-generic \
    1724         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    1725         uninstall-am uninstall-hook uninstall-info-am \
     1711        install-exec install-exec-am install-info install-info-am \
     1712        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     1713        install-strip install-thirdpartyincludeHEADERS installcheck \
     1714        installcheck-am installdirs maintainer-clean \
     1715        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1716        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1717        tags uninstall uninstall-am uninstall-info-am \
    17261718        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
    17271719        uninstall-thirdpartyincludeHEADERS
    17281720
    17291721
    1730 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    1731 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    1732 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    1733 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinglpk > $(addlibsdir)/glpk_addlibs.txt
    1734 
    1735 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    1736 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/glpk_addlibs.txt
    1737 
    1738 test: $(libampl)
     1722test:
    17391723        @echo "No test available for Glpk."
    17401724
     
    17781762@MAINTAINER_MODE_TRUE@  cp $< $@
    17791763
    1780 # Take care of updating externals (if Externals file exists)
    1781 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    1782 
    1783 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    1784 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    1785 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    1786 
    1787 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     1764# Take care of updating externals (if Dependencies file exists)
     1765@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     1766
     1767@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     1768@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     1769@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     1770
     1771@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    17881772@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    17891773
  • ThirdParty/Glpk/stable/1.8/coinglpk-uninstalled.pc.in

    r2068 r2310  
    77Version: @glpkmajorver@.@glpkminorver@
    88Libs: ${libdir}/libcoinglpk.la @GLPK_PCLIBS@
    9 Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/glpk/include
     9Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/glpk/include -I@abs_source_dir@/glpk/src/amd
  • ThirdParty/Glpk/stable/1.8/config_glpk.h.in

    r1585 r2310  
    1515/* Version number of project */
    1616#undef GLPK_VERSION
     17
     18/* Major Version number of project */
     19#undef GLPK_VERSION_MAJOR
     20
     21/* Minor Version number of project */
     22#undef GLPK_VERSION_MINOR
     23
     24/* Release Version number of project */
     25#undef GLPK_VERSION_RELEASE
    1726
    1827/* Define to 1 if dlfcn support is available */
  • ThirdParty/Glpk/stable/1.8/configure

    r2068 r2310  
    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 COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP 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 LN_S 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 COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE 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_pt_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 COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR GLPK_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10601060  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    10611061  --enable-debug          compile all projects with debug options tests
    1062   --enable-debug-glpk compile this project (Glpk) with debug options
     1062                          (implies --disable-shared)
     1063  --enable-debug-glpk compile project Glpk with debug compiler flags
    10631064  --enable-doscompile     Under Cygwin, compile so that executables run under
    10641065                          DOS. Set to mingw to use gcc/g++/ld with
     
    10661067                          icl/link). Default when mentioned: mingw. Default
    10671068                          when not mentioned: disabled.
    1068   --enable-pkg-config     use pkg-config if available (default is yes)
     1069  --disable-pkg-config    disable use of pkg-config (if available)
    10691070  --enable-static[=PKGS]
    10701071                          build static libraries [default=no]
     
    16041605coin_projectdir=yes
    16051606
    1606 # Set the project's version number
    1607 if test "xGlpk" != x; then
     1607# Set the project's version numbers
     1608
    16081609
    16091610cat >>confdefs.h <<_ACEOF
     
    16111612_ACEOF
    16121613
    1613 fi
    1614 
    1615 # Set the project's SVN revision number. The complicated sed expression
    1616 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    1617 # as a single number.
    1618 # Extract the first word of "svnversion", so it can be a program name with args.
     1614
     1615  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
     1616  coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
     1617  coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
     1618  if test "x$coin_majorver" = x ; then coin_majorver=9999 ; fi
     1619  if test "x$coin_minorver" = x ; then coin_minorver=9999 ; fi
     1620  if test "x$coin_releasever" = x ; then coin_releasever=9999 ; fi
     1621
     1622cat >>confdefs.h <<_ACEOF
     1623#define GLPK_VERSION_MAJOR $coin_majorver
     1624_ACEOF
     1625
     1626
     1627cat >>confdefs.h <<_ACEOF
     1628#define GLPK_VERSION_MINOR $coin_minorver
     1629_ACEOF
     1630
     1631
     1632cat >>confdefs.h <<_ACEOF
     1633#define GLPK_VERSION_RELEASE $coin_releasever
     1634_ACEOF
     1635
     1636
     1637  # We use the following variable to have a string with the upper case
     1638  # version of the project name
     1639  COIN_PRJCT=GLPK
     1640
     1641  # Set the project's SVN revision number. The complicated sed expression
     1642  # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1643  # as a single number.
     1644  # Extract the first word of "svnversion", so it can be a program name with args.
    16191645set dummy svnversion; ac_word=$2
    16201646echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    16521678fi
    16531679
    1654 if test "x$have_svnversion" = xyes && test "xGlpk" != x; then
    1655 
    1656   svn_rev_tmp=`cd $srcdir/$coin_has_glpk ; svnversion`
    1657   GLPK_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    1658   if test $GLPK_SVN_REV != exported; then
     1680  if test "x$have_svnversion" = xyes; then
     1681
     1682    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
     1683    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     1684      GLPK_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16591685
    16601686cat >>confdefs.h <<_ACEOF
     
    16621688_ACEOF
    16631689
     1690    fi
    16641691  fi
    1665 fi
     1692
     1693
    16661694
    16671695# Capture libtool library version, if given.
     1696
    16681697
    16691698
     
    17661795  case "${enableval}" in
    17671796    yes) coin_debug_compile=true
    1768          enable_shared=no
    17691797         ;;
    17701798    no)  coin_debug_compile=false
     
    18211849#define COIN_GLPK_CHECKLEVEL $coin_glpk_checklevel
    18221850_ACEOF
    1823 
    1824 
    1825 # We use the following variable to have a string with the upper case
    1826 # version of the project name
    1827 COIN_PRJCT=GLPK
    18281851
    18291852
     
    19061929  esac
    19071930fi
    1908 
    1909 # add automake conditional so we can recognize cl compiler in makefile
    1910 coin_cc_is_cl=false
    1911 if test x"$CXX" != x; then
    1912   case "$CXX" in
    1913     cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    1914       coin_cc_is_cl=true
    1915       ;;
    1916   esac
    1917 fi
    1918 
    1919 
    1920 if test $coin_cc_is_cl = true; then
    1921   COIN_CC_IS_CL_TRUE=
    1922   COIN_CC_IS_CL_FALSE='#'
    1923 else
    1924   COIN_CC_IS_CL_TRUE='#'
    1925   COIN_CC_IS_CL_FALSE=
    1926 fi
    1927 
    19281931
    19291932
     
    27452748CFLAGS="$save_cflags"
    27462749
     2750# add automake conditional so we can recognize cl compiler in makefile
     2751coin_cc_is_cl=false
     2752case "$CC" in
     2753  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     2754    coin_cc_is_cl=true
     2755    ;;
     2756esac
     2757
     2758
     2759if test $coin_cc_is_cl = true; then
     2760  COIN_CC_IS_CL_TRUE=
     2761  COIN_CC_IS_CL_FALSE='#'
     2762else
     2763  COIN_CC_IS_CL_TRUE='#'
     2764  COIN_CC_IS_CL_FALSE=
     2765fi
     2766
     2767
    27472768# Check if a project specific CFLAGS variable has been set
    27482769if test x$COIN_PRJCT != x; then
     
    27672788        coin_opt_cflags="-O3"
    27682789        coin_add_cflags="-pipe"
    2769         coin_dbg_cflags="-g"
    2770         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     2790        coin_dbg_cflags="-g -O0"
     2791        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    27712792        case $build in
    27722793          *-darwin*)
     
    30333054esac
    30343055
     3056# add -DPROJECT_BUILD to signal compiler preprocessor which config header file to include
     3057if test x$COIN_PRJCT != x; then
     3058  CFLAGS="$CFLAGS -D${COIN_PRJCT}_BUILD"
     3059fi
     3060
    30353061# Try if CFLAGS works
    30363062save_CFLAGS="$CFLAGS"
     
    32783304  fi
    32793305  if test -n "$PKG_CONFIG"; then
    3280     _pkg_min_version=0.9.0
     3306    _pkg_min_version=0.16.0
    32813307    echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
    32823308echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
     
    33193345# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    33203346if test "x${prefix}" = xNONE ; then
    3321   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    3322 else
    3323   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3347  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3348else
     3349  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    33243350fi
    33253351
     
    33333359   { (exit 1); exit 1; }; }
    33343360   fi
    3335    COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3361   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    33363362
    33373363fi;
     
    33693395
    33703396
     3397fi
     3398
     3399if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
     3400  { echo "$as_me:$LINENO: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&5
     3401echo "$as_me: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&2;}
    33713402fi
    33723403
     
    34613492 EGREP=$ac_cv_prog_egrep
    34623493
     3494
     3495echo "$as_me:$LINENO: checking whether ln -s works" >&5
     3496echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
     3497LN_S=$as_ln_s
     3498if test "$LN_S" = "ln -s"; then
     3499  echo "$as_me:$LINENO: result: yes" >&5
     3500echo "${ECHO_T}yes" >&6
     3501else
     3502  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
     3503echo "${ECHO_T}no, using $LN_S" >&6
     3504fi
    34633505
    34643506am__api_version="1.9"
     
    37913833
    37923834
     3835
    37933836# AC_MSG_NOTICE([Beginning automake initialisation.])
    37943837# Stuff for automake
     
    43244367
    43254368
    4326   # Check if we have an Externals file
    4327   if test -r $srcdir/Externals; then
     4369  # Check if we have an Dependencies file
     4370  if test -r $srcdir/Dependencies; then
    43284371    coin_have_externals=yes
    43294372  fi
     
    43984441        { { echo "$as_me:$LINENO: error: Cannot find the BuildTools directory" >&5
    43994442echo "$as_me: error: Cannot find the BuildTools directory" >&2;}
    4400    { (exit 1); exit 1; }; }
     4443   { (exit better disable maintainer mode.); exit better disable maintainer mode.; }; }
    44014444      fi
    44024445    fi
    44034446  fi
    44044447
     4448
     4449  # for running automake by make, we need to have Makemain.inc available at the place where it usually can be found during run_autotools
     4450  if test "$BUILDTOOLSDIR" != "$srcdir/BuildTools" ; then
     4451    $LN_S `cd $BUILDTOOLSDIR; pwd` "$srcdir/BuildTools"
     4452  fi
    44054453
    44064454  # The following variable is set to the name of the directory where
     
    47704818NM="$lt_cv_path_NM"
    47714819
    4772 echo "$as_me:$LINENO: checking whether ln -s works" >&5
    4773 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    4774 LN_S=$as_ln_s
    4775 if test "$LN_S" = "ln -s"; then
    4776   echo "$as_me:$LINENO: result: yes" >&5
    4777 echo "${ECHO_T}yes" >&6
    4778 else
    4779   echo "$as_me:$LINENO: result: no, using $LN_S" >&5
    4780 echo "${ECHO_T}no, using $LN_S" >&6
    4781 fi
    4782 
    47834820echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
    47844821echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
     
    50065043*-*-irix6*)
    50075044  # Find out which ABI we are using.
    5008   echo '#line 5008 "configure"' > conftest.$ac_ext
     5045  echo '#line 5045 "configure"' > conftest.$ac_ext
    50095046  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    50105047  (eval $ac_compile) 2>&5
     
    66056642
    66066643# Provide some information about the compiler.
    6607 echo "$as_me:6607:" \
     6644echo "$as_me:6644:" \
    66086645     "checking for Fortran 77 compiler version" >&5
    66096646ac_compiler=`set X $ac_compile; echo $2`
     
    76727709   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76737710   -e 's:$: $lt_compiler_flag:'`
    7674    (eval echo "\"\$as_me:7674: $lt_compile\"" >&5)
     7711   (eval echo "\"\$as_me:7711: $lt_compile\"" >&5)
    76757712   (eval "$lt_compile" 2>conftest.err)
    76767713   ac_status=$?
    76777714   cat conftest.err >&5
    7678    echo "$as_me:7678: \$? = $ac_status" >&5
     7715   echo "$as_me:7715: \$? = $ac_status" >&5
    76797716   if (exit $ac_status) && test -s "$ac_outfile"; then
    76807717     # The compiler can only warn and ignore the option if not recognized
     
    79407977   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79417978   -e 's:$: $lt_compiler_flag:'`
    7942    (eval echo "\"\$as_me:7942: $lt_compile\"" >&5)
     7979   (eval echo "\"\$as_me:7979: $lt_compile\"" >&5)
    79437980   (eval "$lt_compile" 2>conftest.err)
    79447981   ac_status=$?
    79457982   cat conftest.err >&5
    7946    echo "$as_me:7946: \$? = $ac_status" >&5
     7983   echo "$as_me:7983: \$? = $ac_status" >&5
    79477984   if (exit $ac_status) && test -s "$ac_outfile"; then
    79487985     # The compiler can only warn and ignore the option if not recognized
     
    80448081   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80458082   -e 's:$: $lt_compiler_flag:'`
    8046    (eval echo "\"\$as_me:8046: $lt_compile\"" >&5)
     8083   (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
    80478084   (eval "$lt_compile" 2>out/conftest.err)
    80488085   ac_status=$?
    80498086   cat out/conftest.err >&5
    8050    echo "$as_me:8050: \$? = $ac_status" >&5
     8087   echo "$as_me:8087: \$? = $ac_status" >&5
    80518088   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80528089   then
     
    1038910426  lt_status=$lt_dlunknown
    1039010427  cat > conftest.$ac_ext <<EOF
    10391 #line 10391 "configure"
     10428#line 10428 "configure"
    1039210429#include "confdefs.h"
    1039310430
     
    1048910526  lt_status=$lt_dlunknown
    1049010527  cat > conftest.$ac_ext <<EOF
    10491 #line 10491 "configure"
     10528#line 10528 "configure"
    1049210529#include "confdefs.h"
    1049310530
     
    1283312870   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1283412871   -e 's:$: $lt_compiler_flag:'`
    12835    (eval echo "\"\$as_me:12835: $lt_compile\"" >&5)
     12872   (eval echo "\"\$as_me:12872: $lt_compile\"" >&5)
    1283612873   (eval "$lt_compile" 2>conftest.err)
    1283712874   ac_status=$?
    1283812875   cat conftest.err >&5
    12839    echo "$as_me:12839: \$? = $ac_status" >&5
     12876   echo "$as_me:12876: \$? = $ac_status" >&5
    1284012877   if (exit $ac_status) && test -s "$ac_outfile"; then
    1284112878     # The compiler can only warn and ignore the option if not recognized
     
    1293712974   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1293812975   -e 's:$: $lt_compiler_flag:'`
    12939    (eval echo "\"\$as_me:12939: $lt_compile\"" >&5)
     12976   (eval echo "\"\$as_me:12976: $lt_compile\"" >&5)
    1294012977   (eval "$lt_compile" 2>out/conftest.err)
    1294112978   ac_status=$?
    1294212979   cat out/conftest.err >&5
    12943    echo "$as_me:12943: \$? = $ac_status" >&5
     12980   echo "$as_me:12980: \$? = $ac_status" >&5
    1294412981   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1294512982   then
     
    1450714544   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1450814545   -e 's:$: $lt_compiler_flag:'`
    14509    (eval echo "\"\$as_me:14509: $lt_compile\"" >&5)
     14546   (eval echo "\"\$as_me:14546: $lt_compile\"" >&5)
    1451014547   (eval "$lt_compile" 2>conftest.err)
    1451114548   ac_status=$?
    1451214549   cat conftest.err >&5
    14513    echo "$as_me:14513: \$? = $ac_status" >&5
     14550   echo "$as_me:14550: \$? = $ac_status" >&5
    1451414551   if (exit $ac_status) && test -s "$ac_outfile"; then
    1451514552     # The compiler can only warn and ignore the option if not recognized
     
    1461114648   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1461214649   -e 's:$: $lt_compiler_flag:'`
    14613    (eval echo "\"\$as_me:14613: $lt_compile\"" >&5)
     14650   (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
    1461414651   (eval "$lt_compile" 2>out/conftest.err)
    1461514652   ac_status=$?
    1461614653   cat out/conftest.err >&5
    14617    echo "$as_me:14617: \$? = $ac_status" >&5
     14654   echo "$as_me:14654: \$? = $ac_status" >&5
    1461814655   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1461914656   then
     
    1681816855   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1681916856   -e 's:$: $lt_compiler_flag:'`
    16820    (eval echo "\"\$as_me:16820: $lt_compile\"" >&5)
     16857   (eval echo "\"\$as_me:16857: $lt_compile\"" >&5)
    1682116858   (eval "$lt_compile" 2>conftest.err)
    1682216859   ac_status=$?
    1682316860   cat conftest.err >&5
    16824    echo "$as_me:16824: \$? = $ac_status" >&5
     16861   echo "$as_me:16861: \$? = $ac_status" >&5
    1682516862   if (exit $ac_status) && test -s "$ac_outfile"; then
    1682616863     # The compiler can only warn and ignore the option if not recognized
     
    1708617123   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1708717124   -e 's:$: $lt_compiler_flag:'`
    17088    (eval echo "\"\$as_me:17088: $lt_compile\"" >&5)
     17125   (eval echo "\"\$as_me:17125: $lt_compile\"" >&5)
    1708917126   (eval "$lt_compile" 2>conftest.err)
    1709017127   ac_status=$?
    1709117128   cat conftest.err >&5
    17092    echo "$as_me:17092: \$? = $ac_status" >&5
     17129   echo "$as_me:17129: \$? = $ac_status" >&5
    1709317130   if (exit $ac_status) && test -s "$ac_outfile"; then
    1709417131     # The compiler can only warn and ignore the option if not recognized
     
    1719017227   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1719117228   -e 's:$: $lt_compiler_flag:'`
    17192    (eval echo "\"\$as_me:17192: $lt_compile\"" >&5)
     17229   (eval echo "\"\$as_me:17229: $lt_compile\"" >&5)
    1719317230   (eval "$lt_compile" 2>out/conftest.err)
    1719417231   ac_status=$?
    1719517232   cat out/conftest.err >&5
    17196    echo "$as_me:17196: \$? = $ac_status" >&5
     17233   echo "$as_me:17233: \$? = $ac_status" >&5
    1719717234   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1719817235   then
     
    2225022287  fi
    2225122288
     22289  # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
     22290  # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
     22291
     22292
    2225222293  cat >confcache <<\_ACEOF
    2225322294# This file is a shell script that caches the results of configure
     
    2294622987s,@build_vendor@,$build_vendor,;t t
    2294722988s,@build_os@,$build_os,;t t
    22948 s,@COIN_CC_IS_CL_TRUE@,$COIN_CC_IS_CL_TRUE,;t t
    22949 s,@COIN_CC_IS_CL_FALSE@,$COIN_CC_IS_CL_FALSE,;t t
    2295022989s,@CDEFS@,$CDEFS,;t t
    2295122990s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
     
    2296022999s,@EXEEXT@,$EXEEXT,;t t
    2296123000s,@OBJEXT@,$OBJEXT,;t t
     23001s,@COIN_CC_IS_CL_TRUE@,$COIN_CC_IS_CL_TRUE,;t t
     23002s,@COIN_CC_IS_CL_FALSE@,$COIN_CC_IS_CL_FALSE,;t t
    2296223003s,@MPICC@,$MPICC,;t t
    2296323004s,@PKG_CONFIG@,$PKG_CONFIG,;t t
     
    2296823009s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2296923010s,@EGREP@,$EGREP,;t t
     23011s,@LN_S@,$LN_S,;t t
    2297023012s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
    2297123013s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
     
    2301823060s,@host_vendor@,$host_vendor,;t t
    2301923061s,@host_os@,$host_os,;t t
    23020 s,@LN_S@,$LN_S,;t t
    2302123062s,@ECHO@,$ECHO,;t t
    2302223063s,@AR@,$AR,;t t
     
    2374523786
    2374623787
     23788    case $build in
     23789      *-aix*)
     23790        { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
     23791echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
     23792        sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
     23793        mv config.status.tmp config.status
     23794      ;;
     23795    esac
     23796
     23797
    2374723798# configure is writing to config.log, and then calls config.status.
    2374823799# config.status does its own redirection, appending to config.log.
     
    2382123872  fi
    2382223873
     23874  { echo "$as_me:$LINENO: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
     23875echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
    2382323876  if test x$coin_projectdir = xyes; then
    2382423877    { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
Note: See TracChangeset for help on using the changeset viewer.