From 98fed256799e60df9ef3bd2f182d406ddd3fc04d Mon Sep 17 00:00:00 2001
From: Christophe Alexandre <alliance-cvs@asim.lip6.fr>
Date: Wed, 3 Apr 2002 17:34:44 +0000
Subject: [PATCH] more improvments ....

---
 alliance/src/alliance.m4 | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/alliance/src/alliance.m4 b/alliance/src/alliance.m4
index a30f128f..c02dd852 100644
--- a/alliance/src/alliance.m4
+++ b/alliance/src/alliance.m4
@@ -6,17 +6,17 @@ AC_DEFUN(AM_ALLIANCE,[
 
 AC_MSG_CHECKING(for alliance)
 if test x$alliance_prefix != x ; then
-  ALC_CFLAGS="-I$alliance_prefix/include"
-  ALC_LIBS="-L$alliance_prefix/lib"
+  ALLIANCE_CFLAGS="-I$alliance_prefix/include"
+  ALLIANCE_LIBS="-L$alliance_prefix/lib"
 else
-  ALC_CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS"
-  ALC_LIBS="-L${ALLIANCE_TOP}/lib $LIBS"
+  ALLIANCE_CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS"
+  ALLIANCE_LIBS="-L${ALLIANCE_TOP}/lib $LIBS"
 fi
 
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
-CFLAGS="$ALC_CFLAGS $CFLAGS"
-LIBS="$ALC_LIBS -lMut $LIBS"
+CFLAGS="$ALLIANCE_CFLAGS $CFLAGS"
+LIBS="$ALLIANCE_LIBS -lMut $LIBS"
 
 AC_TRY_RUN([
 #include <mut.h>
@@ -44,11 +44,17 @@ LIBS="$ac_save_LIBS"
 dnl ifelse([$2], , :, [$2])
   fi
   
-CFLAGS="$ALC_CFLAGS $CFLAGS"
-LIBS="$ALC_LIBS $LIBS"
-
+dnl the following lines should disapear in the future 
+CFLAGS="$ALLIANCE_CFLAGS $CFLAGS"
+LIBS="$ALLIANCE_LIBS $LIBS"
+CXXFLAGS="$ALLIANCE_CFLAGS $CXXFLAGS"
 AC_SUBST(CFLAGS)
+AC_SUBST(CXXFLAGS)
 AC_SUBST(LIBS)
+dnl end of to delete lines
+
+AC_SUBST(ALLIANCE_CFLAGS)
+AC_SUBST(ALLIANCE_LIBS)
 
 INSTALL_DATA='${INSTALL} -m 664'
 AC_SUBST(INSTALL_DATA)