Changeset 1542 for ThirdParty/Glpk


Ignore:
Timestamp:
May 1, 2010 6:25:18 AM (11 years ago)
Author:
stefan
Message:

rerun autotools; improve setup of addlibs file

Location:
ThirdParty/Glpk/branches/split
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/split/Makefile.am

    r1539 r1542  
    142142
    143143glpk_addlibs.txt : coinglpk.pc
    144         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
     144        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
    145145endif
    146146
  • ThirdParty/Glpk/branches/split/Makefile.in

    r1539 r1542  
    165165COIN_HAS_ZLIB_FALSE = @COIN_HAS_ZLIB_FALSE@
    166166COIN_HAS_ZLIB_TRUE = @COIN_HAS_ZLIB_TRUE@
     167COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    167168CPP = @CPP@
    168169CPPFLAGS = @CPPFLAGS@
     
    17451746
    17461747@COIN_HAS_PKGCONFIG_TRUE@glpk_addlibs.txt : coinglpk.pc
    1747 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
     1748@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
    17481749
    17491750install-doc: $(DocFiles)
  • ThirdParty/Glpk/branches/split/configure

    r1539 r1542  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE 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 MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE 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 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE 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 MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10871087  --with-glpk-verbosity specify the debug verbosity level for project Glpk
    10881088  --with-glpk-checklevel specify the sanity check level for project Glpk
     1089  --with-coin-instdir     prefix of installation directory for precompiled
     1090                          COIN packages
    10891091  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    10901092  --with-pic              try to use only PIC/non-PIC objects [default=use
     
    32373239
    32383240
     3241# assemble search path for pkg-config, if we are in a project setup
     3242if test x$coin_projectdir = xyes ; then
     3243  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     3244
     3245  # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     3246  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     3247  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     3248  if test -d "${prefix}"; then
     3249    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3250  fi
     3251
     3252
     3253# Check whether --with-coin-instdir or --without-coin-instdir was given.
     3254if test "${with_coin_instdir+set}" = set; then
     3255  withval="$with_coin_instdir"
     3256  if test -d "$withval"; then : ; else
     3257       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     3258echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     3259   { (exit 1); exit 1; }; }
     3260     fi
     3261     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3262
     3263fi;
     3264
     3265  # in a classic setup, we want to find uninstalled projects
     3266  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     3267  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     3268  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     3269  if test -e ../coin_subdirs.txt ; then
     3270    for i in `cat ../coin_subdirs.txt` ; do
     3271      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     3272    done
     3273  fi
     3274
     3275  if test -e ../../coin_subdirs.txt ; then
     3276    for i in `cat ../../coin_subdirs.txt` ; do
     3277      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     3278    done
     3279  fi
     3280
     3281
     3282fi
     3283
    32393284
    32403285
     
    48724917*-*-irix6*)
    48734918  # Find out which ABI we are using.
    4874   echo '#line 4874 "configure"' > conftest.$ac_ext
     4919  echo '#line 4919 "configure"' > conftest.$ac_ext
    48754920  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48764921  (eval $ac_compile) 2>&5
     
    64716516
    64726517# Provide some information about the compiler.
    6473 echo "$as_me:6473:" \
     6518echo "$as_me:6518:" \
    64746519     "checking for Fortran 77 compiler version" >&5
    64756520ac_compiler=`set X $ac_compile; echo $2`
     
    75387583   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75397584   -e 's:$: $lt_compiler_flag:'`
    7540    (eval echo "\"\$as_me:7540: $lt_compile\"" >&5)
     7585   (eval echo "\"\$as_me:7585: $lt_compile\"" >&5)
    75417586   (eval "$lt_compile" 2>conftest.err)
    75427587   ac_status=$?
    75437588   cat conftest.err >&5
    7544    echo "$as_me:7544: \$? = $ac_status" >&5
     7589   echo "$as_me:7589: \$? = $ac_status" >&5
    75457590   if (exit $ac_status) && test -s "$ac_outfile"; then
    75467591     # The compiler can only warn and ignore the option if not recognized
     
    78067851   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78077852   -e 's:$: $lt_compiler_flag:'`
    7808    (eval echo "\"\$as_me:7808: $lt_compile\"" >&5)
     7853   (eval echo "\"\$as_me:7853: $lt_compile\"" >&5)
    78097854   (eval "$lt_compile" 2>conftest.err)
    78107855   ac_status=$?
    78117856   cat conftest.err >&5
    7812    echo "$as_me:7812: \$? = $ac_status" >&5
     7857   echo "$as_me:7857: \$? = $ac_status" >&5
    78137858   if (exit $ac_status) && test -s "$ac_outfile"; then
    78147859     # The compiler can only warn and ignore the option if not recognized
     
    79107955   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79117956   -e 's:$: $lt_compiler_flag:'`
    7912    (eval echo "\"\$as_me:7912: $lt_compile\"" >&5)
     7957   (eval echo "\"\$as_me:7957: $lt_compile\"" >&5)
    79137958   (eval "$lt_compile" 2>out/conftest.err)
    79147959   ac_status=$?
    79157960   cat out/conftest.err >&5
    7916    echo "$as_me:7916: \$? = $ac_status" >&5
     7961   echo "$as_me:7961: \$? = $ac_status" >&5
    79177962   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    79187963   then
     
    1025510300  lt_status=$lt_dlunknown
    1025610301  cat > conftest.$ac_ext <<EOF
    10257 #line 10257 "configure"
     10302#line 10302 "configure"
    1025810303#include "confdefs.h"
    1025910304
     
    1035510400  lt_status=$lt_dlunknown
    1035610401  cat > conftest.$ac_ext <<EOF
    10357 #line 10357 "configure"
     10402#line 10402 "configure"
    1035810403#include "confdefs.h"
    1035910404
     
    1269912744   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1270012745   -e 's:$: $lt_compiler_flag:'`
    12701    (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
     12746   (eval echo "\"\$as_me:12746: $lt_compile\"" >&5)
    1270212747   (eval "$lt_compile" 2>conftest.err)
    1270312748   ac_status=$?
    1270412749   cat conftest.err >&5
    12705    echo "$as_me:12705: \$? = $ac_status" >&5
     12750   echo "$as_me:12750: \$? = $ac_status" >&5
    1270612751   if (exit $ac_status) && test -s "$ac_outfile"; then
    1270712752     # The compiler can only warn and ignore the option if not recognized
     
    1280312848   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1280412849   -e 's:$: $lt_compiler_flag:'`
    12805    (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
     12850   (eval echo "\"\$as_me:12850: $lt_compile\"" >&5)
    1280612851   (eval "$lt_compile" 2>out/conftest.err)
    1280712852   ac_status=$?
    1280812853   cat out/conftest.err >&5
    12809    echo "$as_me:12809: \$? = $ac_status" >&5
     12854   echo "$as_me:12854: \$? = $ac_status" >&5
    1281012855   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1281112856   then
     
    1437314418   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1437414419   -e 's:$: $lt_compiler_flag:'`
    14375    (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
     14420   (eval echo "\"\$as_me:14420: $lt_compile\"" >&5)
    1437614421   (eval "$lt_compile" 2>conftest.err)
    1437714422   ac_status=$?
    1437814423   cat conftest.err >&5
    14379    echo "$as_me:14379: \$? = $ac_status" >&5
     14424   echo "$as_me:14424: \$? = $ac_status" >&5
    1438014425   if (exit $ac_status) && test -s "$ac_outfile"; then
    1438114426     # The compiler can only warn and ignore the option if not recognized
     
    1447714522   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1447814523   -e 's:$: $lt_compiler_flag:'`
    14479    (eval echo "\"\$as_me:14479: $lt_compile\"" >&5)
     14524   (eval echo "\"\$as_me:14524: $lt_compile\"" >&5)
    1448014525   (eval "$lt_compile" 2>out/conftest.err)
    1448114526   ac_status=$?
    1448214527   cat out/conftest.err >&5
    14483    echo "$as_me:14483: \$? = $ac_status" >&5
     14528   echo "$as_me:14528: \$? = $ac_status" >&5
    1448414529   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1448514530   then
     
    1668416729   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1668516730   -e 's:$: $lt_compiler_flag:'`
    16686    (eval echo "\"\$as_me:16686: $lt_compile\"" >&5)
     16731   (eval echo "\"\$as_me:16731: $lt_compile\"" >&5)
    1668716732   (eval "$lt_compile" 2>conftest.err)
    1668816733   ac_status=$?
    1668916734   cat conftest.err >&5
    16690    echo "$as_me:16690: \$? = $ac_status" >&5
     16735   echo "$as_me:16735: \$? = $ac_status" >&5
    1669116736   if (exit $ac_status) && test -s "$ac_outfile"; then
    1669216737     # The compiler can only warn and ignore the option if not recognized
     
    1695216997   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1695316998   -e 's:$: $lt_compiler_flag:'`
    16954    (eval echo "\"\$as_me:16954: $lt_compile\"" >&5)
     16999   (eval echo "\"\$as_me:16999: $lt_compile\"" >&5)
    1695517000   (eval "$lt_compile" 2>conftest.err)
    1695617001   ac_status=$?
    1695717002   cat conftest.err >&5
    16958    echo "$as_me:16958: \$? = $ac_status" >&5
     17003   echo "$as_me:17003: \$? = $ac_status" >&5
    1695917004   if (exit $ac_status) && test -s "$ac_outfile"; then
    1696017005     # The compiler can only warn and ignore the option if not recognized
     
    1705617101   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1705717102   -e 's:$: $lt_compiler_flag:'`
    17058    (eval echo "\"\$as_me:17058: $lt_compile\"" >&5)
     17103   (eval echo "\"\$as_me:17103: $lt_compile\"" >&5)
    1705917104   (eval "$lt_compile" 2>out/conftest.err)
    1706017105   ac_status=$?
    1706117106   cat out/conftest.err >&5
    17062    echo "$as_me:17062: \$? = $ac_status" >&5
     17107   echo "$as_me:17107: \$? = $ac_status" >&5
    1706317108   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1706417109   then
     
    2281922864s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2282022865s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     22866s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2282122867s,@EGREP@,$EGREP,;t t
    2282222868s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
Note: See TracChangeset for help on using the changeset viewer.