dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.53 2003/08/03 13:49:37 titer Exp $
+dnl $Id: configure.ac,v 1.68 2003/08/24 11:17:39 gbazin Exp $
-AC_INIT(vlc,0.6.2-cvs)
+AC_INIT(vlc,0.6.3-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Trevelyan"
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.2-cvs)
+AM_INIT_AUTOMAKE(vlc,0.6.3-cvs)
AM_CONFIG_HEADER(config.h)
dnl
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
- AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd],[-lws2_32])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
fi
;;
*nto*)
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
+ALL_LINGUAS="de en_GB es fr it ja nl no pl pt_BR ru sv"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
+dnl Check for setlocal and langinfo
+AC_CHECK_FUNCS(setlocale)
+AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_FUNCS(nl_langinfo)
+
+AC_CACHE_CHECK([for nl_langinfo and CODESET], ac_cv_langinfo_codeset,
+ [AC_TRY_LINK([#include <langinfo.h>],
+ [char* cs = nl_langinfo(CODESET);],
+ ac_cv_langinfo_codeset=yes,
+ ac_cv_langinfo_codeset=no)
+ ])
+if test ${ac_cv_langinfo_codeset} = yes; then
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+fi
+
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
AX_ADD_LDFLAGS([vlc ipv4],-lsocket)
dnl
if test "${SYS}" != "mingw32"; then
AX_ADD_PLUGINS([screensaver])
+else
+ AX_ADD_PLUGINS([ntservice])
fi
dnl
fi
fi
+dnl
+dnl Windows DirectShow access module
+dnl
+AC_ARG_ENABLE(dshow,
+ [ --enable-dshow Win32 DirectShow support (default enabled on Win32)])
+if test "${enable_dshow}" != "no"
+then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ then
+ AC_CHECK_HEADERS(dshow.h,
+ [ AX_ADD_PLUGINS([dshow])
+ AX_ADD_CXXFLAGS([dshow],[])
+ AX_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ])
+ fi
+fi
+
dnl
dnl libdvbpsi ts demux/mux
dnl
dnl matroska headers include ebml headers directly... pouah that stinks
CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+ AC_CHECK_HEADERS(matroska/KaxAttachments.h)
AX_ADD_PLUGINS([mkv])
AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
AC_CHECK_LIB(ebml_pic,main,[
[ --enable-mga Linux kernel Matrox support (default disabled)],
[ if test "${enable_mga}" = "yes"
then
- AX_ADD_PLUGINS([mga xmga])
+ AX_ADD_PLUGINS([mga])
fi ])
dnl
dnl PDA Gtk+2 module
dnl
AC_ARG_ENABLE(pda,
- [ --enable-pda PDA interface needs Gtk2 suport (default disabled)])
+ [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
if test "x${enable_pda}" = "xyes"
then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
fi
fi
-
-dnl
-dnl Familiar module uses Gtk+ library
-dnl
-AC_ARG_ENABLE(familiar,
- [ --enable-familiar Familiar Gtk+ support (default disabled)])
-if test "${enable_familiar}" = "yes"
-then
- GTK_PATH="${PATH}"
- AC_ARG_WITH(gtk-config-path,
- [ --with-gtk-config-path=PATH gtk-config path (default search in \$PATH)],
- [ if test "${with_gtk_config_path}" != "no"
- then
- GTK_PATH="${with_gtk_config_path}:${PATH}"
- fi ])
- # look for gtk-config
- AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH})
- GTK_CONFIG=${GTK12_CONFIG}
- if test "${GTK_CONFIG}" = "no"
- then
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
- fi
- # check for cross-compiling
- GTK_PREFIX=
- AC_ARG_WITH(gtk-prefix,
- [ --with-gtk-prefix=PATH path to libgtk (needed for cross-compiling),
- e.g use as:
- --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
- if test "${with_gtk_prefix}" != "no" -a -n "${with_gtk_prefix}"
- then
- GTK_PREFIX="--prefix=${with_gtk_prefix}"
- fi
- if test "${GTK_CONFIG}" != "no"
- then
- if expr 1.2.0 \> `${GTK_CONFIG} --version` >/dev/null
- then
- AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar.])
- fi
- AX_ADD_CFLAGS([familiar],[`${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`])
- AX_ADD_LDFLAGS([familiar],[`${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`])
- # now look for the gtk.h header
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar}"
- ac_cv_gtk_headers=yes
- AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [
- ac_cv_gtk_headers=no
- echo "Cannot find gtk development headers."
- ])
- if test "${ac_cv_gtk_headers}" = "yes"
- then
- AX_ADD_PLUGINS([familiar])
- fi
- CPPFLAGS="${CPPFLAGS_save}"
-
- # now look for gpe support
- AC_ARG_WITH(gpe-prefix,
- [ --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[])
- if test "${with_gpe_prefix}" != "no" -a -n "${with_gpe_prefix}"
- then
- AX_ADD_CFLAGS([gpe],[-I${with_gpe_prefix}/include])
- AX_ADD_LDFLAGS([gpe],[-lXi -lgdk_pixbuf -L${with_gpe_prefix}/lib -lgpewidget])
- # now look for gpe/init.h header file
- CFLAGS_save="${CFLAGS}"
- LDFLAGS_save="${LDFLAGS}"
- CFLAGS="${CFLAGS_familiar} ${CFLAGS_gpe}"
- LDFLAGS="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar} ${CFLAGS_gpe}"
- ac_cv_gpe_headers=yes
- AC_CHECK_HEADERS(gpe/init.h, ,
- [ ac_cv_gpe_headers=no
- AC_MSG_ERROR([Cannot find development headers for libgpewidget...]) ])
- CFLAGS="${CFLAGS_save}"
- LDFLAGS="${LDFLAG_save}"
- if test "${ac_cv_gpe_headers}" = "yes"
- then
- AX_ADD_CFLAGS([familiar],[${CFLAGS_gpe}])
- AX_ADD_LDFLAGS([familiar],[${LDFLAGS_gpe}])
- fi
- else
- NEED_GTK_MAIN=yes
- fi # end gpe support
- fi # end gtk+ support
-fi
-
dnl
dnl Gnome module
dnl
fi
fi
+dnl
+dnl Visualisation plugin
+dnl
+AC_ARG_ENABLE(visual,
+ [ --enable-visual visualisation plugin (default enabled)])
+if test "${enable_visual}" != "no"
+then
+ AX_ADD_PLUGINS([visual])
+fi
+
+dnl
+dnl goom visualization plugin
+dnl
+AC_ARG_ENABLE(goom,
+[ --enable-goom goom visualisation plugin (default disabled)])
+if test "${enable_goom}" = "yes"
+then
+ AC_ARG_WITH(goom-tree,
+ [ --with-goom-tree=PATH goom tree for static linking (required)])
+
+ dnl
+ dnl test for --with-goom-tree
+ dnl
+ if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}";then
+ AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+ real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"
+ if test -z "${real_goom_tree}"; then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_goom_tree}])
+ fi
+ if test -f "${real_goom_tree}/libgoom.a"; then
+ AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+ AX_ADD_BUILTINS([goom])
+ AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
+ AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}])
+ else
+ dnl The given libgoom wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}])
+ fi
+ else
+ dnl The --with-goom-tree isn't specified wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([You have to specify a tree with --with-goom-tree])
+ fi
+fi
+
dnl
dnl SLP access plugin
dnl
[ --with-slp=PATH libslp headers and libraries])
if test -z "${with_slp}"
then
- AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
+ AC_CHECK_HEADERS(slp.h, have_slp="true", have_slp="false")
if test "${have_slp}" = "true"
then
AX_ADD_PLUGINS([slp])
AX_ADD_LDFLAGS([slp],[-lslp])
+ AX_ADD_LDFLAGS([stream_out_standard],[-lslp])
fi
else
AC_MSG_CHECKING(for slp headers in ${with_slp})
AC_MSG_RESULT(yes)
AX_ADD_PLUGINS([slp])
AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp])
+ AX_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp])
AX_ADD_CPPFLAGS([slp],[-I${with_slp}])
+ AC_DEFINE(HAVE_SLP_H)
else
dnl No libslp could be found, sorry
AC_MSG_RESULT(no)
if test "${NEED_GTK_MAIN}" != "no"
then
AX_ADD_PLUGINS([gtk_main])
- 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}])
+ AX_ADD_CFLAGS([gtk pda],[-DNEED_GTK_MAIN])
+ AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_pda}])
+ AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${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_pda} ${CFLAGS_gnome}])
- AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
+ AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_pda} ${CFLAGS_gnome}])
+ AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_pda} ${LDFLAGS_gnome}])
fi
if test "${NEED_GTK2_MAIN}" != "no"
src/Makefile
modules/access/Makefile
+ modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/dvd/Makefile
modules/access/dvdplay/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/visualization/Makefile
modules/visualization/scope/Makefile
modules/visualization/xosd/Makefile
+ modules/visualization/visual/Makefile
],[
chmod 0755 vlc-config
])
projects / vlc / blobdiff