X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=4e3e28ee08b88dbab2d1ff4f9d95c764a61a0076;hb=1614fdf0fb5397aa7bee1bd9df2326770f4315cd;hp=0ec52ab2c5d1fe366565d52d9b6a9edf2f2b0de1;hpb=08e151343277c5f72347a55518a9eca5d1dc18e0;p=vlc

diff --git a/configure.ac b/configure.ac
index 0ec52ab2c5..4e3e28ee08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
 dnl Check for system libs needed
 need_libc=false
 
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon)
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof)
@@ -392,22 +392,14 @@ if test $ac_cv_struct_sockaddr_storage = no; then
 fi
 
 dnl getnameinfo, which implies {get,free}addrinfo, but not gai_strerror,
-dnl -lws2_32 required with Mingw32, -lresolv NOT needed on Solaris.
-dnl AC_SEARCH_LIBS won't work with Mingw32
+dnl not available on win32 and -lresolv NOT needed on Solaris.
 AH_TEMPLATE(HAVE_GETNAMEINFO,
   [Define to 1 if you have the `getnameinfo' function.])
-ac_func_getnameinfo_save_LIBS=$LIBS
-AS_IF([test "${SYS}" = "mingw32"],
-  [LIBS="-lws2_32 $LIBS"])
+AH_TEMPLATE(HAVE_GAI_STRERROR,
+  [Define to 1 if you have the `gai_strerror' function.])
 AC_CACHE_CHECK([for getnameinfo], ac_cv_func_getnameinfo,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([
 [#include <sys/types.h>
-#if defined( UNDER_CE )
-# include <winsock.h>
-#elif defined( WIN32 )
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
 # include <sys/socket.h>
 # include <netdb.h>
 #endif]
@@ -415,29 +407,8 @@ AC_CACHE_CHECK([for getnameinfo], ac_cv_func_getnameinfo,
 ac_cv_func_getnameinfo=yes,
 ac_cv_func_getnameinfo=no)])
 AS_IF([test $ac_cv_func_getnameinfo = yes],
-  [AC_DEFINE(HAVE_GETNAMEINFO)])
-LIBS=$ac_func_getnameinfo_save_LIBS
-
-dnl Cannot have gai_strerror if not getaddrinfo
-AH_TEMPLATE(HAVE_GAI_STRERROR,
-  [Define to 1 if you have the `gai_strerror' function.])
-AC_CACHE_CHECK([for gai_strerror], ac_cv_func_gai_strerror,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([
-[#include <sys/types.h>
-#if defined( UNDER_CE )
-# include <winsock.h>
-#elif defined( WIN32 )
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
-# include <sys/socket.h>
-# include <netdb.h>
-#endif]], [[gai_strerror(0);]])],
-ac_cv_func_gai_strerror=yes,
-ac_cv_func_gai_strerror=no)])
-AS_IF([test $ac_cv_func_gai_strerror = yes],
-  [AC_DEFINE(HAVE_GAI_STRERROR)],
-  [gai_support=no])
+  [AC_DEFINE(HAVE_GETNAMEINFO)
+   AC_DEFINE(HAVE_GAI_STRERROR)])
 
 dnl Check for va_copy
 AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
@@ -1005,7 +976,7 @@ VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
 VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
 VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
-VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa])
+VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
 VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
 VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])
 VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
@@ -1251,7 +1222,7 @@ then
   VLC_ADD_PLUGINS([packetizer_copy])
 
   VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
-  VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode])
+  VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge])
 #  VLC_ADD_PLUGINS([stream_out_transrate])
 
   AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
@@ -2384,6 +2355,11 @@ then
   fi
 fi
 
+AC_ARG_WITH(a52-fixed,
+      [    --with-a52-fixed      specify if liba52 has been compiled with fixed point support],
+      [
+        VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ])
+
 dnl
 dnl DTS Coherent Acoustics decoder plugin
 dnl
@@ -2974,7 +2950,9 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
     if test "${FRIBIDI_CONFIG}" != "no"
     then
       VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
+      VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
       VLC_ADD_LDFLAGS([freetype], [`${FRIBIDI_CONFIG} --libs`])
+      VLC_ADD_LDFLAGS([skins2], [`${FRIBIDI_CONFIG} --libs`])
     fi
   fi
 fi
@@ -3674,6 +3652,11 @@ if test "${SYS}" = "mingwce"; then
   VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell])
   dnl Gross hack
   VLC_ADD_LDFLAGS([wince],[modules/gui/wince/wince_rc.o])
+elif test "${SYS}" = "mingw32"; then
+  VLC_ADD_CXXFLAGS([wince],[])
+  VLC_ADD_LDFLAGS([wince],[-lcomctl32 -lcomdlg32 -lgdi32])
+  dnl Gross hack
+  VLC_ADD_LDFLAGS([wince],[modules/gui/wince/wince_rc.o])
 fi
 
 dnl