add OggFLAC dirs

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

diff --git a/configure.in b/configure.in
index 700b117..5e60d1a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,7 @@ AM_PROG_LIBTOOL
 sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static
 chmod +x libtool-disable-static
 
+AC_PROG_CXX
 AC_PROG_MAKE_SET
 
 dnl check for getopt in standard library
@@ -92,9 +93,7 @@ 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_PATH_OGG(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)
@@ -105,6 +104,49 @@ AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
 
 SHARE_LIBS='$(top_builddir)/src/share/libutf8.a $(top_builddir)/src/share/libgetopt.a'
 
+dnl check for i18n(internationalization); these are from libiconv/gettext
+AM_WITH_NLS
+AM_ICONV
+AM_LANGINFO_CODESET
+
+dnl check id3lib libraries
+LIBS_save_blah_blah_blah=$LIBS
+LIBS=""
+AC_SEARCH_LIBS(ID3Tag_Link,"id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++",
+               [have_id3lib=yes],
+               [AC_MSG_WARN([id3lib not found - ID3v2 will not be supported, internal function support only id3v1])])
+AM_CONDITIONAL(FLaC__HAS_ID3LIB, [test x$have_id3lib = xyes])
+if test x$have_id3lib = xyes ; then
+AC_DEFINE(FLAC__HAS_ID3LIB)
+ID3LIBS=$LIBS
+fi
+AC_SUBST(ID3LIBS)
+
+dnl expected version for cross compiling
+ID3LIB_MAJOR=3
+ID3LIB_MINOR=8
+ID3LIB_PATCH=0
+
+AC_MSG_CHECKING(for id3lib version)
+      AC_TRY_RUN([
+#include <id3.h>
+#include <stdio.h>
+int 
+main ()
+{
+    FILE *output;
+    output=fopen("conftest.id3","w");
+    fprintf(output,"ID3LIB_MAJOR=%d\nID3LIB_MINOR=%d\nID3LIB_PATCH=%d\n",ID3LIB_MAJOR_VERSION,ID3LIB_MINOR_VERSION,ID3LIB_PATCH_VERSION);
+    fclose(output);
+    exit(0);
+}
+], . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
+AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR)
+AC_DEFINE_UNQUOTED(ID3LIB_MINOR, $ID3LIB_MINOR)
+AC_DEFINE_UNQUOTED(ID3LIB_PATCH, $ID3LIB_PATCH)
+
+LIBS=$LIBS_save_blah_blah_blah
+
 AC_CHECK_PROGS(NASM, nasm)
 AM_CONDITIONAL(FLaC__HAS_NASM, test -n "$NASM")
 if test -n "$NASM" ; then
@@ -163,39 +205,47 @@ AC_SUBST(FLaC__USIZE64)
 
 AC_SUBST(SHARE_LIBS)
 
-SAVE_CFLAGS="$CFLAGS"
-CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
+OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
 if test x$debug = xtrue; then
-       CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+       OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
 else
-       CFLAGS="$CFLAGS -O3 -DNDEBUG"
+       OUR_CFLAGS_TAIL="-O3 -DNDEBUG"
        if test x$GCC = xyes; then
-               CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+               OUR_CFLAGS_TAIL="$OUR_CFLAGS_TAIL -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
        fi
 fi
-CFLAGS="$CFLAGS $SAVE_CFLAGS"
-
-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        \
-       src/share/Makefile      \
-       src/test_streams/Makefile       \
-       src/test_unit/Makefile  \
+CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS $OUR_CFLAGS_TAIL"
+CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS $OUR_CFLAGS_TAIL"
+
+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/libFLAC++/Makefile \
+       src/libOggFLAC/Makefile \
+       src/libOggFLAC/include/Makefile \
+       src/libOggFLAC/include/protected/Makefile \
+       src/libOggFLAC++/Makefile \
+       src/flac/Makefile \
+       src/metaflac/Makefile \
+       src/plugin_xmms/Makefile \
+       src/share/Makefile \
+       src/test_libFLAC/Makefile \
+       src/test_libFLAC++/Makefile \
+       src/test_streams/Makefile \
        include/Makefile \
        include/FLAC/Makefile \
        include/FLAC/ordinals.h \
        include/FLAC++/Makefile \
        include/share/Makefile \
        doc/Makefile \
-       doc/images/Makefile \
-       doc/ru/Makefile \
+       doc/html/Makefile \
+       doc/html/images/Makefile \
+       doc/html/ru/Makefile \
        man/Makefile \
-       test/Makefile   \
+       test/Makefile \
 )