Changeset 3851


Ignore:
Timestamp:
Oct 10, 2018 9:17:03 PM (11 months ago)
Author:
lou
Message:

Update configure.ac and coinglpk.pc.in to work with INIT_LIBVARS.

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3812 r3851  
    231231EXEEXT = @EXEEXT@
    232232FGREP = @FGREP@
     233GLPK_CFLAGS_PUB = @GLPK_CFLAGS_PUB@
     234GLPK_DATA_PUB = @GLPK_DATA_PUB@
     235GLPK_LFLAGS_PUB = @GLPK_LFLAGS_PUB@
     236GLPK_PCFILES_PUB = @GLPK_PCFILES_PUB@
    233237GLPK_SVN_REV = @GLPK_SVN_REV@
    234238GREP = @GREP@
     
    355359COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    356360
    357 # Needless to say, it's important that doxydocdir_nosub not be a target for
     361# Needless to say, it's important that baredocdir_nosub not be a target for
    358362# autoconf substitution.
    359363DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
  • ThirdParty/Glpk/branches/autotools-update/coinglpk.pc.in

    r3808 r3851  
    88URL: https://projects.coin-or.org/BuildTools
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lcoinglpk
    11 Cflags: -I${includedir}
     10Libs: @GLPK_LFLAGS_PUB@
     11Cflags: @GLPK_CFLAGS_PUB@
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3849 r3851  
    646646LIBOBJS
    647647subdirs
     648GLPK_DATA_PUB
     649GLPK_PCFILES_PUB
     650GLPK_CFLAGS_PUB
     651GLPK_LFLAGS_PUB
    648652DEPENDENCY_LINKING_FALSE
    649653DEPENDENCY_LINKING_TRUE
     
    39343938
    39353939
    3936 # Initialize libtool
     3940# Initialise libtool
    39373941
    39383942case `pwd` in
     
    1200912013
    1201012014
     12015
     12016
     12017
     12018# Initialise variables for Glpk
     12019
     12020
     12021  GLPK_LFLAGS_PUB="-L\${libdir} -lcoinglpk"
     12022
     12023  GLPK_CFLAGS_PUB="-I\${includedir}"
     12024
     12025  GLPK_PCFILES_PUB=""
     12026
     12027  GLPK_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
    1201112028
    1201212029
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r3808 r3851  
    4141AC_COIN_PROG_CC
    4242
    43 # Initialize libtool
     43# Initialise libtool
    4444
    4545AC_COIN_PROG_LIBTOOL
     46
     47# Initialise variables for Glpk
     48
     49AC_COIN_INIT_LIBVARS([Glpk],[-L\${libdir} -lcoinglpk],[-I\${includedir}])
    4650
    4751# Invoke glpk's native configuration
Note: See TracChangeset for help on using the changeset viewer.