Changeset 3250


Ignore:
Timestamp:
Jun 29, 2014 7:29:09 PM (5 years ago)
Author:
stefan
Message:

use just GLPK_LIBS

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

Legend:

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

    r3193 r3250  
    150150  -I@GLPKDIR@
    151151
    152 libcoinglpk_la_LIBADD = $(GLPK_PCLIBS)
     152libcoinglpk_la_LIBADD = $(GLPK_LIBS)
    153153libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    154154
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3239 r3250  
    330330FGREP = @FGREP@
    331331GLPKDIR = @GLPKDIR@
    332 GLPK_PCLIBS = @GLPK_PCLIBS@
     332GLPK_LIBS = @GLPK_LIBS@
    333333GLPK_SVN_REV = @GLPK_SVN_REV@
    334334GREP = @GREP@
     
    566566  -I@GLPKDIR@
    567567
    568 libcoinglpk_la_LIBADD = $(GLPK_PCLIBS)
     568libcoinglpk_la_LIBADD = $(GLPK_LIBS)
    569569libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    570570thirdpartyincludedir = $(includedir)/coin/ThirdParty
  • ThirdParty/Glpk/branches/autotools-update/coinglpk.pc.in

    r3240 r3250  
    99Version: @PACKAGE_VERSION@
    1010Libs: -L${libdir} -lcoinglpk
    11 Libs.private: @GLPK_PCLIBS@
     11Libs.private: @GLPK_LIBS@
    1212Cflags: -I${includedir}
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3248 r3250  
    644644LTLIBOBJS
    645645LIBOBJS
    646 GLPK_PCLIBS
     646GLPK_LIBS
    647647GLPKDIR
    648648glpkminorver
     
    22432243
    22442244
     2245# Do some generic initialization work.
    22452246ac_aux_dir=
    22462247for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
     
    74677468
    74687469# initialize automake, don't define PACKAGE or VERSION
     7470# TODO should we enable warnings by passing an option like -Wall
    74697471if test "`cd $srcdir && pwd`" != "`pwd`"; then
    74707472  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    1162711629#############################################################################
    1162811630
    11629 #turn off warnings and pedantic mode since it seem to make trouble on solaris platform
    11630 #and we couldn't fix it anyway
    11631 #coin_skip_warn_cflags=yes
    11632 
    11633 # Check if user wants to produce debugging code
    11634 #AC_COIN_DEBUG_COMPILE(Glpk)
    11635 
    1163611631# Get the name of the C compiler
    11637 #AC_COIN_PROG_CC
    1163811632ac_ext=c
    1163911633ac_cpp='$CPP $CPPFLAGS'
     
    1236312357
    1236412358
    12365 # Check if pkg-config is available (to setup addlibs file)
    12366 #AC_COIN_HAS_PKGCONFIG
    12367 
    1236812359###########################################################################
    1236912360#                            check GLPK version                           #
     
    1248112472  if test $enable_dl = yes; then
    1248212473    GLPK_LIBS="-ldl $GLPK_LIBS"
    12483     GLPK_PCLIBS="-ldl $GLPK_PCLIBS"
    1248412474  fi
    1248512475fi
     
    1254012530    if test $enable_dl = yes; then
    1254112531      GLPK_LIBS="-lltdl $GLPK_LIBS"
    12542       GLPK_PCLIBS="-lltdl $GLPK_PCLIBS"
    1254312532    fi
    1254412533  fi
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r3248 r3250  
    2121AC_CONFIG_SRCDIR(glpk/src/glpk.h)
    2222
     23# Do some generic initialization work.
    2324AC_COIN_PROJECTDIR_INITIALIZE(Glpk)
    2425
     
    2728#############################################################################
    2829
    29 #turn off warnings and pedantic mode since it seem to make trouble on solaris platform
    30 #and we couldn't fix it anyway
    31 #coin_skip_warn_cflags=yes
    32 
    33 # Check if user wants to produce debugging code
    34 #AC_COIN_DEBUG_COMPILE(Glpk)
    35 
    3630# Get the name of the C compiler
    37 #AC_COIN_PROG_CC
    3831AC_PROG_CC
    39 
    40 # Check if pkg-config is available (to setup addlibs file)
    41 #AC_COIN_HAS_PKGCONFIG
    4232
    4333###########################################################################
     
    8777  if test $enable_dl = yes; then
    8878    GLPK_LIBS="-ldl $GLPK_LIBS"
    89     GLPK_PCLIBS="-ldl $GLPK_PCLIBS"
    9079  fi
    9180fi
     
    9887    if test $enable_dl = yes; then
    9988      GLPK_LIBS="-lltdl $GLPK_LIBS"
    100       GLPK_PCLIBS="-lltdl $GLPK_PCLIBS"
    10189    fi
    10290  fi
     
    231219AC_CONFIG_HEADER([config_glpk.h])
    232220
    233 AC_SUBST(GLPK_PCLIBS)
     221AC_SUBST(GLPK_LIBS)
    234222
    235223AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.