X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=05c12f38f4fa7bd87da7e953ec2473b8a6002d49;hb=1312bc9ee83bb3962380e172b87d8711ff164c73;hp=488e26d14e6c4acbf40071f3f9285059552b2118;hpb=ae141f9a5e91ac456796b43e70cac62783eefe20;p=vlc diff --git a/configure.ac b/configure.ac index 488e26d14e..05c12f38f4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Autoconf settings for vlc -dnl $Id: configure.ac,v 1.55 2003/08/10 21:26:07 gbazin Exp $ +dnl $Id: configure.ac,v 1.67 2003/08/23 22:49:50 fenrir Exp $ -AC_INIT(vlc,0.6.2) +AC_INIT(vlc,0.6.3-cvs) 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.2) +AM_INIT_AUTOMAKE(vlc,0.6.3-cvs) AM_CONFIG_HEADER(config.h) dnl @@ -117,7 +117,7 @@ case "${target_os}" in # 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*) @@ -157,7 +157,7 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") 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 @@ -255,6 +255,22 @@ AC_CHECK_FUNCS(strdup strndup atof lseek) 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 ], + [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 and nl_langinfo(CODESET).]) +fi + AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ AX_ADD_LDFLAGS([vlc ipv4],-lsocket) @@ -802,6 +818,8 @@ dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32"; then AX_ADD_PLUGINS([screensaver]) +else + AX_ADD_PLUGINS([ntservice]) fi dnl @@ -1436,6 +1454,7 @@ AC_LANG_PUSH(C++) 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,[ @@ -2260,7 +2279,7 @@ AC_ARG_ENABLE(mga, [ --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 @@ -2559,7 +2578,7 @@ 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]) @@ -2817,6 +2836,54 @@ then 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 @@ -2828,11 +2895,12 @@ then [ --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}) @@ -2842,7 +2910,9 @@ then 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) @@ -3266,6 +3336,7 @@ AC_OUTPUT([ modules/visualization/Makefile modules/visualization/scope/Makefile modules/visualization/xosd/Makefile + modules/visualization/visual/Makefile ],[ chmod 0755 vlc-config ])