Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor cleanups; freebsd fixes

Browse source
This commit is contained in:
nehalmistry 2004-03-06 08:36:58 +00:00
parent 86273b6566
commit 5c3f680fde
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.in
View file

@ -91,7 +91,10 @@ dnl [ --enable-optimization [Enable detection of optimization flags (defau
dnl FIXME: todo dnl FIXME: todo
AC_CHECK_PROGS(SDLCONFIG, sdl-config) AC_CHECK_PROGS(SDLCONFIG, sdl-config)
VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`" if test x$SDLCONFIG = x; then
AC_CHECK_PROGS(SDLCONFIG, sdl11-config)
fi
VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `$SDLCONFIG --cflags`"
if test "$enable_static" != "yes"; then if test "$enable_static" != "yes"; then
VIDEO_LIBS="`$SDLCONFIG --libs`" VIDEO_LIBS="`$SDLCONFIG --libs`"
else else
@ -104,6 +107,9 @@ if test "$WIN32" = "1"; then
VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32 -lmingwex -lgmon" VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32 -lmingwex -lgmon"
fi fi
fi fi
if test $ARCH = bsd; then
VIDEO_LIBS="$VIDEO_LIBS -lc"
fi
AC_SUBST(VIDEO_CFLAGS) AC_SUBST(VIDEO_CFLAGS)
AC_SUBST(VIDEO_LIBS) AC_SUBST(VIDEO_LIBS)
AC_SUBST(THREAD_LIBS) AC_SUBST(THREAD_LIBS)
@ -200,7 +206,7 @@ AC_ARG_WITH(cdaudio,
[ --with-cdaudio=libcda,sdlcd,cdda,no [ --with-cdaudio=libcda,sdlcd,cdda,no
[Enable CD Audio support (default: no)]], CDAUDIO="$with_cdaudio") [Enable CD Audio support (default: no)]], CDAUDIO="$with_cdaudio")
if test "$CDAUDIO" = "sdl"; then if test "$CDAUDIO" = "sdl"; then
CDAUDIO_CFLAGS="`sdl-config --cflags`" CDAUDIO_CFLAGS="`$SDLCONFIG --cflags`"
CDAUDIO_LIBS="" CDAUDIO_LIBS=""
elif test "$CDAUDIO" = "cdda"; then elif test "$CDAUDIO" = "cdda"; then
CDAUDIO_CFLAGS="-DUSE_CDDA" CDAUDIO_CFLAGS="-DUSE_CDDA"
@ -231,7 +237,7 @@ if test x$LUACONFIG != x; then
else else
LUA_CFLAGS="$CFLAGS" LUA_CFLAGS="$CFLAGS"
LUA_LIBS="$LIBS" LUA_LIBS="$LIBS"
if test x$WIN32 = x ; then if test $ARCH = linux ; then
LUA_LIBS="$LUA_LIBS -ldl" LUA_LIBS="$LUA_LIBS -ldl"
fi fi
AC_CHECK_LIB(lua, lua_getfenv, LUA_LIBS="$LUA_LIBS -llua", AC_CHECK_LIB(lua, lua_getfenv, LUA_LIBS="$LUA_LIBS -llua",