rename ASL to IPOPTAMPL

- what we look for, is the Ipopt/ASL interface library - calling it ASL normally doesn't matter, unless a user specified --with-asl-* flags to find ASL (and not the Ipopt/ASL lib) - for #41
coin-or · Mar 31, 2023 · bcfa4ef · bcfa4ef
1 parent c020559
commit bcfa4ef
Show file tree

Hide file tree

Showing 31 changed files with 379 additions and 376 deletions.
diff --git a/Bonmin/Makefile.am b/Bonmin/Makefile.am
@@ -99,7 +99,7 @@ astyle:
 
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = bonmin.pc
-if COIN_HAS_ASL
+if COIN_HAS_IPOPTAMPL
 pkgconfiglib_DATA += bonminamplinterface.pc
 endif
 

diff --git a/Bonmin/Makefile.in b/Bonmin/Makefile.in
@@ -57,7 +57,7 @@ host_triplet = @host@
 # specified.  But we need to list it as subdirectory to make sure that it is
 # included in the tarball
 @ALWAYS_FALSE@am__append_1 = test
-@COIN_HAS_ASL_TRUE@am__append_2 = bonminamplinterface.pc
+@COIN_HAS_IPOPTAMPL_TRUE@am__append_2 = bonminamplinterface.pc
 DIST_COMMON = README $(am__configure_deps) \
 	$(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/bonmin-uninstalled.pc.in \
@@ -132,13 +132,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ASL_CFLAGS = @ASL_CFLAGS@
-ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
-ASL_DATA = @ASL_DATA@
-ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
-ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
-ASL_LIBS = @ASL_LIBS@
-ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
 ASTYLE = @ASTYLE@
 ASTYLEFLAGS = @ASTYLEFLAGS@
 AUTOCONF = @AUTOCONF@
@@ -177,8 +170,6 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
 COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
 COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
 COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -187,6 +178,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
 COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
+COIN_HAS_IPOPTAMPL_FALSE = @COIN_HAS_IPOPTAMPL_FALSE@
+COIN_HAS_IPOPTAMPL_TRUE = @COIN_HAS_IPOPTAMPL_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
@@ -234,6 +227,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPOPTAMPL_CFLAGS = @IPOPTAMPL_CFLAGS@
+IPOPTAMPL_CFLAGS_INSTALLED = @IPOPTAMPL_CFLAGS_INSTALLED@
+IPOPTAMPL_DATA = @IPOPTAMPL_DATA@
+IPOPTAMPL_DATA_INSTALLED = @IPOPTAMPL_DATA_INSTALLED@
+IPOPTAMPL_DEPENDENCIES = @IPOPTAMPL_DEPENDENCIES@
+IPOPTAMPL_LIBS = @IPOPTAMPL_LIBS@
+IPOPTAMPL_LIBS_INSTALLED = @IPOPTAMPL_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Bonmin/configure b/Bonmin/configure
diff --git a/Bonmin/configure.ac b/Bonmin/configure.ac
@@ -62,7 +62,7 @@ if test $coin_has_coindepend != yes ; then
   AC_MSG_ERROR([Required package Cbc or Ipopt not available.])
 fi
 
-AC_COIN_CHECK_PACKAGE(ASL, [ipoptamplinterface], [BonminAmplInterfaceLib])
+AC_COIN_CHECK_PACKAGE(IpoptAmpl, [ipoptamplinterface], [BonminAmplInterfaceLib])
 
 #AC_COIN_CHECK_PACKAGE(Bcp, [bcp])
 #
@@ -192,7 +192,7 @@ AC_CONFIG_FILES([Makefile
                  bonmin.pc bonmin-uninstalled.pc
 		 doxydoc/doxygen.conf])
 
-if test $coin_has_asl = yes ; then
+if test $coin_has_ipoptampl = yes ; then
   AC_CONFIG_FILES([bonminamplinterface.pc:src/CbcBonmin/bonminamplinterface.pc.in
                    bonminamplinterface-uninstalled.pc:src/CbcBonmin/bonminamplinterface-uninstalled.pc.in
                   ])

diff --git a/Bonmin/experimental/Bcp/Makefile.am b/Bonmin/experimental/Bcp/Makefile.am
@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign
 
 # What is done in this directory:
 
-if COIN_HAS_ASL
+if COIN_HAS_IPOPTAMPL
   bin_PROGRAMS = bonminbcp
 endif
 

diff --git a/Bonmin/experimental/RobotBonmin/Makefile.am b/Bonmin/experimental/RobotBonmin/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics` \
-	$(BONMINLIB_CFLAGS) $(ASL_CFLAGS)
+	$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS)
 
 ########################################################################
 #                                robotbonmin                                  #
@@ -37,7 +37,7 @@ robotbonmin_SOURCES = Robot-bonmin.cpp \
 robotbonmin_LDADD = \
 	../../src/Interfaces/Ampl/libbonamplinterface.la \
 	../../src/CbcBonmin/libbonmin.la \
-	$(ASL_LIBS) \
+	$(IPOPTAMPL_LIBS) \
 	$(BONMINLIB_LIBS)
 
 ########################################################################

diff --git a/Bonmin/experimental/RobotBonmin/Makefile.in b/Bonmin/experimental/RobotBonmin/Makefile.in
@@ -100,13 +100,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ASL_CFLAGS = @ASL_CFLAGS@
-ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
-ASL_DATA = @ASL_DATA@
-ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
-ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
-ASL_LIBS = @ASL_LIBS@
-ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
 ASTYLE = @ASTYLE@
 ASTYLEFLAGS = @ASTYLEFLAGS@
 AUTOCONF = @AUTOCONF@
@@ -145,8 +138,6 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
 COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
 COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
 COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -155,6 +146,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
 COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
+COIN_HAS_IPOPTAMPL_FALSE = @COIN_HAS_IPOPTAMPL_FALSE@
+COIN_HAS_IPOPTAMPL_TRUE = @COIN_HAS_IPOPTAMPL_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
@@ -202,6 +195,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPOPTAMPL_CFLAGS = @IPOPTAMPL_CFLAGS@
+IPOPTAMPL_CFLAGS_INSTALLED = @IPOPTAMPL_CFLAGS_INSTALLED@
+IPOPTAMPL_DATA = @IPOPTAMPL_DATA@
+IPOPTAMPL_DATA_INSTALLED = @IPOPTAMPL_DATA_INSTALLED@
+IPOPTAMPL_DEPENDENCIES = @IPOPTAMPL_DEPENDENCIES@
+IPOPTAMPL_LIBS = @IPOPTAMPL_LIBS@
+IPOPTAMPL_LIBS_INSTALLED = @IPOPTAMPL_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@
@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics` \
-	$(BONMINLIB_CFLAGS) $(ASL_CFLAGS)
+	$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS)
 
 
 ########################################################################
@@ -335,7 +335,7 @@ robotbonmin_SOURCES = Robot-bonmin.cpp \
 robotbonmin_LDADD = \
 	../../src/Interfaces/Ampl/libbonamplinterface.la \
 	../../src/CbcBonmin/libbonmin.la \
-	$(ASL_LIBS) \
+	$(IPOPTAMPL_LIBS) \
 	$(BONMINLIB_LIBS)
 
 

diff --git a/Bonmin/experimental/Separable/Makefile.am b/Bonmin/experimental/Separable/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics` \
-	$(BONMINLIB_CFLAGS) $(ASL_CFLAGS)
+	$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS)
 
 ########################################################################
 #                                sepa                                  #
@@ -42,7 +42,7 @@ sepa_SOURCES = Sepa.cpp \
 sepa_LDADD = \
 	../../src/Interfaces/Ampl/libbonamplinterface.la \
 	../../src/CbcBonmin/libbonmin.la \
-	$(ASL_LIBS) \
+	$(IPOPTAMPL_LIBS) \
 	$(BONMINLIB_LIBS)
 
 ########################################################################

diff --git a/Bonmin/experimental/Separable/Makefile.in b/Bonmin/experimental/Separable/Makefile.in
@@ -101,13 +101,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ASL_CFLAGS = @ASL_CFLAGS@
-ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
-ASL_DATA = @ASL_DATA@
-ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
-ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
-ASL_LIBS = @ASL_LIBS@
-ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
 ASTYLE = @ASTYLE@
 ASTYLEFLAGS = @ASTYLEFLAGS@
 AUTOCONF = @AUTOCONF@
@@ -146,8 +139,6 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
 COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
 COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
 COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -156,6 +147,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
 COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
+COIN_HAS_IPOPTAMPL_FALSE = @COIN_HAS_IPOPTAMPL_FALSE@
+COIN_HAS_IPOPTAMPL_TRUE = @COIN_HAS_IPOPTAMPL_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
@@ -203,6 +196,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPOPTAMPL_CFLAGS = @IPOPTAMPL_CFLAGS@
+IPOPTAMPL_CFLAGS_INSTALLED = @IPOPTAMPL_CFLAGS_INSTALLED@
+IPOPTAMPL_DATA = @IPOPTAMPL_DATA@
+IPOPTAMPL_DATA_INSTALLED = @IPOPTAMPL_DATA_INSTALLED@
+IPOPTAMPL_DEPENDENCIES = @IPOPTAMPL_DEPENDENCIES@
+IPOPTAMPL_LIBS = @IPOPTAMPL_LIBS@
+IPOPTAMPL_LIBS_INSTALLED = @IPOPTAMPL_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@
@@ -323,7 +323,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
 	-I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin/Heuristics` \
-	$(BONMINLIB_CFLAGS) $(ASL_CFLAGS)
+	$(BONMINLIB_CFLAGS) $(IPOPTAMPL_CFLAGS)
 
 
 ########################################################################
@@ -340,7 +340,7 @@ sepa_SOURCES = Sepa.cpp \
 sepa_LDADD = \
 	../../src/Interfaces/Ampl/libbonamplinterface.la \
 	../../src/CbcBonmin/libbonmin.la \
-	$(ASL_LIBS) \
+	$(IPOPTAMPL_LIBS) \
 	$(BONMINLIB_LIBS)
 
 

diff --git a/Bonmin/src/Algorithms/Ampl/Makefile.in b/Bonmin/src/Algorithms/Ampl/Makefile.in
@@ -102,13 +102,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ASL_CFLAGS = @ASL_CFLAGS@
-ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
-ASL_DATA = @ASL_DATA@
-ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
-ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
-ASL_LIBS = @ASL_LIBS@
-ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
 ASTYLE = @ASTYLE@
 ASTYLEFLAGS = @ASTYLEFLAGS@
 AUTOCONF = @AUTOCONF@
@@ -147,8 +140,6 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
 COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
 COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
 COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -157,6 +148,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
 COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
+COIN_HAS_IPOPTAMPL_FALSE = @COIN_HAS_IPOPTAMPL_FALSE@
+COIN_HAS_IPOPTAMPL_TRUE = @COIN_HAS_IPOPTAMPL_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
@@ -204,6 +197,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPOPTAMPL_CFLAGS = @IPOPTAMPL_CFLAGS@
+IPOPTAMPL_CFLAGS_INSTALLED = @IPOPTAMPL_CFLAGS_INSTALLED@
+IPOPTAMPL_DATA = @IPOPTAMPL_DATA@
+IPOPTAMPL_DATA_INSTALLED = @IPOPTAMPL_DATA_INSTALLED@
+IPOPTAMPL_DEPENDENCIES = @IPOPTAMPL_DEPENDENCIES@
+IPOPTAMPL_LIBS = @IPOPTAMPL_LIBS@
+IPOPTAMPL_LIBS_INSTALLED = @IPOPTAMPL_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Bonmin/src/Algorithms/Branching/Makefile.in b/Bonmin/src/Algorithms/Branching/Makefile.in
@@ -104,13 +104,6 @@ AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-ASL_CFLAGS = @ASL_CFLAGS@
-ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
-ASL_DATA = @ASL_DATA@
-ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
-ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
-ASL_LIBS = @ASL_LIBS@
-ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
 ASTYLE = @ASTYLE@
 ASTYLEFLAGS = @ASTYLEFLAGS@
 AUTOCONF = @AUTOCONF@
@@ -149,8 +142,6 @@ COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
 COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
 COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
-COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
-COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
 COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
 COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -159,6 +150,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_FILTERSQP_FALSE = @COIN_HAS_FILTERSQP_FALSE@
 COIN_HAS_FILTERSQP_TRUE = @COIN_HAS_FILTERSQP_TRUE@
+COIN_HAS_IPOPTAMPL_FALSE = @COIN_HAS_IPOPTAMPL_FALSE@
+COIN_HAS_IPOPTAMPL_TRUE = @COIN_HAS_IPOPTAMPL_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_OSICPX_FALSE = @COIN_HAS_OSICPX_FALSE@
@@ -206,6 +199,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPOPTAMPL_CFLAGS = @IPOPTAMPL_CFLAGS@
+IPOPTAMPL_CFLAGS_INSTALLED = @IPOPTAMPL_CFLAGS_INSTALLED@
+IPOPTAMPL_DATA = @IPOPTAMPL_DATA@
+IPOPTAMPL_DATA_INSTALLED = @IPOPTAMPL_DATA_INSTALLED@
+IPOPTAMPL_DEPENDENCIES = @IPOPTAMPL_DEPENDENCIES@
+IPOPTAMPL_LIBS = @IPOPTAMPL_LIBS@
+IPOPTAMPL_LIBS_INSTALLED = @IPOPTAMPL_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Bonmin/src/Algorithms/Makefile.am b/Bonmin/src/Algorithms/Makefile.am
@@ -15,7 +15,7 @@ SUBDIRS = \
        Branching \
        QuadCuts
 
-if COIN_HAS_ASL
+if COIN_HAS_IPOPTAMPL
 SUBDIRS += Ampl
 endif