ogt.c cvd.c, subtitle.h: move common debug string help into subtitle.h

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 54324a00cc9ef560c73ab191921dcd3e2a58e6a0..ee9a3d03a1409375c5c17d8f51233d78d31f0e1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.126 2003/12/01 23:39:11 gbazin Exp $
+dnl $Id: configure.ac,v 1.138 2004/01/02 23:22:37 zorglub Exp $
 
-AC_INIT(vlc,0.7.0-test1)
+AC_INIT(vlc,0.7.0)
 
 CONFIGURE_LINE="$0 $*"
-CODENAME="Trevelyan"
+CODENAME="Bond"
 
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/libvlc.c)
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.0-test1)
+AM_INIT_AUTOMAKE(vlc,0.7.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -83,6 +83,8 @@ if test -d ${topdir}/extras/contrib/lib; then
   fi
   LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
   LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
+  with_livedotcom_tree=${topdir}/extras/contrib/src/live
+  with_goom_tree=${topdir}/extras/contrib/src/goom
 fi
 
 dnl
@@ -160,6 +162,7 @@ case "${target_os}" in
     SYS=beos
     CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
+    AX_ADD_CXXFLAGS([beos],[])
     AX_ADD_LDFLAGS([vlc beos],[-lbe])
     AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
 
@@ -1490,10 +1493,12 @@ if test "${enable_cddax}" != "no"
 then
   PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
    [enable_cddax="no"
+    AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
     AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
     AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
     AX_ADD_PLUGINS([cddax])], 
-   [AC_MSG_WARN(libcdio library not found)])
+   [AC_MSG_WARN(libcdio library not found)
+   HAVE_CDDAX=no])
 
   if test x$enable_cddb != no; then
     PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
@@ -1517,10 +1522,13 @@ then
   then
     PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20-cdio,
      [enable_vcd="no"
+      AC_DEFINE(HAVE_VCDX, [], 
+      [Define for the VCD plugin using libcdio/libvcdinfo])
       AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
       AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
       AX_ADD_PLUGINS([vcdx])], 
-     [AC_MSG_WARN(vcdinfo library not found)])
+     [AC_MSG_WARN(vcdinfo library not found)
+     HAVE_VCDX=no])
   fi
 fi
 
@@ -1577,6 +1585,8 @@ AC_ARG_ENABLE(satellite,
   [  --enable-satellite      satellite card support (default disabled)],
   [ if test "${enable_satellite}" = "yes"
     then
+      AC_DEFINE(HAVE_SATELLITE, [], 
+      [Define for the VCD plugin using libcdio/libvcdinfo])
       AX_ADD_PLUGINS([satellite])
     fi])
 
@@ -2428,7 +2438,7 @@ then
   fi
   AX_ADD_PLUGINS([qte])
   NEED_QTE_MAIN=yes
-  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+  CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
   AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
     AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
   ] )
@@ -2983,7 +2993,7 @@ AC_ARG_ENABLE(opie,
        AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`])
        AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`])
      fi
-     CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}"
+     CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
      AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
        AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
      ] )
@@ -3349,8 +3359,8 @@ fi
 if test "${NEED_GNOME_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([gnome_main])
-    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_pda} ${CFLAGS_gnome}])
-    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
+    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}])
+    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}])
 fi
 
 if test "${NEED_GTK2_MAIN}" != "no"
@@ -3487,9 +3497,7 @@ AX_VLC_SUBSTS
 dnl Create vlc-config.in
 AX_OUTPUT_VLC_CONFIG_IN
 
-AC_OUTPUT([
-  vlc-config
-
+AC_CONFIG_FILES([
   Makefile
   autotools/Makefile
   debian/Makefile
@@ -3503,7 +3511,9 @@ AC_OUTPUT([
   po/Makefile.in
   share/Makefile
   src/Makefile
+])
 
+AC_CONFIG_FILES([
   modules/access/Makefile
   modules/access/dshow/Makefile
   modules/access/dvb/Makefile
@@ -3573,11 +3583,12 @@ AC_OUTPUT([
   modules/visualization/scope/Makefile
   modules/visualization/xosd/Makefile
   modules/visualization/visual/Makefile
-],[
-  chmod 0755 vlc-config
 ])
 
-dnl Generate makefiles found by bootstrap
+AC_CONFIG_FILES([vlc-config], [chmod 0755 vlc-config])
+
+dnl Generate makefiles
+AC_OUTPUT
 
 printf "
 vlc configuration