projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged Spiky and Sleeping Spiky to reduce number of duplicated images
[supertux.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
18cafa8
..
21cc765
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-26,6
+26,13
@@
CXXFLAGS="$CXXFLAGS -ffast-math"
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
+AC_PATH_PROG(AR, ar)
+if test "$AR" = "" ; then
+ AC_MSG_ERROR([Couldn't find ar])
+fi
+AR="$AR ru"
+
+AC_C_BIGENDIAN
AC_CHECK_PROGS(XGETTEXT, [xgettext xgettext.exe])
if test -n "$XGETTEXT" ; then
AC_CHECK_PROGS(XGETTEXT, [xgettext xgettext.exe])
if test -n "$XGETTEXT" ; then
@@
-89,12
+96,6
@@
AM_ICONV
AC_SUBST([ICONV_LIBS], [$LIBICONV])
dnl ===========================================================================
AC_SUBST([ICONV_LIBS], [$LIBICONV])
dnl ===========================================================================
-dnl Check for OpenGL
-AX_CHECK_GL
-if test "$no_gl" = "yes"; then
- AC_MSG_ERROR([Please install opengl libraries and headers])
-fi
-
dnl Check for SDL
SDL_VERSION=1.2.4
AM_PATH_SDL($SDL_VERSION,
dnl Check for SDL
SDL_VERSION=1.2.4
AM_PATH_SDL($SDL_VERSION,
@@
-112,7
+113,9
@@
NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
[$SDL_CFLAGS], [$SDL_LIBS])
NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
[$SDL_CFLAGS], [$SDL_LIBS])
NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
- NP_LANG_PROGRAM([#include <physfs.h>
+ NP_LANG_PROGRAM([
+#include <stdio.h>
+#include <physfs.h>
#if PHYSFS_VER_MAJOR < 1
# error PHYSFS is too old
#endif]),
#if PHYSFS_VER_MAJOR < 1
# error PHYSFS is too old
#endif]),
@@
-128,6
+131,11
@@
NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
[AC_MSG_ERROR([Please intall OpenAL])],
[], [])
[AC_MSG_ERROR([Please intall OpenAL])],
[], [])
+AX_CHECK_GL
+if test "$no_gl" = "yes"; then
+ AC_MSG_ERROR([Please install opengl libraries and headers])
+fi
+
dnl Checks for library functions.
AC_CHECK_FUNCS(mkdir strdup strstr)
dnl Checks for library functions.
AC_CHECK_FUNCS(mkdir strdup strstr)
@@
-141,7
+149,6
@@
echo "Features:"
echo "========="
echo " Profile Mode: $enable_gprof"
echo " Debug Mode: $enable_debug"
echo "========="
echo " Profile Mode: $enable_gprof"
echo " Debug Mode: $enable_debug"
-echo " OpenGL Support: $enable_opengl"
echo ""
echo ""
echo " NOTE: This project uses jam (and not make) as build tool"
echo ""
echo ""
echo " NOTE: This project uses jam (and not make) as build tool"