Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28487
Modified Files:
configure.ac
Log Message:
fixed some more buggy AC_ENABLE usage
Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- configure.ac 21 Sep 2004 11:04:01 -0000 1.34
+++ configure.ac 21 Sep 2004 11:13:09 -0000 1.35
@@ -38,8 +38,9 @@
AC_MSG_CHECKING(for gprof mode)
AC_ARG_ENABLE(gprof,
- AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),, enable_gprof="no")
-if test "x${enable_gprof}" != "xno"; then
+ AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),
+ [enable_gprof=$enableval], [enable_gprof=no])
+if test "$enable_gprof" = "no"; then
CXXFLAGS="$CXXFLAGS -pg"
AC_MSG_RESULT([enabled])
else
@@ -59,8 +60,9 @@
AC_MSG_CHECKING(wether OpenGL should be used)
AC_ARG_ENABLE(opengl,
- AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),, enable_opengl="yes")
-if test "x${enable_opengl}" != "xno"; then
+ AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),
+ [enable_opengl=$enableval], enable_opengl=yes)
+if test "$enable_opengl" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -85,12 +87,12 @@
AC_CHECK_LIB(SDL_image, IMG_Load,,
AC_MSG_ERROR([SDL_image library required]))
-if test "x${enable_opengl}" != "xno"; then
+if test "$enable_opengl" = "yes"; then
AX_CHECK_GL
fi
-if test "x$no_gl" = "xyes" -o "x$enable_opengl" = "xno"; then
+if test "$no_gl" = "yes" -o "$enable_opengl" = "no"; then
CXXFLAGS="$CXXFLAGS -DNOOPENGL"
- enable_opengl="no"
+ enable_opengl=no
else
CFLAGS="$CFLAGS $GL_CFLAGS"
CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
|
