From: <ebo...@us...> - 2003-06-28 22:16:40
|
Update of /cvsroot/alleg/allegro In directory sc8-pr-cvs1:/tmp/cvs-serv1113 Modified Files: Tag: allegro_4_0_branch configure.in Log Message: Fixed invocation of non-GNU make. Index: configure.in =================================================================== RCS file: /cvsroot/alleg/allegro/configure.in,v retrieving revision 1.38.2.16 retrieving revision 1.38.2.17 diff -u -d -r1.38.2.16 -r1.38.2.17 --- configure.in 26 Jun 2003 17:34:51 -0000 1.38.2.16 +++ configure.in 28 Jun 2003 22:16:38 -0000 1.38.2.17 @@ -542,15 +542,22 @@ AC_OUTPUT(makefile:makefile.in allegro-config:misc/allegro-config.in, [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) +dnl The makefile doesn't work with non-GNU make so test for its presence. +if ${MAKE-make} -v -f /dev/null 2>/dev/null | grep -i "gnu" >/dev/null; then + gnu_make="yes" +fi + dnl Run "make depend" if necessary. if test "X$allegro_make_depend" = "Xyes"; then - dnl The makefile doesn't work with non-gmake at the moment, so force gmake. - if ${MAKE-make} -v -f /dev/null 2>/dev/null | grep -i "gnu" >/dev/null; then + if test "X$gnu_make" = "Xyes"; then ${MAKE-make} depend else AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.]) gmake depend - AC_MSG_WARN([You need to use GNU make to build Allegro.]) - AC_MSG_WARN([This might be called gmake on your system.]) fi +fi + +if test "X$gnu_make" != "Xyes"; then + AC_MSG_WARN([You need to use GNU make to build Allegro.]) + AC_MSG_WARN([This might be called gmake on your system.]) fi |