source: ThirdParty/Glpk/branches/autotools-update/glpk_config.patch

Last change on this file was 4056, checked in by lou, 3 months ago

Second try, rewriting glpk's configuration source files. Went with Stefan's
suggestion to stop trying to pass values and just add COIN macros to glpk's
configure.ac. More straightforward.

File size: 2.3 KB
  • glpk/configure.ac

     
    44
    55AC_CONFIG_SRCDIR([src/glpk.h])
    66
    7 AC_CONFIG_MACRO_DIR([m4])
     7# Add standard COIN initialisation and build macros.
    88
    9 AM_INIT_AUTOMAKE
     9AC_COIN_INITIALIZE(glpk)
     10
     11# Get the name of the C compiler and appropriate compiler options. If the
     12# compile script is already in the cached name from ThirdParty/Glpk's
     13# configure, strip it. COIN_PROG_CC will wrap it again. Quadrigraphs
     14# because autoconf processing eats square brackets.
     15
     16if expr "$ac_cv_prog_CC" : '^.*/compile @<:@^ @:>@*$' >/dev/null 2>&1 ; then
     17  ac_cv_prog_CC=`expr "$ac_cv_prog_CC" : '^.*/compile \(@<:@^ @:>@*\)$'`
     18  CC=$ac_cv_prog_CC
     19fi
     20AC_COIN_PROG_CC
     21
     22# Set up libtool.
     23
     24AC_COIN_PROG_LIBTOOL
     25
     26# End of COIN macros.
    1027
    1128AC_CONFIG_HEADERS([config.h])
    1229
     
    5673      esac],
    5774   [enable_reentrant=yes])
    5875
    59 dnl Disable unnecessary libtool tests
    60 define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
    61 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
    62 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
    63 
    64 dnl Check for programs
    65 AC_PROG_CC
    66 AC_PROG_INSTALL
    67 AC_PROG_LIBTOOL
    68 
    6976dnl Check for math library
    7077AC_CHECK_LIB([m], [exp])
    7178
  • glpk/src/Makefile.am

     
    11## Process this file with automake to produce Makefile.in ##
    22
     3AUTOMAKE_OPTIONS = subdir-objects
     4
    35include_HEADERS = glpk.h
    46
    5 lib_LTLIBRARIES = libglpk.la
     7# Change name from libglpk to libcoinglpk.
     8
     9lib_LTLIBRARIES = libcoinglpk.la
    610
    7 libglpk_la_CPPFLAGS = \
     11libcoinglpk_la_CPPFLAGS = \
    812-I$(srcdir) \
    913-I$(srcdir)/amd \
    1014-I$(srcdir)/api \
     
    2125-I$(srcdir)/simplex \
    2226-I$(srcdir)/zlib
    2327
    24 libglpk_la_LDFLAGS = \
     28libcoinglpk_la_LDFLAGS = \
    2529-version-info 43:0:3 \
    2630-export-symbols-regex '^glp_*' \
    2731${NOUNDEFINED}
    2832
    29 libglpk_la_SOURCES = \
     33libcoinglpk_la_SOURCES = \
    3034amd/amd_1.c \
    3135amd/amd_2.c \
    3236amd/amd_aat.c \
  • glpk/examples/Makefile.am

     
    22
    33AM_CPPFLAGS = -I$(srcdir)/../src
    44
    5 LDADD = ../src/libglpk.la
     5# Change name from libglpk to libcoinglpk.
     6
     7LDADD = ../src/libcoinglpk.la
    68
    79bin_PROGRAMS = glpsol
    810
Note: See TracBrowser for help on using the repository browser.