changing the macros to use alliance.m4

alliance/src/ocp/acinclude.m4

@@ -1,30 +0,0 @@
-AC_DEFUN(ALC_CXX_PROBLEMATIC_OLD_VERSION,
-[
-AC_REQUIRE([AC_PROG_CXX])
-AC_MSG_CHECKING(if this is a problematic old ${CXX} version)
-AC_CACHE_VAL(alc_cv_cxx_problematic_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_CPP([
-#ifdef __GNUC__
-#if __GNUC__ < 2
-#error ALC works best with GCC version 2.95.2 or higher
-#endif /* __GNUC__ < 2 */
-#ifdef __GNUC_MINOR__
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 95
-#error ALC works only with GCC version 2.95.2 or higher
-#endif /* __GNUC_MINOR__ < 95.2 */
-#endif /* defined(__GNUC_MINOR__) */
-#endif /* defined(__GNUC__) */
-],
-alc_cv_cxx_problematic_version=no, alc_cv_cxx_problematic_version=yes)
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT($alc_cv_cxx_problematic_version)
-if test "$alc_cv_cxx_problematic_version" = yes; then
-AC_MSG_ERROR(*** This package works only with ${CXX} version 2.95.2 or higher ... please install gcc 2.95.2 or higher or set the environment variable CC and CXX to the good gcc before running the configure script ***)
-fi
-])dnl
-dnl
-dnl

alliance/src/ocp/configure.in

@@ -9,10 +9,6 @@ AC_SUBST(OCP_MAJOR_VERSION)
 AC_SUBST(OCP_MINOR_VERSION)
 AC_SUBST(OCP_VERSION)
 
-# libtool versioning
-# LT_RELEASE=$OCP_MAJOR_VERSION.$OCP_MINOR_VERSION
-# AC_SUBST(LT_RELEASE)
-
 # For automake.
 VERSION=$OCP_VERSION
 PACKAGE=ocp
@@ -29,30 +25,14 @@ AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_MAKE_SET
 
-changequote(,)dnl
-INCLUDES=-I${ALLIANCE_TOP}/include
-LDFLAGS=-L${ALLIANCE_TOP}/lib
-changequote([,])dnl
-
-AC_SUBST(INCLUDES)
-AC_SUBST(LDFLAGS)
-
-dnl changequote(,)dnl
-dnl INSTALL_DATA = ${INSTALL} -m 664
-dnl changequote([,])dnl
-dnl AC_SUBST(INSTALL_DATA)
-
 dnl Checks for libraries.
 dnl Check for -lm librarie.  These should always be present.
-AC_CHECK_LIB(m, exp, LIBM="-lm")
-AC_SUBST(LIBM)
-
-dnl Checks for header files.
+AC_CHECK_LIB(m, exp)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
-dnl Checks for library functions.
+AM_ALLIANCE
 
 AC_OUTPUT([
 Makefile

alliance/src/ocp/src/placer/Makefile.am

@@ -11,7 +11,7 @@ noinst_LIBRARIES = libOcp.a
 libOcp_a_SOURCES = PElem.cpp PIns.cpp PNet.cpp \
 		   PCon.cpp
 
-ocp_LDADD = @LIBS@ @LIBM@ \
+ocp_LDADD = @LIBS@ \
 	   $(top_builddir)/src/common/libPCommon.a \
           -lMpu -lMlu \
 	  -lMcl -lMcp \