Skip to content

Commit

Permalink
reorganization of GamsIO libs and build
Browse files Browse the repository at this point in the history
  • Loading branch information
@svigerske
svigerske committed Jan 4, 2008
1 parent 9a876e7 commit c61cdde
Show file tree
Hide file tree
Showing 32 changed files with 365 additions and 281 deletions.
12 changes: 7 additions & 5 deletions .gitattributes
View file
Expand Up @@ -16,14 +16,13 @@ GAMSlinks/doc/gamsdist/optcbc_s.tex -text
GAMSlinks/doc/gamsdist/optglpk_a.tex -text
GAMSlinks/doc/gamsdist/optglpk_s.tex -text
GAMSlinks/doc/gamsdist/optipopt_a.tex -text
GAMSlinks/gamsio_addlibs.txt.in -text
GAMSlinks/inc/config_gamslinks.h.in -text
GAMSlinks/src/Bonmin/GamsBonmin.cpp -text
GAMSlinks/src/Bonmin/Makefile.am -text
GAMSlinks/src/Bonmin/Makefile.in -text
GAMSlinks/src/Bonmin/SmagMINLP.cpp -text
GAMSlinks/src/Bonmin/SmagMINLP.hpp -text
GAMSlinks/src/Bonmin/SmagMessageHandler.cpp -text
GAMSlinks/src/Bonmin/SmagMessageHandler.hpp -text
GAMSlinks/src/Bonmin/gmsbm_nt.cmd -text
GAMSlinks/src/Bonmin/gmsbm_us.run -text
GAMSlinks/src/Bonmin/install/gmsbm_nt.dat -text
Expand Down Expand Up @@ -56,7 +55,10 @@ GAMSlinks/src/GamsIO/GamsOptions.cpp -text
GAMSlinks/src/GamsIO/GamsOptions.hpp -text
GAMSlinks/src/GamsIO/Makefile.am -text
GAMSlinks/src/GamsIO/Makefile.in -text
GAMSlinks/src/GamsIO/gamsio_addlibs.txt.in -text
GAMSlinks/src/GamsIO/SmagJournal.cpp -text
GAMSlinks/src/GamsIO/SmagJournal.hpp -text
GAMSlinks/src/GamsIO/SmagMessageHandler.cpp -text
GAMSlinks/src/GamsIO/SmagMessageHandler.hpp -text
GAMSlinks/src/Glpk/GamsCoinGlpk.cpp -text
GAMSlinks/src/Glpk/Makefile.am -text
GAMSlinks/src/Glpk/Makefile.in -text
Expand All @@ -71,8 +73,6 @@ GAMSlinks/src/Glpk/optglpk.txt -text
GAMSlinks/src/Ipopt/GamsIpopt.cpp -text
GAMSlinks/src/Ipopt/Makefile.am -text
GAMSlinks/src/Ipopt/Makefile.in -text
GAMSlinks/src/Ipopt/SmagJournal.cpp -text
GAMSlinks/src/Ipopt/SmagJournal.hpp -text
GAMSlinks/src/Ipopt/SmagNLP.cpp -text
GAMSlinks/src/Ipopt/SmagNLP.hpp -text
GAMSlinks/src/Ipopt/gmsip_nt.cmd -text
Expand Down Expand Up @@ -105,8 +105,10 @@ GAMSlinks/test/Makefile.am -text
GAMSlinks/test/Makefile.in -text
GAMSlinks/test/run_tests.in -text
/INSTALL -text
/LICENSE -text
/Makefile.am -text
/Makefile.in -text
/README -text
ThirdParty/GAMSIO/FILES -text
ThirdParty/GAMSIO/INSTALL.GAMSIO -text
ThirdParty/GAMSIO/LICENSE -text
Expand Down
16 changes: 15 additions & 1 deletion GAMSlinks/Makefile.am
View file
Expand Up @@ -17,7 +17,6 @@ endif

EXTRA_DIST = \
README \
INSTALL \
LICENSE \
AUTHORS

Expand All @@ -37,6 +36,21 @@ clean-local:
distclean-local:
if test -r test/Makefile; then cd test; $(MAKE) distclean; fi

########################################################################
# Installation of the addlibs file #
########################################################################

addlibsfile1 = gamsio_addlibs.txt
addlibsfile2 = smagio_addlibs.txt

install-exec-local: install-doc
$(install_sh_DATA) $(addlibsfile1) $(DESTDIR)$(libdir)/$(addlibsfile1)
$(install_sh_DATA) $(addlibsfile2) $(DESTDIR)$(libdir)/$(addlibsfile2)

uninstall-local: uninstall-doc
rm -f $(DESTDIR)$(libdir)/$(addlibsfile1)
rm -f $(DESTDIR)$(libdir)/$(addlibsfile2)

########################################################################
# Maintainer Stuff #
########################################################################
Expand Down
47 changes: 34 additions & 13 deletions GAMSlinks/Makefile.in
View file
Expand Up @@ -59,7 +59,8 @@ DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/../config.sub $(srcdir)/../install-sh \
$(srcdir)/../ltmain.sh $(srcdir)/../missing \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure \
$(srcdir)/gamsio_addlibs.txt.in \
$(srcdir)/smagio_addlibs.txt.in $(top_srcdir)/configure \
$(top_srcdir)/inc/config_gamslinks.h.in AUTHORS
@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
Expand All @@ -73,7 +74,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/inc/config_gamslinks.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES = gamsio_addlibs.txt smagio_addlibs.txt
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
Expand Down Expand Up @@ -186,6 +187,7 @@ EXEEXT = @EXEEXT@
F77 = @F77@
FADDLIBS = @FADDLIBS@
FFLAGS = @FFLAGS@
GAMSIO_ADDLIBS = @GAMSIO_ADDLIBS@
GAMSIO_CODE = @GAMSIO_CODE@
GAMSIO_CPPFLAGS = @GAMSIO_CPPFLAGS@
GAMSIO_IS_UNIX_FALSE = @GAMSIO_IS_UNIX_FALSE@
Expand Down Expand Up @@ -318,7 +320,13 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src $(am__append_1)
EXTRA_DIST = README INSTALL LICENSE AUTHORS $(am__append_2)
EXTRA_DIST = README LICENSE AUTHORS $(am__append_2)

########################################################################
# Installation of the addlibs file #
########################################################################
addlibsfile1 = gamsio_addlibs.txt
addlibsfile2 = smagio_addlibs.txt

########################################################################
# Maintainer Stuff #
Expand Down Expand Up @@ -381,6 +389,10 @@ $(top_srcdir)/inc/config_gamslinks.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_

distclean-hdr:
-rm -f inc/config_gamslinks.h inc/stamp-h1
gamsio_addlibs.txt: $(top_builddir)/config.status $(srcdir)/gamsio_addlibs.txt.in
cd $(top_builddir) && $(SHELL) ./config.status $@
smagio_addlibs.txt: $(top_builddir)/config.status $(srcdir)/smagio_addlibs.txt.in
cd $(top_builddir) && $(SHELL) ./config.status $@

mostlyclean-libtool:
-rm -f *.lo
Expand Down Expand Up @@ -527,7 +539,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/.. $(distdir)/../BuildTools $(distdir)/inc $(distdir)/src/GamsIO $(distdir)/test
$(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/inc $(distdir)/test
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Expand Down Expand Up @@ -718,7 +730,7 @@ info-am:

install-data-am:

install-exec-am:
install-exec-am: install-exec-local

install-info: install-info-recursive

Expand All @@ -744,7 +756,7 @@ ps: ps-recursive

ps-am:

uninstall-am: uninstall-info-am
uninstall-am: uninstall-info-am uninstall-local

uninstall-info: uninstall-info-recursive

Expand All @@ -756,13 +768,14 @@ uninstall-info: uninstall-info-recursive
distclean-local distclean-recursive distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-generic mostlyclean-libtool \
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-info-am
install-data-am install-exec install-exec-am \
install-exec-local install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am \
uninstall-local


# tmpdir = tmpdir
Expand All @@ -781,6 +794,14 @@ clean-local:
distclean-local:
if test -r test/Makefile; then cd test; $(MAKE) distclean; fi

install-exec-local: install-doc
$(install_sh_DATA) $(addlibsfile1) $(DESTDIR)$(libdir)/$(addlibsfile1)
$(install_sh_DATA) $(addlibsfile2) $(DESTDIR)$(libdir)/$(addlibsfile2)

uninstall-local: uninstall-doc
rm -f $(DESTDIR)$(libdir)/$(addlibsfile1)
rm -f $(DESTDIR)$(libdir)/$(addlibsfile2)

install-doc:
test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
for file in $(DocFiles); do \
Expand Down
55 changes: 35 additions & 20 deletions GAMSlinks/configure
View file
Expand Up @@ -471,7 +471,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX CXXLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS GAMSLINKSSRCDIR GAMSLINKSOBJDIR COIN_HAS_GAMSLINKS_TRUE COIN_HAS_GAMSLINKS_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE BONMINSRCDIR BONMINOBJDIR COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE CPPADSRCDIR CPPADOBJDIR COIN_HAS_CPPAD_TRUE COIN_HAS_CPPAD_FALSE OSSRCDIR OSOBJDIR COIN_HAS_OS_TRUE COIN_HAS_OS_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE gamspath COIN_HAS_GAMSIO_TRUE COIN_HAS_GAMSIO_FALSE coin_has_gamsio GAMS_PATH GAMSIO_CPPFLAGS GAMSIO_LIBS SMAG_LIBS GAMSIO_CODE GAMSIO_IS_UNIX_TRUE GAMSIO_IS_UNIX_FALSE GAMSIO_IS_WINDOWS_TRUE GAMSIO_IS_WINDOWS_FALSE COIN_OS_SOLVER_TRUE COIN_OS_SOLVER_FALSE GAMSLINKS_BUILD_IPOPT_TRUE GAMSLINKS_BUILD_IPOPT_FALSE GAMSLINKS_BUILD_GAMSIO_TRUE GAMSLINKS_BUILD_GAMSIO_FALSE GAMSLINKS_BUILD_GLPK_TRUE GAMSLINKS_BUILD_GLPK_FALSE GAMSLINKS_BUILD_CBC_TRUE GAMSLINKS_BUILD_CBC_FALSE GAMSLINKS_BUILD_BONMIN_TRUE GAMSLINKS_BUILD_BONMIN_FALSE GAMSLINKS_BUILD_OSI_TRUE GAMSLINKS_BUILD_OSI_FALSE GAMSLINKS_BUILD_OS_TRUE GAMSLINKS_BUILD_OS_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX CXXLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS GAMSLINKSSRCDIR GAMSLINKSOBJDIR COIN_HAS_GAMSLINKS_TRUE COIN_HAS_GAMSLINKS_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE BONMINSRCDIR BONMINOBJDIR COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE CPPADSRCDIR CPPADOBJDIR COIN_HAS_CPPAD_TRUE COIN_HAS_CPPAD_FALSE OSSRCDIR OSOBJDIR COIN_HAS_OS_TRUE COIN_HAS_OS_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE gamspath COIN_HAS_GAMSIO_TRUE COIN_HAS_GAMSIO_FALSE coin_has_gamsio GAMS_PATH GAMSIO_CPPFLAGS GAMSIO_ADDLIBS GAMSIO_LIBS SMAG_LIBS GAMSIO_CODE GAMSIO_IS_UNIX_TRUE GAMSIO_IS_UNIX_FALSE GAMSIO_IS_WINDOWS_TRUE GAMSIO_IS_WINDOWS_FALSE COIN_OS_SOLVER_TRUE COIN_OS_SOLVER_FALSE GAMSLINKS_BUILD_IPOPT_TRUE GAMSLINKS_BUILD_IPOPT_FALSE GAMSLINKS_BUILD_GAMSIO_TRUE GAMSLINKS_BUILD_GAMSIO_FALSE GAMSLINKS_BUILD_GLPK_TRUE GAMSLINKS_BUILD_GLPK_FALSE GAMSLINKS_BUILD_CBC_TRUE GAMSLINKS_BUILD_CBC_FALSE GAMSLINKS_BUILD_BONMIN_TRUE GAMSLINKS_BUILD_BONMIN_FALSE GAMSLINKS_BUILD_OSI_TRUE GAMSLINKS_BUILD_OSI_FALSE GAMSLINKS_BUILD_OS_TRUE GAMSLINKS_BUILD_OS_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.
Expand Down Expand Up @@ -24081,24 +24081,36 @@ fi
# Check if GAMS I/O libs work
echo "$as_me:$LINENO: checking whether GAMS I/O libraries at $use_gamsio work" >&5
echo $ECHO_N "checking whether GAMS I/O libraries at $use_gamsio work... $ECHO_C" >&6
if test x"$GAMSIO_CODE" = xLX3; then
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a -ldl $IFORT_LIBS"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a -ldl $IFORT_LIBS"
elif test x"$GAMSIO_CODE" = xLEI; then
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a -ldl $IFORT_LIBS"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a -ldl $IFORT_LIBS"
elif test x"$gamsio_system" = xWindows; then
GAMSIO_LIBS="$use_gamsio/iolib.lib $use_gamsio/nliolib.lib $use_gamsio/clicelib.lib $use_gamsio/gclib.lib"
SMAG_LIBS="$use_gamsio/clicelib.lib $use_gamsio/smag.lib $use_gamsio/gclib.lib $use_gamsio/g2d.lib"
elif test x"$GAMSIO_CODE" = xDII; then
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a -ldl -lSystemStubs $IFORT_LIBS"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a -ldl -lSystemStubs $IFORT_LIBS"
elif test x"$GAMSIO_CODE" = xSIG; then
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a"
fi
case $GAMSIO_CODE in
LX3)
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a"
GAMSIO_ADDLIBS="-ldl $IFORT_LIBS"
;;
LEI)
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a"
GAMSIO_ADDLIBS="-ldl $IFORT_LIBS"
;;
VIS)
GAMSIO_LIBS="$use_gamsio/iolib.lib $use_gamsio/nliolib.lib $use_gamsio/clicelib.lib $use_gamsio/gclib.lib"
SMAG_LIBS="$use_gamsio/clicelib.lib $use_gamsio/smag.lib $use_gamsio/gclib.lib $use_gamsio/g2d.lib"
GAMSIO_ADDLIBS=""
;;
DII)
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a"
GAMSIO_ADDLIBS="-ldl -lSystemStubs $IFORT_LIBS"
;;
SIG)
GAMSIO_LIBS="$use_gamsio/iolib.a $use_gamsio/nliolib.a $use_gamsio/clicelib.a $use_gamsio/gclib.a"
SMAG_LIBS="$use_gamsio/clicelib.a $use_gamsio/libsmag.a $use_gamsio/gclib.a $use_gamsio/libg2d.a"
GAMSIO_ADDLIBS=""
;;
esac

GAMSIO_CPPFLAGS="-I$use_gamsio"
LIBS="$GAMSIO_LIBS $LIBS"
LIBS="$GAMSIO_LIBS $GAMSIO_ADDLIBS $LIBS"
CPPFLAGS_save=$CPPFLAGS
CPPFLAGS="$GAMSIO_CPPFLAGS $CPPFLAGS"
cat >conftest.$ac_ext <<_ACEOF
Expand Down Expand Up @@ -24182,6 +24194,7 @@ _ACEOF




if test x"$gamsio_system" != xWindows; then
GAMSIO_IS_UNIX_TRUE=
GAMSIO_IS_UNIX_FALSE='#'
Expand Down Expand Up @@ -24506,7 +24519,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu


ac_config_files="$ac_config_files Makefile src/Makefile src/GamsIO/Makefile src/GamsIO/gamsio_addlibs.txt src/Cbc/Makefile src/Glpk/Makefile src/Osi/Makefile src/Ipopt/Makefile src/Bonmin/Makefile src/OS/Makefile test/Makefile test/run_tests"
ac_config_files="$ac_config_files Makefile gamsio_addlibs.txt smagio_addlibs.txt src/Makefile src/GamsIO/Makefile src/Cbc/Makefile src/Glpk/Makefile src/Osi/Makefile src/Ipopt/Makefile src/Bonmin/Makefile src/OS/Makefile test/Makefile test/run_tests"


ac_config_headers="$ac_config_headers inc/config_gamslinks.h"
Expand Down Expand Up @@ -25336,9 +25349,10 @@ do
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"gamsio_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES gamsio_addlibs.txt" ;;
"smagio_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES smagio_addlibs.txt" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/GamsIO/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/GamsIO/Makefile" ;;
"src/GamsIO/gamsio_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES src/GamsIO/gamsio_addlibs.txt" ;;
"src/Cbc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Cbc/Makefile" ;;
"src/Glpk/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Glpk/Makefile" ;;
"src/Osi/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Osi/Makefile" ;;
Expand Down Expand Up @@ -25598,6 +25612,7 @@ s,@COIN_HAS_GAMSIO_FALSE@,$COIN_HAS_GAMSIO_FALSE,;t t
s,@coin_has_gamsio@,$coin_has_gamsio,;t t
s,@GAMS_PATH@,$GAMS_PATH,;t t
s,@GAMSIO_CPPFLAGS@,$GAMSIO_CPPFLAGS,;t t
s,@GAMSIO_ADDLIBS@,$GAMSIO_ADDLIBS,;t t
s,@GAMSIO_LIBS@,$GAMSIO_LIBS,;t t
s,@SMAG_LIBS@,$SMAG_LIBS,;t t
s,@GAMSIO_CODE@,$GAMSIO_CODE,;t t
Expand Down

0 comments on commit c61cdde

Please sign in to comment.