cmake: Add the modules/'s CMakeLists.txt.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index e5e1b018a437c4ae7a89a9dc094890fc7c122b6b..315881a2a1173df7779311990454df702b92ad7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,17 +393,13 @@ dnl
 dnl Gettext stuff
 dnl
 AM_GNU_GETTEXT_VERSION(0.16.1)
-AM_GNU_GETTEXT
-AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
-  AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
-  AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
-], [
-  VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
-])
+AM_GNU_GETTEXT([external])
+VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
 
 dnl
 dnl Iconv stuff
 dnl
+AM_ICONV
 AS_IF([test "$am_cv_func_iconv" != "yes"],
        [AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
 VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
@@ -473,10 +469,11 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv])
+AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv mmap])
 AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
 AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
 AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
+AC_FUNC_ALLOCA
 
 AH_BOTTOM([#include <vlc_fixups.h>])
 
@@ -6093,21 +6090,20 @@ dnl Create vlc-config.in
 VLC_OUTPUT_VLC_CONFIG_IN
 
 AC_CONFIG_FILES([
-  vlc.win32.nsi
+  extras/package/win32/vlc.win32.nsi
   Makefile
-  activex/Makefile
-  activex/axvlc.inf
+  projects/activex/Makefile
+  projects/activex/axvlc.inf
   bindings/Makefile
   bindings/java/Makefile
   bindings/java/src/Makefile
   bindings/python/Makefile
   doc/Makefile
-  intl/Makefile
-  ipkg/Makefile
+  extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile
   modules/Makefile
-  mozilla/Makefile
+  projects/mozilla/Makefile
   m4/Makefile
   po/Makefile.in
   share/Makefile
@@ -6208,7 +6204,7 @@ rm -f compile
 echo '#! /bin/sh' >compile
 
 echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile
-echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile
+echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >> compile
 chmod a+x compile
 
 printf "