add --use-3dnow argument

[platform/upstream/flac.git] / configure.in

diff --git a/configure.in b/configure.in
index 63199fa..5310a84 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@
 # instead of FLAC__ since autoconf triggers off 'AC_' in strings
 
 AC_INIT(src/flac/main.c)
-AM_INIT_AUTOMAKE(flac, 1.0)
+AM_INIT_AUTOMAKE(flac, 1.0.1)
 
 # We need two libtools, one that builds both shared and static, and
 # one that builds only static.  This is because the resulting libtool
@@ -40,7 +40,7 @@ AM_CONDITIONAL(FLaC__CPU_IA32, test x$cpu_ia32 = xtrue)
 AM_CONDITIONAL(FLaC__CPU_PPC, test x$cpu_ppc = xtrue)
 AM_CONDITIONAL(FLaC__CPU_SPARC, test x$cpu_sparc = xtrue)
 case "$host" in
-       i[3-6]86-*-openbsd*) OBJ_FORMAT=aoutb ;;
+       i[[3-6]]86-*-openbsd*) OBJ_FORMAT=aoutb ;;
        *) OBJ_FORMAT=elf ;;
 esac
 AC_SUBST(OBJ_FORMAT)
@@ -76,6 +76,25 @@ if test x$sse_os = xtrue ; then
 AC_DEFINE(FLAC__SSE_OS)
 fi
 
+[  --use-3dnow                 Enable 3DNOW! support],
+[case "${enableval}" in
+       yes) use_3dnow=true ;;
+       no)  use_3dnow=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --use-3dnow) ;;
+esac],[use_3dnow=false])
+AM_CONDITIONAL(FLaC__USE_3DNOW, test x$use_3dnow = xtrue)
+if test x$use_3dnow = xtrue ; then
+AC_DEFINE(FLAC__USE_3DNOW)
+fi
+
+AC_CHECK_LIB(ogg, ogg_stream_init,
+             [LIBS="$LIBS -logg"; have_ogg=yes],
+             [AC_MSG_WARN([*** Ogg development enviroment not installed - ogg support will not be built])])
+AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
+if test x$have_ogg = xyes ; then
+AC_DEFINE(FLAC__HAS_OGG)
+fi
+
 AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
 AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
 
@@ -136,7 +155,7 @@ AC_SUBST(FLaC__SIZE64)
 AC_SUBST(FLaC__USIZE64)
 
 SAVE_CFLAGS="$CFLAGS"
-CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W'
+CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
 if test x$debug = xtrue; then
        CFLAGS="$CFLAGS -g -O0 -DDEBUG"
 else
@@ -151,6 +170,9 @@ AC_OUTPUT(  Makefile        \
        src/Makefile    \
        src/libFLAC/Makefile    \
        src/libFLAC/ia32/Makefile       \
+       src/libFLAC/include/Makefile    \
+       src/libFLAC/include/private/Makefile    \
+       src/libFLAC/include/protected/Makefile  \
        src/flac/Makefile       \
        src/metaflac/Makefile   \
        src/plugin_xmms/Makefile        \
@@ -159,5 +181,9 @@ AC_OUTPUT(  Makefile        \
        include/Makefile \
        include/FLAC/Makefile \
        include/FLAC/ordinals.h \
+       doc/Makefile \
+       doc/images/Makefile \
+       doc/ru/Makefile \
+       man/Makefile \
        test/Makefile   \
 )