X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=d28a6398e35302572e725a2e63303d71539a7b4e;hb=89d9f144860066ec001281c63814b050108a73f9;hp=53f95e72f343a3b60eb7657172cc27e0de29c6ef;hpb=fbd95be806aa6ee8df82cfccb7628fba6bf0c085;p=vlc

diff --git a/configure.ac b/configure.ac
index 53f95e72f3..d28a6398e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,7 @@ case "${host_os}" in
         VLC_ADD_LIBS([activex mozilla],[-lgdi32])
         VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
         VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32])
-        VLC_ADD_LIBS([access_file], [-lshlwapi])
+        VLC_ADD_LIBS([filesystem], [-lshlwapi])
         dnl
         dnl DEP and ASLR options
         dnl
@@ -382,13 +382,13 @@ case "${host_os}" in
     VLC_ADD_LIBS([vlc libvlccore logger],[-lbe])
     VLC_ADD_LIBS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
     VLC_ADD_LIBS([dvdnav dvdread],[-ldl])
-    VLC_ADD_LIBS([access_file],[-lpoll])
+    VLC_ADD_LIBS([filesystem],[-lpoll])
     LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
     dnl Check for BONE
     if test -f /boot/beos/system/lib/libbind.so; then
-        VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
+        VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
     else
-        VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
+        VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
     fi
 
     dnl Ugly check for Zeta
@@ -568,37 +568,19 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS([gettimeofday isatty getpwuid_r memalign posix_memalign getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale tdestroy])
-AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll vasprintf swab])
-AC_CHECK_FUNCS([stricmp strnicmp])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv stricmp strnicmp tdestroy uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
 
 dnl Check for non-standard system calls
-AC_CHECK_FUNCS([vmsplice eventfd fstatfs accept4])
+AC_CHECK_FUNCS([accept4 eventfd fstatfs vmsplice])
 
 AH_BOTTOM([#include <vlc_fixups.h>])
 
 AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])])
 
-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
-
 SOCKET_LIBS=""
 AC_CHECK_FUNCS(connect,,[
   AC_CHECK_LIB(socket,connect,[
@@ -860,7 +842,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 dnl Check for headers
 AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
   [
@@ -873,8 +855,6 @@ AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
 AC_CHECK_HEADERS(syslog.h)
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
-AC_HEADER_TIME
-
 dnl LP64 adn LLP64 architectures had better define ssize_t by themselves...
 AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.])
 AC_CHECK_TYPE(ssize_t,, [
@@ -1251,22 +1231,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([bluescreen])
   VLC_ADD_PLUGIN([alphamask])
   VLC_ADD_PLUGIN([gaussianblur])
-  VLC_ADD_PLUGIN([i420_yuy2])
-  VLC_ADD_PLUGIN([i422_yuy2])
-  VLC_ADD_PLUGIN([i422_i420])
-  VLC_ADD_PLUGIN([yuy2_i422])
-  VLC_ADD_PLUGIN([yuy2_i420])
-  VLC_ADD_PLUGIN([chain])
-  VLC_ADD_PLUGIN([aout_file])
-  VLC_ADD_PLUGIN([linear_resampler])
-  VLC_ADD_PLUGIN([bandlimited_resampler])
-  VLC_ADD_PLUGIN([float32_mixer])
-  VLC_ADD_PLUGIN([spdif_mixer])
-  VLC_ADD_PLUGIN([simple_channel_mixer])
   VLC_ADD_PLUGIN([dolby_surround_decoder])
-  VLC_ADD_PLUGIN([headphone_channel_mixer])
-  VLC_ADD_PLUGIN([normvol])
-  VLC_ADD_PLUGIN([audiobargraph_a])
   VLC_ADD_PLUGIN([equalizer])
   VLC_ADD_PLUGIN([param_eq])
   VLC_ADD_PLUGIN([scaletempo])
@@ -1275,25 +1240,23 @@ if test "${SYS}" != "mingwce"; then
   ALIASES="${ALIASES} rvlc"
 fi
 
-if test "${SYS}" = "mingwce"; then
-  VLC_ADD_PLUGIN([chain])
-  VLC_ADD_PLUGIN([aout_file])
-  VLC_ADD_PLUGIN([linear_resampler])
-  VLC_ADD_PLUGIN([bandlimited_resampler])
-  VLC_ADD_PLUGIN([float32_mixer])
-  VLC_ADD_PLUGIN([spdif_mixer])
-  VLC_ADD_PLUGIN([simple_channel_mixer])
-  VLC_ADD_PLUGIN([headphone_channel_mixer])
-  VLC_ADD_PLUGIN([normvol])
-  VLC_ADD_PLUGIN([audiobargraph_a])
-  VLC_ADD_PLUGIN([a52tospdif])
-  VLC_ADD_PLUGIN([dtstospdif])
-  VLC_ADD_PLUGIN([i420_yuy2])
-  VLC_ADD_PLUGIN([i422_yuy2])
-  VLC_ADD_PLUGIN([i422_i420])
-  VLC_ADD_PLUGIN([yuy2_i422])
-  VLC_ADD_PLUGIN([yuy2_i420])
-fi
+VLC_ADD_PLUGIN([chain])
+VLC_ADD_PLUGIN([aout_file])
+VLC_ADD_PLUGIN([linear_resampler])
+VLC_ADD_PLUGIN([bandlimited_resampler])
+VLC_ADD_PLUGIN([float32_mixer])
+VLC_ADD_PLUGIN([spdif_mixer])
+VLC_ADD_PLUGIN([simple_channel_mixer])
+VLC_ADD_PLUGIN([headphone_channel_mixer])
+VLC_ADD_PLUGIN([normvol])
+VLC_ADD_PLUGIN([audiobargraph_a])
+VLC_ADD_PLUGIN([a52tospdif])
+VLC_ADD_PLUGIN([dtstospdif])
+VLC_ADD_PLUGIN([i420_yuy2])
+VLC_ADD_PLUGIN([i422_yuy2])
+VLC_ADD_PLUGIN([i422_i420])
+VLC_ADD_PLUGIN([yuy2_i422])
+VLC_ADD_PLUGIN([yuy2_i420])
 
 dnl
 dnl Some plugins aren't useful on some platforms
@@ -1534,6 +1497,7 @@ AS_IF([test "${enable_neon}" != "no"], [
     ], [
       ac_cv_neon_inline="no"
     ])
+    CFLAGS="${CFLAGS_save}"
   ])
   ARM_NEON_CFLAGS="$ac_cv_neon_inline"
 ], [
@@ -2487,7 +2451,7 @@ then
      [Define if you have libcdio 0.78.2 or greater installed]),
      [AC_MSG_WARN(CD Reading and information library not found)])
 
-  if test "${enable_vcdinfo}" != "no"
+  if test "${enable_libvcdinfo}" != "no"
   then
     PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
        [have_libvcdinfo=yes],
@@ -2505,8 +2469,8 @@ if test "${enable_vcdx}" = "yes"
 then
   if test "${have_libvcdinfo}" = "yes"
   then
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
     HAVE_VCDX=no
@@ -2522,8 +2486,8 @@ then
   then
     AC_DEFINE(HAVE_VCDX, 1,
     [Define for the VCD plugin using libcdio/libvcdinfo])
-    VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS])
-    VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+    VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+    VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])
     VLC_ADD_PLUGIN([vcdx])
   else
     AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])
@@ -5031,12 +4995,7 @@ AC_SUBST(VERSION_REVISION)
 AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-if test "${build_os}" = "cygwin"
-then
-    AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
-else
-    AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure])
-fi
+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s 2>/dev/null || hostname`", [host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
 dnl Win32 need s a numerical version_extra.