vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Aug 30 15:20:29 2014 +0300| [5033a46344d0b70af043189841bc4cc575903d3b] | committer: Rémi Denis-Courmont
configure: simplify header tests Remove unused checks for locale.h, machine/parm.h, scsi/scsi.h, sys/time.h, and sys/ioctl.h. Simplify checks for net/if.h (this has no dependency) and sys/mounth.h (sys/param.h). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5033a46344d0b70af043189841bc4cc575903d3b --- configure.ac | 32 ++++++++------------------------ src/darwin/specific.c | 4 +--- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index 9398add..202ce20 100644 --- a/configure.ac +++ b/configure.ac @@ -754,25 +754,14 @@ AS_IF([test "${SYS}" != "mingw32"], [ AC_SUBST(LIBPTHREAD) dnl Check for headers -AC_CHECK_HEADERS([search.h]) -AC_CHECK_HEADERS(getopt.h locale.h xlocale.h) -AC_CHECK_HEADERS([sys/time.h sys/ioctl.h]) -AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h]) -AC_CHECK_HEADERS([net/if.h], [], [], - [ - #include <sys/types.h> - #include <sys/socket.h> - ]) -AC_CHECK_HEADERS([sys/mount.h], [], [], - [ - #include <sys/param.h> - ]) - -if test "${SYS}" != "mingw32"; then - AC_CHECK_HEADERS(machine/param.h sys/shm.h) - AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h]) - AC_CHECK_HEADERS(syslog.h mntent.h) -fi # end "${SYS}" != "mingw32" +dnl POSIX +AC_CHECK_HEADERS([arpa/inet.h net/if.h pthread.h search.h syslog.h sys/shm.h]) +dnl BSD +AC_CHECK_HEADERS([netinet/udplite.h sys/param.h sys/mount.h]) +dnl GNU/Linux +AC_CHECK_HEADERS([getopt.h linux/dccp.h linux/magic.h mntent.h sys/eventfd.h]) +dnl MacOS +AC_CHECK_HEADERS([xlocale.h]) dnl LP64 and LLP64 architectures had better define ssize_t by themselves... AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight @@ -780,11 +769,6 @@ AC_CHECK_TYPE(ssize_t,, [ AC_DEFINE(ssize_t, int) ]) -dnl Check for threads library -if test "${SYS}" != "mingw32"; then - AC_CHECK_HEADERS(pthread.h) -fi # end "${SYS}" != "mingw32" - dnl It seems that autoconf detects pkg-config only during the first dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case, dnl it is nested within a conditional block, so it was not working right. diff --git a/src/darwin/specific.c b/src/darwin/specific.c index 71416c6..7931309 100644 --- a/src/darwin/specific.c +++ b/src/darwin/specific.c @@ -33,9 +33,7 @@ #include <dirent.h> /* *dir() */ #include <CoreFoundation/CoreFoundation.h> -#ifdef HAVE_LOCALE_H -# include <locale.h> -#endif +#include <locale.h> /***************************************************************************** * system_Init: fill in program path & retrieve language _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
