]> git.sesse.net Git - vlc/blobdiff - configure.ac
* http: added mime type for .css file.
[vlc] / configure.ac
index 05ccee287ea7fd11c88a0c1b1e7cba65ee8684dc..670d9124a7c6f8ec3ef144e2a76f6436ac83bc80 100644 (file)
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.36 2003/07/19 14:14:22 sigmunau Exp $
+dnl $Id: configure.ac,v 1.51 2003/08/01 00:40:05 fenrir Exp $
 
-AC_INIT(vlc,0.6.0)
+AC_INIT(vlc,0.6.1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Trevelyan"
@@ -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.6.0)
+AM_INIT_AUTOMAKE(vlc,0.6.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -767,8 +767,8 @@ dnl  default modules
 dnl
 #AX_ADD_BUILTINS([mpeg_video_old idct idctclassic motion])
 AX_ADD_PLUGINS([dummy rc logger gestures memcpy])
-AX_ADD_PLUGINS([es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv])
-AX_ADD_PLUGINS([mpeg_audio lpcm a52 dts cinepak])
+AX_ADD_PLUGINS([es mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
+AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak])
 AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
 AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
 AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
@@ -1358,6 +1358,28 @@ AC_ARG_ENABLE(satellite,
       AX_ADD_PLUGINS([satellite])
     fi])
 
+dnl
+dnl  DVB-S/DVB-T/DVB-C satellite/teresterial/cable input using v4l2
+dnl
+AC_ARG_ENABLE(dvb,
+  [  --enable-dvb            DVB-S/T/C card support (default disabled)])
+
+if test "${enable_dvb}" = "yes"
+then
+  AC_ARG_WITH(dvb,
+  [    --with-dvb=PATH       path to a dvb- and v4l2-enabled kernel tree],[],[])
+  if test "${with_dvb}" != "no" -a -n "${with_dvb}"
+  then
+    AX_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
+  fi
+
+  CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_dvb}"
+  AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
+    AX_ADD_PLUGINS([dvb])
+  ],[])
+  CPPFLAGS="${CPPFLAGS_save}"
+fi
+
 dnl
 dnl  ipv6 plugin - not for QNX yet
 dnl
@@ -1403,8 +1425,8 @@ dnl
 dnl  matroska demux plugin
 dnl
 AC_ARG_ENABLE(mkv,
-  [  --enable-mkv            Matroska demux support (default disabled)])
-if test "${enable_mkv}" = "yes"
+  [  --enable-mkv            Matroska demux support (default enabled)])
+if test "${enable_mkv}" != "no"
 then
 AC_LANG_PUSH(C++)
   dnl matroska headers include ebml headers directly... pouah that stinks
@@ -1418,8 +1440,6 @@ AC_LANG_PUSH(C++)
     ],[
       AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
     ])
-  ],[
-    AC_MSG_ERROR([libebml or libmatroska include files not found])
   ])
   CPPFLAGS="${CPPFLAGS_save}"
 AC_LANG_POP(C++)
@@ -1506,7 +1526,10 @@ if test "${enable_ffmpeg}" != "no"
 then
   AC_ARG_WITH(ffmpeg-mp3lame,
     [    --with-ffmpeg-mp3lame   if ffmpeg has been compiled with mp3lame support],
-    [ AX_ADD_LDFLAGS([stream_out_transcode],[-lmp3lame])
+    [
+      dnl  XXX: we don't link with -lavcodec a 2nd time because the OS X
+      dnl       linker would miserably barf on multiple definitions.
+      AX_ADD_LDFLAGS([stream_out_transcode],[])
       AX_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
 
   AC_ARG_WITH(ffmpeg-tree,
@@ -1695,10 +1718,14 @@ AC_ARG_ENABLE(quicktime,
 if test "${enable_quicktime}" != "no" &&
   (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
 then
+  if test "${SYS}" = "mingw32"; then
+    AX_ADD_BUILTINS([quicktime])
+  else
   AC_CHECK_HEADERS(QuickTime/QuickTime.h,
     [ AX_ADD_BUILTINS([quicktime])
       AX_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon])
-    ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
+    ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ])
+  fi
 fi
 
 dnl
@@ -1947,11 +1974,11 @@ You also need to check that you have a libogg posterior to the 1.0 release.])],
 fi
 
 dnl
-dnl   spudec support
+dnl   subsdec support
 dnl
-AX_ADD_LDFLAGS([spudec],[${LIBICONV}])
-AX_ADD_CPPFLAGS([spudec],[${INCICONV}])
-AX_ADD_PLUGINS([spudec])
+AX_ADD_LDFLAGS([subsdec],[${LIBICONV}])
+AX_ADD_CPPFLAGS([subsdec],[${INCICONV}])
+AX_ADD_PLUGINS([subsdec])
 
 
 dnl
@@ -1962,7 +1989,7 @@ dnl
 dnl   png
 dnl
 AC_CHECK_HEADERS(png.h, [
-    AX_ADD_LDFLAGS([logo],[-lpng])
+    AX_ADD_LDFLAGS([logo],[-lpng -lz])
     AX_ADD_PLUGINS([logo])])
 
 dnl
@@ -2435,6 +2462,7 @@ if test "${enable_skins}" != "no"; then
   if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
 
     AX_ADD_PLUGINS([skins])
+    ALIASES="${ALIASES} svlc"
     AX_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins])
     AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
     AX_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
@@ -2447,6 +2475,7 @@ if test "${enable_skins}" != "no"; then
     fi
 
     AX_ADD_PLUGINS([skins])
+    ALIASES="${ALIASES} svlc"
     AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS])
     AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti])
     AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`])
@@ -2522,6 +2551,25 @@ dnl     NEED_GTK2_MAIN=yes
 dnl   fi
 dnl fi
 
+dnl
+dnl  PDA Gtk+2 module
+dnl
+AC_ARG_ENABLE(pda,
+  [  --enable-pda           PDA interface needs Gtk2 suport (default disabled)])
+if test "x${enable_pda}" = "xyes"
+then
+  PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+  AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
+  AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
+  AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
+  AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}])
+  AX_ADD_PLUGINS([pda])
+  if test "${SYS}" != "mingw32"; then
+    NEED_GTK2_MAIN=yes
+  fi
+fi
+
+
 dnl
 dnl  Familiar module uses Gtk+ library
 dnl
@@ -2897,6 +2945,19 @@ then
   fi
 fi
 
+dnl 
+dnl  Joystick plugin
+dnl
+AC_ARG_ENABLE(joystick,
+  [  --enable-joystick       joystick control (default disabled)])
+if test "${enable_joystick}" = "yes"
+then
+ AC_CHECK_HEADER( linux/joystick.h, 
+               [AX_ADD_PLUGINS([joystick])]
+               )
+fi
+
+
 dnl
 dnl corba (ORBit) plugin
 dnl
@@ -3047,16 +3108,16 @@ dnl
 if test "${NEED_GTK_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([gtk_main])
-    AX_ADD_CFLAGS([gtk familiar],[-DNEED_GTK_MAIN])
-    AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar}])
-    AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar}])
+    AX_ADD_CFLAGS([gtk familiar pda],[-DNEED_GTK_MAIN])
+    AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_pda}])
+    AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_pda}])
 fi
 
 if test "${NEED_GNOME_MAIN}" != "no"
 then
     AX_ADD_PLUGINS([gnome_main])
-    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}])
-    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}])
+    AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_pda} ${CFLAGS_gnome}])
+    AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
 fi
 
 if test "${NEED_GTK2_MAIN}" != "no"
@@ -3209,6 +3270,7 @@ AC_OUTPUT([
   src/Makefile
 
   modules/access/Makefile
+  modules/access/dvb/Makefile
   modules/access/dvd/Makefile
   modules/access/dvdplay/Makefile
   modules/access/dvdread/Makefile
@@ -3237,23 +3299,23 @@ AC_OUTPUT([
   modules/codec/mpeg_video/idct/Makefile
   modules/codec/mpeg_video/motion/Makefile
   modules/codec/spudec/Makefile
+  modules/codec/subsdec/Makefile
   modules/control/Makefile
   modules/control/corba/Makefile
   modules/control/lirc/Makefile
   modules/control/rc/Makefile
   modules/demux/Makefile
-  modules/demux/aac/Makefile
   modules/demux/asf/Makefile
   modules/demux/avi/Makefile
   modules/demux/mp4/Makefile
   modules/demux/mpeg/Makefile
   modules/demux/util/Makefile
-  modules/demux/wav/Makefile
   modules/encoder/Makefile
   modules/encoder/ffmpeg/Makefile
   modules/gui/Makefile
   modules/gui/beos/Makefile
   modules/gui/familiar/Makefile
+  modules/gui/pda/Makefile
   modules/gui/gtk/Makefile
   modules/gui/gtk2/Makefile
   modules/gui/kde/Makefile
@@ -3262,7 +3324,6 @@ AC_OUTPUT([
   modules/gui/qnx/Makefile
   modules/gui/qt/Makefile
   modules/gui/skins/Makefile
-  modules/gui/win32/Makefile
   modules/gui/wxwindows/Makefile
   modules/misc/Makefile
   modules/misc/dummy/Makefile