[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus configure.in
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus configure.in |
Date: |
24 Dec 2003 04:26:17 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 03/12/24 04:26:16
Modified files:
. : configure.in
Log message:
change some default options
Patches:
Index: stratagus/configure.in
diff -u stratagus/configure.in:1.31 stratagus/configure.in:1.32
--- stratagus/configure.in:1.31 Tue Nov 11 13:04:59 2003
+++ stratagus/configure.in Wed Dec 24 04:26:16 2003
@@ -141,16 +141,13 @@
dnl --- CHECK FOR ZZIPLIB ------
AC_ARG_WITH(zziplib,
- [ --with-zziplib [Use zziplib (default: autodetect)]],,
with_zziplib="yes")
-if test "$ZZIPLIB" != "no"; then
- AC_CHECK_LIB(zziplib, main,
- [ZZIPLIB_CFLAGS="-DUSE_ZZIPLIB"
- ZZIPLIB_LIBS="-lzzip"],
- [ZZIPLIB_CFLAGS=""
- ZZIPLIB_LIBS=""])
-else
+ [ --with-zziplib [Use zziplib (default: no)]],, with_zziplib="yes")
+if test "$ZZIPLIB" != "yes"; then
ZZIPLIB_CFLAGS=""
ZZIPLIB_LIBS=""
+else
+ ZZIPLIB_CFLAGS="-DUSE_ZZIPLIB"
+ ZZIPLIB_LIBS="-lzzip"
fi
AC_SUBST(ZZIPLIB_CFLAGS)
AC_SUBST(ZZIPLIB_LIBS)
@@ -177,15 +174,15 @@
dnl --- CHECK FOR MAD LIB ------
AC_ARG_WITH(mad,
- [ --with-mad [Use mad mp3 (default: autodetect)]],
MAD="$with_mad")
+ [ --with-mad [Use mad mp3 (default: no)]], MAD="$with_mad")
MAD_CFLAGS=
MAD_LIBS=
-if test "$MAD" != "no"; then
- AC_CHECK_HEADERS(mad.h, MAD=yes, MAD=no)
- if test "$MAD" != "no"; then
- MAD_CFLAGS="-DUSE_MAD"
- MAD_LIBS="-lmad"
- fi
+if test "$MAD" != "yes"; then
+ MAD_CFLAGS=""
+ MAD_LIBS=""
+else
+ MAD_CFLAGS="-DUSE_MAD"
+ MAD_LIBS="-lmad"
fi
AC_SUBST(MAD_CFLAGS)
AC_SUBST(MAD_LIBS)
@@ -193,15 +190,13 @@
dnl --- CHECK FOR FLAC LIB -----
AC_ARG_WITH(flac,
- [ --with-flac [Use FLAC (default: autodetect)]],
FLAC="$with_flac")
-FLAC_CFLAGS=
-FLAC_LIBS=
-if test "$FLAC" != "no"; then
- AC_CHECK_HEADERS(FLAC/all.h, FLAC=yes, FLAC=no)
- if test "$FLAC" != "no"; then
- FLAC_CFLAGS="-DUSE_FLAC"
- FLAC_LIBS="-lFLAC"
- fi
+ [ --with-flac [Use FLAC (default: no)]], FLAC="$with_flac")
+if test "$FLAC" != "yes"; then
+ FLAC_CFLAGS=
+ FLAC_LIBS=
+else
+ FLAC_CFLAGS="-DUSE_FLAC"
+ FLAC_LIBS="-lFLAC"
fi
AC_SUBST(FLAC_CFLAGS)
AC_SUBST(FLAC_LIBS)
@@ -210,18 +205,18 @@
dnl --- CHECK FOR CDAUDIO ------
AC_ARG_WITH(cdaudio,
[ --with-cdaudio=libcda,sdlcd,cdda,no
- [Enable CD Audio support (default:
platform-dependant)]], CDAUDIO="$with_cdaudio")
+ [Enable CD Audio support (default: no)]],
CDAUDIO="$with_cdaudio")
if test "$CDAUDIO" = "sdl"; then
CDAUDIO_CFLAGS="`sdl-config --cflags`"
CDAUDIO_LIBS=""
-elif test "$CDAUDIO" = "no" -o "$PLATFORM" = "-DBSD"; then
- CDAUDIO_CFLAGS=""
- CDAUDIO_LIBS=""
elif test "$CDAUDIO" = "cdda"; then
CDAUDIO_CFLAGS="-DUSE_CDDA"
CDAUDIO_LIBS=""
-else
+elif test "$CDAUDIO" = "libcda"; then
CDAUDIO_CFLAGS="-DUSE_LIBCDA"
+ CDAUDIO_LIBS=""
+else
+ CDAUDIO_CFLAGS=""
CDAUDIO_LIBS=""
fi
AC_SUBST(CDAUDIO_CFLAGS)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus configure.in,
address@hidden <=