more improvments ....
This commit is contained in:
parent
7592ab5314
commit
98fed25679
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue