good version for ALLIANCE_LIBS and ALLIANCE_CFLAGS

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"
+  ALLIANCE_CFLAGS="-I$alliance_prefix/include"
-  ALC_LIBS="-L$alliance_prefix/lib"
+  ALLIANCE_LIBS="-L$alliance_prefix/lib"
 else
-  ALC_CFLAGS="-I${ALLIANCE_TOP}/include $CFLAGS"
+  ALLIANCE_CFLAGS="-I${ALLIANCE_TOP}/include"
-  ALC_LIBS="-L${ALLIANCE_TOP}/lib $LIBS"
+  ALLIANCE_LIBS="-L${ALLIANCE_TOP}/lib"
 fi
 
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
-CFLAGS="$ALC_CFLAGS $CFLAGS"
+CFLAGS="$ALLIANCE_CFLAGS $CFLAGS"
-LIBS="$ALC_LIBS -lMut $LIBS"
+LIBS="$ALLIANCE_LIBS -lMut $LIBS"
 
 AC_TRY_RUN([
 #include <mut.h>
@@ -44,13 +44,6 @@ LIBS="$ac_save_LIBS"
 dnl ifelse([$2], , :, [$2])
   fi
   
-CFLAGS="$ALC_CFLAGS $CFLAGS"
-LIBS="$ALC_LIBS $LIBS"
-ALLIANCE_CFLAGS=$CFLAGS
-ALLIANCE_LIBS=$LIBS
-
-AC_SUBST(CFLAGS)
-AC_SUBST(LIBS)
 AC_SUBST(ALLIANCE_CFLAGS)
 AC_SUBST(ALLIANCE_LIBS)
 

alliance/src/loon/src/Makefile.am

@@ -2,6 +2,8 @@
 
 bin_PROGRAMS = loon
 
+CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+
 loon_LDADD = @ALLIANCE_LIBS@ \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvl -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   

alliance/src/lvx/src/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 bin_PROGRAMS = lvx
 
-CFLAGS = @ALLIANCE_CFLAGS@
+CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
 
 lvx_LDADD = @ALLIANCE_LIBS@ \
           -lMlu \