Skip to content

Commit 9db75fa

Browse files
svigerskesvigerske
committed
separate checks for ASL and BonminAmpl lib
- for coin-or/Bonmin#41
1 parent 7b7837b commit 9db75fa

28 files changed

+791
-76
lines changed

‎Couenne/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SUBDIRS = src/util \
2727
src/cut/crossconv \
2828
src
2929

30-
if COIN_HAS_ASL
30+
if COIN_HAS_BONMINAMPL
3131
SUBDIRS += src/readnl
3232
endif
3333

‎Couenne/Makefile.in

+12-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PRE_UNINSTALL = :
5252
POST_UNINSTALL = :
5353
build_triplet = @build@
5454
host_triplet = @host@
55-
@COIN_HAS_ASL_TRUE@am__append_1 = src/readnl
55+
@COIN_HAS_BONMINAMPL_TRUE@am__append_1 = src/readnl
5656

5757
# src/cut/ellipcuts
5858

@@ -139,6 +139,13 @@ AUTOHEADER = @AUTOHEADER@
139139
AUTOMAKE = @AUTOMAKE@
140140
AUX_DIR = @AUX_DIR@
141141
AWK = @AWK@
142+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
143+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
144+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
145+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
146+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
147+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
148+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
142149
BONMIN_CFLAGS = @BONMIN_CFLAGS@
143150
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
144151
BONMIN_DATA = @BONMIN_DATA@
@@ -157,6 +164,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
157164
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
158165
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
159166
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
167+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
168+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
160169
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
161170
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
162171
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -393,7 +402,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Couenne
393402

394403
# Files that are generated and should be cleaned with make distclean
395404
DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
396-
DocFiles = README AUTHORS LICENSE
405+
DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md
397406
DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
398407
COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
399408
COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
@@ -977,7 +986,7 @@ uninstall-all-doxygen-docs:
977986
fi ; \
978987
done ;
979988

980-
install-doc: $(DocFiles)
989+
install-doc:
981990
test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
982991
for file in $(DocFiles); do \
983992
if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \

‎Couenne/configure

+591-42
Large diffs are not rendered by default.

‎Couenne/configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ fi
7676

7777
# Bonmin AMPL interface
7878
# bad bad: if AMPL stuff is available, then libCouenne will depend on it, so we add it to CouenneLib
79-
AC_COIN_CHECK_PACKAGE(ASL, [bonminamplinterface], [CouenneLib])
79+
AC_COIN_CHECK_PACKAGE(BonminAmpl, [bonminamplinterface], [CouenneLib])
80+
AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [CouenneLib])
8081

8182
# more workaround for having ASL deep inside Couenne
8283
if test $coin_has_asl = yes ; then

‎Couenne/src/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,13 @@ AUTOHEADER = @AUTOHEADER@
198198
AUTOMAKE = @AUTOMAKE@
199199
AUX_DIR = @AUX_DIR@
200200
AWK = @AWK@
201+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
202+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
203+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
204+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
205+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
206+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
207+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
201208
BONMIN_CFLAGS = @BONMIN_CFLAGS@
202209
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
203210
BONMIN_DATA = @BONMIN_DATA@
@@ -216,6 +223,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
216223
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
217224
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
218225
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
226+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
227+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
219228
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
220229
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
221230
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/bound_tightening/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ AUTOHEADER = @AUTOHEADER@
105105
AUTOMAKE = @AUTOMAKE@
106106
AUX_DIR = @AUX_DIR@
107107
AWK = @AWK@
108+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
109+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
110+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
111+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
112+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
113+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
114+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
108115
BONMIN_CFLAGS = @BONMIN_CFLAGS@
109116
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
110117
BONMIN_DATA = @BONMIN_DATA@
@@ -123,6 +130,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
123130
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
124131
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
125132
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
133+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
134+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
126135
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
127136
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
128137
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

+10-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@SET_MAKE@
1616

17-
# $Id: Makefile.am 765 2011-08-14 11:12:19Z stefan $
17+
# $Id$
1818
#
1919
# Copyright (C) 2006 International Business Machines and others.
2020
# All Rights Reserved.
@@ -99,6 +99,13 @@ AUTOHEADER = @AUTOHEADER@
9999
AUTOMAKE = @AUTOMAKE@
100100
AUX_DIR = @AUX_DIR@
101101
AWK = @AWK@
102+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
103+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
104+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
105+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
106+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
107+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
108+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
102109
BONMIN_CFLAGS = @BONMIN_CFLAGS@
103110
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
104111
BONMIN_DATA = @BONMIN_DATA@
@@ -117,6 +124,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
117124
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
118125
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
119126
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
127+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
128+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
120129
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
121130
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
122131
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/branch/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ AUTOHEADER = @AUTOHEADER@
116116
AUTOMAKE = @AUTOMAKE@
117117
AUX_DIR = @AUX_DIR@
118118
AWK = @AWK@
119+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
120+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
121+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
122+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
123+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
124+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
125+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
119126
BONMIN_CFLAGS = @BONMIN_CFLAGS@
120127
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
121128
BONMIN_DATA = @BONMIN_DATA@
@@ -134,6 +141,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
134141
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
135142
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
136143
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
144+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
145+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
137146
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
138147
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
139148
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/config.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
/* Define to 1 if the Bonmin package is available */
1313
#undef COIN_HAS_BONMIN
1414

15+
/* Define to 1 if the BonminAmpl package is available */
16+
#undef COIN_HAS_BONMINAMPL
17+
1518
/* Define to 1 if the Cpx package is available */
1619
#undef COIN_HAS_CPX
1720

‎Couenne/src/convex/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ AUTOHEADER = @AUTOHEADER@
100100
AUTOMAKE = @AUTOMAKE@
101101
AUX_DIR = @AUX_DIR@
102102
AWK = @AWK@
103+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
104+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
105+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
106+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
107+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
108+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
109+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
103110
BONMIN_CFLAGS = @BONMIN_CFLAGS@
104111
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
105112
BONMIN_DATA = @BONMIN_DATA@
@@ -118,6 +125,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
118125
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
119126
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
120127
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
128+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
129+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
121130
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
122131
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
123132
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/cut/crossconv/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ AUTOHEADER = @AUTOHEADER@
9696
AUTOMAKE = @AUTOMAKE@
9797
AUX_DIR = @AUX_DIR@
9898
AWK = @AWK@
99+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
100+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
101+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
102+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
103+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
104+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
105+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
99106
BONMIN_CFLAGS = @BONMIN_CFLAGS@
100107
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
101108
BONMIN_DATA = @BONMIN_DATA@
@@ -114,6 +121,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
114121
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
115122
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
116123
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
124+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
125+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
117126
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
118127
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
119128
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/cut/sdpcuts/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ AUTOHEADER = @AUTOHEADER@
9797
AUTOMAKE = @AUTOMAKE@
9898
AUX_DIR = @AUX_DIR@
9999
AWK = @AWK@
100+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
101+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
102+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
103+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
104+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
105+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
106+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
100107
BONMIN_CFLAGS = @BONMIN_CFLAGS@
101108
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
102109
BONMIN_DATA = @BONMIN_DATA@
@@ -115,6 +122,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
115122
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
116123
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
117124
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
125+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
126+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
118127
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
119128
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
120129
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/disjunctive/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ AUTOHEADER = @AUTOHEADER@
9999
AUTOMAKE = @AUTOMAKE@
100100
AUX_DIR = @AUX_DIR@
101101
AWK = @AWK@
102+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
103+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
104+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
105+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
106+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
107+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
108+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
102109
BONMIN_CFLAGS = @BONMIN_CFLAGS@
103110
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
104111
BONMIN_DATA = @BONMIN_DATA@
@@ -117,6 +124,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
117124
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
118125
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
119126
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
127+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
128+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
120129
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
121130
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
122131
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/expression/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ AUTOHEADER = @AUTOHEADER@
115115
AUTOMAKE = @AUTOMAKE@
116116
AUX_DIR = @AUX_DIR@
117117
AWK = @AWK@
118+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
119+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
120+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
121+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
122+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
123+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
124+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
118125
BONMIN_CFLAGS = @BONMIN_CFLAGS@
119126
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
120127
BONMIN_DATA = @BONMIN_DATA@
@@ -133,6 +140,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
133140
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
134141
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
135142
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
143+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
144+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
136145
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
137146
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
138147
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/heuristics/Makefile.in

+9
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ AUTOHEADER = @AUTOHEADER@
112112
AUTOMAKE = @AUTOMAKE@
113113
AUX_DIR = @AUX_DIR@
114114
AWK = @AWK@
115+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
116+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
117+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
118+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
119+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
120+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
121+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
115122
BONMIN_CFLAGS = @BONMIN_CFLAGS@
116123
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
117124
BONMIN_DATA = @BONMIN_DATA@
@@ -130,6 +137,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
130137
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
131138
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
132139
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
140+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
141+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
133142
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
134143
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
135144
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

‎Couenne/src/interfaces/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
2828
-I`$(CYGPATH_W) $(srcdir)/../branch` \
2929
-I`$(CYGPATH_W) $(srcdir)/../util` \
3030
-I`$(CYGPATH_W) $(srcdir)/../problem` \
31-
$(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
31+
$(COUENNELIB_CFLAGS) $(BONMINAMPL_CFLAGS)
3232

3333
# This line is necessary to allow VPATH compilation
3434
DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..

‎Couenne/src/interfaces/Makefile.in

+10-1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ AUTOHEADER = @AUTOHEADER@
9797
AUTOMAKE = @AUTOMAKE@
9898
AUX_DIR = @AUX_DIR@
9999
AWK = @AWK@
100+
BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
101+
BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
102+
BONMINAMPL_DATA = @BONMINAMPL_DATA@
103+
BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
104+
BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
105+
BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
106+
BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
100107
BONMIN_CFLAGS = @BONMIN_CFLAGS@
101108
BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
102109
BONMIN_DATA = @BONMIN_DATA@
@@ -115,6 +122,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
115122
COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
116123
COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
117124
COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
125+
COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
126+
COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
118127
COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
119128
COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
120129
COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -344,7 +353,7 @@ AM_CPPFLAGS = \
344353
-I`$(CYGPATH_W) $(srcdir)/../branch` \
345354
-I`$(CYGPATH_W) $(srcdir)/../util` \
346355
-I`$(CYGPATH_W) $(srcdir)/../problem` \
347-
$(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
356+
$(COUENNELIB_CFLAGS) $(BONMINAMPL_CFLAGS)
348357

349358

350359
# This line is necessary to allow VPATH compilation

‎Couenne/src/main/Couenne.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "CoinTime.hpp"
2020

2121
#include "CouenneUserInterface.hpp"
22-
#ifdef COIN_HAS_ASL
22+
#ifdef COIN_HAS_BONMINAMPL
2323
#include "CouenneAmplInterface.hpp"
2424
#endif
2525
#ifdef COIN_HAS_OS
@@ -91,7 +91,7 @@ int main (int argc, char *argv[]) {
9191
// register options to prepare for parsing the command line
9292
SmartPtr<Bonmin::RegisteredOptions> roptions = new Bonmin::RegisteredOptions();
9393
Couenne::CouenneSetup::registerAllOptions(roptions);
94-
#ifdef COIN_HAS_ASL
94+
#ifdef COIN_HAS_BONMINAMPL
9595
CouenneAmplInterface::registerOptions(roptions);
9696
#endif
9797
#ifdef COIN_HAS_OS
@@ -110,7 +110,7 @@ int main (int argc, char *argv[]) {
110110
CouenneUserInterface* userinterface = NULL;
111111

112112
std::string dummy;
113-
#ifdef COIN_HAS_ASL
113+
#ifdef COIN_HAS_BONMINAMPL
114114
if (!userinterface && options->GetStringValue("nlfile", dummy, "")) {
115115
userinterface = new CouenneAmplInterface(options, jnlst);
116116
((CouenneAmplInterface*)userinterface) -> setRegisteredOptions(roptions); // for some reason the TMINLP constructor needs the registered options

0 commit comments

Comments
 (0)