Changeset 2036 for trunk/Clp/src


Ignore:
Timestamp:
Jun 29, 2014 2:53:24 PM (5 years ago)
Author:
stefan
Message:

rerun with our version of autotools; reverts damage from r2030

Location:
trunk/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/Makefile.in

    r2030 r2036  
    429429GLPK_LIBS = @GLPK_LIBS@
    430430GLPK_LIBS_INSTALLED = @GLPK_LIBS_INSTALLED@
    431 GREP = @GREP@
    432431HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    433432HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    496495PACKAGE_STRING = @PACKAGE_STRING@
    497496PACKAGE_TARNAME = @PACKAGE_TARNAME@
    498 PACKAGE_URL = @PACKAGE_URL@
    499497PACKAGE_VERSION = @PACKAGE_VERSION@
    500498PATH_SEPARATOR = @PATH_SEPARATOR@
     
    519517abs_source_dir = @abs_source_dir@
    520518ac_c_preproc_warn_flag = @ac_c_preproc_warn_flag@
     519ac_ct_AR = @ac_ct_AR@
    521520ac_ct_CC = @ac_ct_CC@
    522521ac_ct_CXX = @ac_ct_CXX@
    523522ac_ct_F77 = @ac_ct_F77@
     523ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
     524ac_ct_RANLIB = @ac_ct_RANLIB@
     525ac_ct_STRIP = @ac_ct_STRIP@
    524526ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    525527am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
     
    545547coin_have_doxygen = @coin_have_doxygen@
    546548datadir = @datadir@
    547 datarootdir = @datarootdir@
    548 docdir = @docdir@
    549 dvidir = @dvidir@
    550549exec_prefix = @exec_prefix@
    551550have_autoconf = @have_autoconf@
     
    558557host_os = @host_os@
    559558host_vendor = @host_vendor@
    560 htmldir = @htmldir@
    561559includedir = @includedir@
    562560infodir = @infodir@
     
    564562libdir = @libdir@
    565563libexecdir = @libexecdir@
    566 localedir = @localedir@
    567564localstatedir = @localstatedir@
    568565mandir = @mandir@
    569566mkdir_p = @mkdir_p@
    570567oldincludedir = @oldincludedir@
    571 pdfdir = @pdfdir@
    572568prefix = @prefix@
    573569program_transform_name = @program_transform_name@
    574 psdir = @psdir@
    575570sbindir = @sbindir@
    576571sharedstatedir = @sharedstatedir@
  • trunk/Clp/src/OsiClp/Makefile.in

    r2030 r2036  
    214214GLPK_LIBS = @GLPK_LIBS@
    215215GLPK_LIBS_INSTALLED = @GLPK_LIBS_INSTALLED@
    216 GREP = @GREP@
    217216HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    218217HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    281280PACKAGE_STRING = @PACKAGE_STRING@
    282281PACKAGE_TARNAME = @PACKAGE_TARNAME@
    283 PACKAGE_URL = @PACKAGE_URL@
    284282PACKAGE_VERSION = @PACKAGE_VERSION@
    285283PATH_SEPARATOR = @PATH_SEPARATOR@
     
    304302abs_source_dir = @abs_source_dir@
    305303ac_c_preproc_warn_flag = @ac_c_preproc_warn_flag@
     304ac_ct_AR = @ac_ct_AR@
    306305ac_ct_CC = @ac_ct_CC@
    307306ac_ct_CXX = @ac_ct_CXX@
    308307ac_ct_F77 = @ac_ct_F77@
     308ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
     309ac_ct_RANLIB = @ac_ct_RANLIB@
     310ac_ct_STRIP = @ac_ct_STRIP@
    309311ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    310312am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
     
    330332coin_have_doxygen = @coin_have_doxygen@
    331333datadir = @datadir@
    332 datarootdir = @datarootdir@
    333 docdir = @docdir@
    334 dvidir = @dvidir@
    335334exec_prefix = @exec_prefix@
    336335have_autoconf = @have_autoconf@
     
    343342host_os = @host_os@
    344343host_vendor = @host_vendor@
    345 htmldir = @htmldir@
    346344includedir = @includedir@
    347345infodir = @infodir@
     
    349347libdir = @libdir@
    350348libexecdir = @libexecdir@
    351 localedir = @localedir@
    352349localstatedir = @localstatedir@
    353350mandir = @mandir@
    354351mkdir_p = @mkdir_p@
    355352oldincludedir = @oldincludedir@
    356 pdfdir = @pdfdir@
    357353prefix = @prefix@
    358354program_transform_name = @program_transform_name@
    359 psdir = @psdir@
    360355sbindir = @sbindir@
    361356sharedstatedir = @sharedstatedir@
  • trunk/Clp/src/config.h.in

    r2030 r2036  
    144144#undef PACKAGE_TARNAME
    145145
    146 /* Define to the home page for this package. */
    147 #undef PACKAGE_URL
    148 
    149146/* Define to the version of this package. */
    150147#undef PACKAGE_VERSION
Note: See TracChangeset for help on using the changeset viewer.