configure.in

- Revert back CPPFLAGS -Werror
 - Autodetect for theroa
 - Fix LUA includes
This commit is contained in:
Pali Rohár 2010-07-14 11:51:13 +02:00
parent 6faa23cba3
commit 754062d5ed
3 changed files with 17 additions and 8 deletions

View file

@ -2,13 +2,13 @@
make distclean || exit 1
./autogen.sh || exit 1
./configure --enable-win32 --host=amd64-mingw32msvc --prefix=/usr/amd64-mingw32msvc --enable-static --without-bzip2 --with-theora --disable-stdio-redirect || exit 1
./configure --enable-win32 --host=amd64-mingw32msvc --prefix=/usr/amd64-mingw32msvc --enable-static --without-bzip2 --disable-stdio-redirect || exit 1
make || exit 1
makensis -DAMD64 stratagus.nsi || exit 1
make distclean || exit 1
./autogen.sh || exit 1
./configure --enable-win32 --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc --enable-static --without-bzip2 --with-theora --disable-stdio-redirect || exit 1
./configure --enable-win32 --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc --enable-static --without-bzip2 --disable-stdio-redirect || exit 1
make || exit 1
makensis stratagus.nsi || exit 1

View file

@ -120,7 +120,7 @@ AC_ARG_ENABLE(debug,
if test "$enable_debug" != "yes" -a "$enable_profile" != "yes"; then
CXXFLAGS="$CXXFLAGS -O2 -pipe -fsigned-char -fomit-frame-pointer -fexpensive-optimizations -ffast-math"
else
CXXFLAGS="$CXXFLAGS -O0 -g -fsigned-char -Wsign-compare -Wall"
CXXFLAGS="$CXXFLAGS -O0 -g -fsigned-char -Wsign-compare -Werror -Wall"
CPPFLAGS="$CPPFLAGS -DDEBUG"
fi
@ -182,9 +182,9 @@ fi
dnl --- THEORA -----------------
AC_ARG_WITH(theora,
[ --with-theora [Use theora (default: no)]])
if test "$with_theora" != "no" -a "x$with_theora" != "x"; then
if test "$VORBIS" = "no"; then
[ --with-theora [Use theora (default: autodetect)]])
if test "$with_theora" != "no"; then
if test "$VORBIS" = "no" -a "x$with_theora" != "x"; then
AC_MSG_ERROR(vorbis is required for theora support)
fi
AC_CHECK_HEADER(ogg/ogg.h,, THEORA=no)
@ -195,6 +195,8 @@ if test "$with_theora" != "no" -a "x$with_theora" != "x"; then
if test "x$with_theora" != "x" -a "$THEORA" = "no"; then
AC_MSG_ERROR(theora headers and/or libraries could not be found)
fi
else
THEORA=no
fi
dnl --- MIKMOD -----------------
@ -240,7 +242,8 @@ datarootdir=.
test "$datadir" = "NONE" && datadir=$datarootdir
dnl --- LUA includes -----------
AC_ARG_WITH(lua-includes, [ --with-lua-includes=DIR [Location of lua include directiories (default: check [PREFIX/include/lua51] and [PREFIX/include/lua5.1])]], LUA_INCLUDES="$withval")
AC_ARG_WITH(lua-includes, [ --with-lua-includes=DIR [Location of lua include directiories
(default: check [PREFIX/include/lua51], [PREFIX/include/lua5.1] and [/usr/include/lua51], [/usr/include/lua5.1])]], LUA_INCLUDES="$withval")
if test "$LUA_INCLUDES" != ""; then
CPPFLAGS="$CPPFLAGS -I$LUA_INCLUDES"
fi
@ -250,6 +253,12 @@ fi
if test -d "$prefix/include/lua5.1"; then
CPPFLAGS="$CPPFLAGS -I$prefix/include/lua5.1"
fi
if test -d "/usr/include/lua51"; then
CPPFLAGS="$CPPFLAGS -I/usr/include/lua51"
fi
if test -d "/usr/include/lua5.1"; then
CPPFLAGS="$CPPFLAGS -I/usr/include/lua5.1"
fi
dnl --- LUA --------------------
if test "$ARCH" = "linux"; then

2
debian/rules vendored
View file

@ -16,7 +16,7 @@ endif
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
CONFIGURE_FLAGS=--prefix=/usr --datadir=/usr/share/games/stratagus/default --with-theora
CONFIGURE_FLAGS=--prefix=/usr --datadir=/usr/share/games/stratagus/default
export CFLAGS