Changeset 1681 for ThirdParty/Glpk


Ignore:
Timestamp:
Sep 13, 2010 3:37:47 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/Glpk/trunk
Files:
5 edited

Legend:

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

    r1649 r1681  
    183183FFLAGS = @FFLAGS@
    184184GLPKDIR = @GLPKDIR@
     185GLPK_PCLIBS = @GLPK_PCLIBS@
    185186GLPK_SVN_REV = @GLPK_SVN_REV@
    186187HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
  • ThirdParty/Glpk/trunk/coinglpk-uninstalled.pc.in

    r1618 r1681  
    55Description: Gnu Linear Programming Kit
    66Version: @glpkmajorver@.@glpkminorver@
    7 Libs: -L${libdir} -lcoinglpk @PCADDLIBS@
     7Libs: -L${libdir} -lcoinglpk @GLPK_PCLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/glpk/include
  • ThirdParty/Glpk/trunk/coinglpk.pc.in

    r1618 r1681  
    77Description: Gnu Linear Programming Kit
    88Version: @glpkmajorver@.@glpkminorver@
    9 Libs: -L${libdir} -lcoinglpk @PCADDLIBS@
     9Libs: -L${libdir} -lcoinglpk @GLPK_PCLIBS@
    1010Cflags: -I${includedir}
  • ThirdParty/Glpk/trunk/configure

    r1669 r1681  
    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 PCADDLIBS FADDLIBS 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 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 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 PCADDLIBS FADDLIBS 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 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'
    476476ac_subst_files=''
    477477
     
    16271627fi
    16281628
    1629 # Set the project's SVN revision number
     1629# Set the project's SVN revision number. The complicated sed expression
     1630# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1631# as a single number.
    16301632# Extract the first word of "svnversion", so it can be a program name with args.
    16311633set dummy svnversion; ac_word=$2
     
    16661668if test "x$have_svnversion" = xyes && test "xGlpk" != x; then
    16671669
    1668   GLPK_SVN_REV=`cd $srcdir/$coin_has_glpk ; svnversion`
     1670  svn_rev_tmp=`cd $srcdir/$coin_has_glpk ; svnversion`
     1671  GLPK_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16691672  if test $GLPK_SVN_REV != exported; then
    16701673
    16711674cat >>confdefs.h <<_ACEOF
    1672 #define GLPK_SVN_REV "$GLPK_SVN_REV"
     1675#define GLPK_SVN_REV $GLPK_SVN_REV
    16731676_ACEOF
    16741677
     
    49874990*-*-irix6*)
    49884991  # Find out which ABI we are using.
    4989   echo '#line 4989 "configure"' > conftest.$ac_ext
     4992  echo '#line 4992 "configure"' > conftest.$ac_ext
    49904993  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    49914994  (eval $ac_compile) 2>&5
     
    65866589
    65876590# Provide some information about the compiler.
    6588 echo "$as_me:6588:" \
     6591echo "$as_me:6591:" \
    65896592     "checking for Fortran 77 compiler version" >&5
    65906593ac_compiler=`set X $ac_compile; echo $2`
     
    76537656   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76547657   -e 's:$: $lt_compiler_flag:'`
    7655    (eval echo "\"\$as_me:7655: $lt_compile\"" >&5)
     7658   (eval echo "\"\$as_me:7658: $lt_compile\"" >&5)
    76567659   (eval "$lt_compile" 2>conftest.err)
    76577660   ac_status=$?
    76587661   cat conftest.err >&5
    7659    echo "$as_me:7659: \$? = $ac_status" >&5
     7662   echo "$as_me:7662: \$? = $ac_status" >&5
    76607663   if (exit $ac_status) && test -s "$ac_outfile"; then
    76617664     # The compiler can only warn and ignore the option if not recognized
     
    79217924   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79227925   -e 's:$: $lt_compiler_flag:'`
    7923    (eval echo "\"\$as_me:7923: $lt_compile\"" >&5)
     7926   (eval echo "\"\$as_me:7926: $lt_compile\"" >&5)
    79247927   (eval "$lt_compile" 2>conftest.err)
    79257928   ac_status=$?
    79267929   cat conftest.err >&5
    7927    echo "$as_me:7927: \$? = $ac_status" >&5
     7930   echo "$as_me:7930: \$? = $ac_status" >&5
    79287931   if (exit $ac_status) && test -s "$ac_outfile"; then
    79297932     # The compiler can only warn and ignore the option if not recognized
     
    80258028   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80268029   -e 's:$: $lt_compiler_flag:'`
    8027    (eval echo "\"\$as_me:8027: $lt_compile\"" >&5)
     8030   (eval echo "\"\$as_me:8030: $lt_compile\"" >&5)
    80288031   (eval "$lt_compile" 2>out/conftest.err)
    80298032   ac_status=$?
    80308033   cat out/conftest.err >&5
    8031    echo "$as_me:8031: \$? = $ac_status" >&5
     8034   echo "$as_me:8034: \$? = $ac_status" >&5
    80328035   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80338036   then
     
    1037010373  lt_status=$lt_dlunknown
    1037110374  cat > conftest.$ac_ext <<EOF
    10372 #line 10372 "configure"
     10375#line 10375 "configure"
    1037310376#include "confdefs.h"
    1037410377
     
    1047010473  lt_status=$lt_dlunknown
    1047110474  cat > conftest.$ac_ext <<EOF
    10472 #line 10472 "configure"
     10475#line 10475 "configure"
    1047310476#include "confdefs.h"
    1047410477
     
    1281412817   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1281512818   -e 's:$: $lt_compiler_flag:'`
    12816    (eval echo "\"\$as_me:12816: $lt_compile\"" >&5)
     12819   (eval echo "\"\$as_me:12819: $lt_compile\"" >&5)
    1281712820   (eval "$lt_compile" 2>conftest.err)
    1281812821   ac_status=$?
    1281912822   cat conftest.err >&5
    12820    echo "$as_me:12820: \$? = $ac_status" >&5
     12823   echo "$as_me:12823: \$? = $ac_status" >&5
    1282112824   if (exit $ac_status) && test -s "$ac_outfile"; then
    1282212825     # The compiler can only warn and ignore the option if not recognized
     
    1291812921   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1291912922   -e 's:$: $lt_compiler_flag:'`
    12920    (eval echo "\"\$as_me:12920: $lt_compile\"" >&5)
     12923   (eval echo "\"\$as_me:12923: $lt_compile\"" >&5)
    1292112924   (eval "$lt_compile" 2>out/conftest.err)
    1292212925   ac_status=$?
    1292312926   cat out/conftest.err >&5
    12924    echo "$as_me:12924: \$? = $ac_status" >&5
     12927   echo "$as_me:12927: \$? = $ac_status" >&5
    1292512928   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1292612929   then
     
    1448814491   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1448914492   -e 's:$: $lt_compiler_flag:'`
    14490    (eval echo "\"\$as_me:14490: $lt_compile\"" >&5)
     14493   (eval echo "\"\$as_me:14493: $lt_compile\"" >&5)
    1449114494   (eval "$lt_compile" 2>conftest.err)
    1449214495   ac_status=$?
    1449314496   cat conftest.err >&5
    14494    echo "$as_me:14494: \$? = $ac_status" >&5
     14497   echo "$as_me:14497: \$? = $ac_status" >&5
    1449514498   if (exit $ac_status) && test -s "$ac_outfile"; then
    1449614499     # The compiler can only warn and ignore the option if not recognized
     
    1459214595   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1459314596   -e 's:$: $lt_compiler_flag:'`
    14594    (eval echo "\"\$as_me:14594: $lt_compile\"" >&5)
     14597   (eval echo "\"\$as_me:14597: $lt_compile\"" >&5)
    1459514598   (eval "$lt_compile" 2>out/conftest.err)
    1459614599   ac_status=$?
    1459714600   cat out/conftest.err >&5
    14598    echo "$as_me:14598: \$? = $ac_status" >&5
     14601   echo "$as_me:14601: \$? = $ac_status" >&5
    1459914602   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1460014603   then
     
    1679916802   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1680016803   -e 's:$: $lt_compiler_flag:'`
    16801    (eval echo "\"\$as_me:16801: $lt_compile\"" >&5)
     16804   (eval echo "\"\$as_me:16804: $lt_compile\"" >&5)
    1680216805   (eval "$lt_compile" 2>conftest.err)
    1680316806   ac_status=$?
    1680416807   cat conftest.err >&5
    16805    echo "$as_me:16805: \$? = $ac_status" >&5
     16808   echo "$as_me:16808: \$? = $ac_status" >&5
    1680616809   if (exit $ac_status) && test -s "$ac_outfile"; then
    1680716810     # The compiler can only warn and ignore the option if not recognized
     
    1706717070   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1706817071   -e 's:$: $lt_compiler_flag:'`
    17069    (eval echo "\"\$as_me:17069: $lt_compile\"" >&5)
     17072   (eval echo "\"\$as_me:17072: $lt_compile\"" >&5)
    1707017073   (eval "$lt_compile" 2>conftest.err)
    1707117074   ac_status=$?
    1707217075   cat conftest.err >&5
    17073    echo "$as_me:17073: \$? = $ac_status" >&5
     17076   echo "$as_me:17076: \$? = $ac_status" >&5
    1707417077   if (exit $ac_status) && test -s "$ac_outfile"; then
    1707517078     # The compiler can only warn and ignore the option if not recognized
     
    1717117174   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1717217175   -e 's:$: $lt_compiler_flag:'`
    17173    (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
     17176   (eval echo "\"\$as_me:17176: $lt_compile\"" >&5)
    1717417177   (eval "$lt_compile" 2>out/conftest.err)
    1717517178   ac_status=$?
    1717617179   cat out/conftest.err >&5
    17177    echo "$as_me:17177: \$? = $ac_status" >&5
     17180   echo "$as_me:17180: \$? = $ac_status" >&5
    1717817181   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1717917182   then
     
    2009520098###########################################################################
    2009620099
    20097 ADDLIBS=
    20098 
    2009920100ac_ext=c
    2010020101ac_cpp='$CPP $CPPFLAGS'
     
    2034520346if test $ac_cv_lib_z_gzopen = yes; then
    2034620347  ADDLIBS="-lz $ADDLIBS"
     20348
     20349                    GLPK_LIBS="-lz $GLPK_LIBS"
     20350                    GLPK_PCLIBS="-lz $GLPK_PCLIBS"
     20351
     20352
    2034720353else
    2034820354  coin_has_zlib=no
     
    2061120617_ACEOF
    2061220618
    20613     ADDLIBS="-lgmp $ADDLIBS"
     20619    GLPK_LIBS="-lgmp $GLPK_LIBS"
     20620    GLPK_PCLIBS="-lgmp $GLPK_PCLIBS"
    2061420621  fi
    2061520622fi
     
    2096220969
    2096320970  if test $enable_dl = yes; then
    20964     ADDLIBS="-ldl $ADDLIBS"
     20971    GLPK_LIBS="-ldl $GLPK_LIBS"
     20972    GLPK_PCLIBS="-ldl $GLPK_PCLIBS"
    2096520973  fi
    2096620974fi
     
    2120121209
    2120221210    if test $enable_dl = yes; then
    21203       ADDLIBS="-lltdl $ADDLIBS"
     21211      GLPK_LIBS="-lltdl $GLPK_LIBS"
     21212      GLPK_PCLIBS="-lltdl $GLPK_PCLIBS"
    2120421213    fi
    2120521214  fi
     
    2215922168
    2216022169          ac_config_headers="$ac_config_headers config_glpk.h"
     22170
     22171
    2216122172
    2216222173
     
    2301823029s,@COIN_HAS_ZLIB_FALSE@,$COIN_HAS_ZLIB_FALSE,;t t
    2301923030s,@GLPKDIR@,$GLPKDIR,;t t
     23031s,@GLPK_PCLIBS@,$GLPK_PCLIBS,;t t
    2302023032s,@LIBEXT@,$LIBEXT,;t t
    2302123033s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • ThirdParty/Glpk/trunk/configure.ac

    r1585 r1681  
    7272###########################################################################
    7373
    74 ADDLIBS=
    75 
    7674AC_LANG_PUSH(C)
    7775
    78 AC_COIN_CHECK_GNU_ZLIB
     76AC_COIN_CHECK_GNU_ZLIB(GLPK)
    7977if test $coin_has_zlib = "yes"; then
    8078  AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if GNU zlib is available])
     
    8684  if test $coin_has_gmp = yes; then
    8785    AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
    88     ADDLIBS="-lgmp $ADDLIBS"
     86    GLPK_LIBS="-lgmp $GLPK_LIBS"
     87    GLPK_PCLIBS="-lgmp $GLPK_PCLIBS"
    8988  fi
    9089fi
     
    108107  AC_CHECK_LIB(dl,[dlopen],[AC_DEFINE([HAVE_DLFCN],[1],[Define to 1 if dlfcn support is available])],[enable_dl=no])
    109108  if test $enable_dl = yes; then
    110     ADDLIBS="-ldl $ADDLIBS"
     109    GLPK_LIBS="-ldl $GLPK_LIBS"
     110    GLPK_PCLIBS="-ldl $GLPK_PCLIBS"
    111111  fi
    112112fi
     
    118118    AC_CHECK_LIB(ldtl,[lt_dlopen],[AC_DEFINE([HAVE_LTDL],[1],[Define to 1 if ltdl support is available])],[enable_dl=no])
    119119    if test $enable_dl = yes; then
    120       ADDLIBS="-lltdl $ADDLIBS"
     120      GLPK_LIBS="-lltdl $GLPK_LIBS"
     121      GLPK_PCLIBS="-lltdl $GLPK_PCLIBS"
    121122    fi
    122123  fi
     
    251252AC_CONFIG_HEADER([config_glpk.h])
    252253
     254AC_SUBST(GLPK_PCLIBS)
     255
    253256AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.