Ignore:
Timestamp:
Jul 11, 2009 3:24:18 PM (12 years ago)
Author:
stefan
Message:

create config.h and config_glpk.h for glpk; check for additional libraries, especially for odbc and mysql drivers (for Osi ticket 72); store additional dependencies in glpk_addlibs.txt

File:
1 edited

Legend:

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

    r1299 r1321  
    129129$(GLPKDIR)/src/colamd/colamd.c
    130130
    131 # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
    132 # so we put a dummy config.h file and required include files into the glpk
    133 # include directory. At least a newline is needed to avoid a bug in
    134 # Sun Solaris Studio, 64-bit optimised build.
     131# CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
     132# and so Glpk attempts to include config.h.
     133# Therefore, we put a simple config.h file into $(GLPKDIR)/include.
     134# It's purpose is to include the config_glpk.h file that is generated
     135# by configure.
    135136libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
    136137  $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
     
    141142  $(srcdir)/$(GLPKDIR)/include/glpstd.h
    142143
    143 $(srcdir)/$(GLPKDIR)/include/config.h :
    144         echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
     144$(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
     145        cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
    145146
    146147$(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h
Note: See TracChangeset for help on using the changeset viewer.