* configure.ac, modules/mux/ogg.c, modules/stream_out/transcode.c: vorbis transcoding...

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index b6cee5cffba7a38dc3975a7f2cd599807b3019cb..6633f174b867313a0837321202e919fcf23f4f17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,5 @@
 dnl Autoconf settings for vlc
+dnl $Id: configure.ac,v 1.17 2003/06/29 20:58:16 gbazin Exp $
 
 AC_INIT(vlc,0.6.0)
 
@@ -156,7 +157,7 @@ AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT
 if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
   AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
-  INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
+  INCLUDES="${INCLUDES} -I\$(top_builddir)/intl"
 else
   AC_CHECK_FUNCS(textdomain,,[
     AC_CHECK_LIB(intl,textdomain,
@@ -438,7 +439,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
@@ -1387,7 +1388,12 @@ AC_LANG_PUSH(C++)
   AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
     AX_ADD_PLUGINS([mkv])
     AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
-    AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+    AC_CHECK_LIB(ebml_pic,main,[
+      # We have ebml_pic, that's good, we can build an mkv.so plugin !
+      AX_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
+    ],[
+      AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+    ])
   ],[
     AC_MSG_ERROR([libebml or libmatroska include files not found])
   ])
@@ -1528,6 +1534,9 @@ then
   AX_ADD_CPPFLAGS([encoder_ffmpeg],[${CPPFLAGS_ffmpeg}])
   dnl XXX: we don't link with -lavcodec blah blah blah
   dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}])
+
+  AC_CHECK_HEADERS(vorbis/vorbisenc.h vorbis/codec.h,
+    AX_ADD_LDFLAGS([stream_out_transcode],[-lvorbisenc -lvorbis -logg]) )
 fi
 
 dnl
@@ -3102,7 +3111,7 @@ AC_SUBST(PLUGIN_PATH)
 dnl
 dnl  Handle substvars that use $(top_srcdir)
 dnl
-VLC_CONFIG="\$(top_srcdir)/vlc-config"
+VLC_CONFIG="\$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
 CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"