[vlc-commits] Revert "configure.ac: remove unused code"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 28 22:54:40 2011 +0200| [b03f1dd9713b135be0459dca810a6e0277727633] | committer: Rémi Denis-Courmont

Revert "configure.ac: remove unused code"

This reverts commit 1490519b7c7c7c8c626d06fd21b559455551bae1.
This untested crap broke vlc-plugin.pc.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b03f1dd9713b135be0459dca810a6e0277727633
---

 configure.ac |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3db0794..7417214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,9 @@ VERSION_REVISION=0
 VERSION_EXTRA=0
 VERSION_DEV=git
 
+PKGDIR="vlc"
+AC_SUBST(PKGDIR)
+
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Rincewind"
 COPYRIGHT_YEARS="1996-2011"
@@ -39,7 +42,6 @@ AM_MAINTAINER_MODE
 dnl
 dnl Directories
 dnl
-PKGDIR="vlc"
 dnl vlcincludedir="\${includedir}/\${PKGDIR}"
 dnl AC_SUBST(vlcincludedir)
 vlcdatadir="\${datadir}/\${PKGDIR}"
@@ -175,6 +177,8 @@ case "${host_os}" in
         CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
         CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
         OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+        MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
+        export MACOSX_DEPLOYMENT_TARGET
     fi
     ;;
   *mingw32* | *cygwin* | *wince* | *mingwce*)
@@ -319,6 +323,11 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
     export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
   ])
   LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
+
+  AS_IF([test "${SYS}" = "darwin"], [
+    export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
+    export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
+  ])
 ], [
   AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"], [
     AC_MSG_ERROR([Third party libraries not found!])
@@ -465,6 +474,9 @@ dnl Plugin compilation stuff
 
 VLC_LIBRARY_SUFFIX
 
+dnl Check for system libs needed
+need_libc=false
+
 dnl Check for usual libc functions
 AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
 AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp uselocale])
@@ -1346,11 +1358,13 @@ asm volatile("ssat r0, #1, r0":::"r0"); /* assume ARMv6 */
   ])
   VLC_RESTORE_FLAGS
   AS_IF([test "$ac_cv_neon_inline" != "no"], [
+    NEON_CFLAGS="$ac_cv_neon_inline"
     AC_DEFINE([CAN_COMPILE_NEON], 1, [Define to 1 if NEON (and ARMv6) assembly is available with NEON_CFLAGS.])
   ])
 ], [
   ac_cv_neon_inline="no"
 ])
+AC_SUBST(NEON_CFLAGS)
 AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" != "no"])
 
 
@@ -4020,7 +4034,16 @@ dnl
 ])
 
 
+dnl
+dnl  Endianness check
+dnl
 AC_C_BIGENDIAN
+AS_IF([test "${ac_cv_c_bigendian}" = "yes"], [
+  DEFS_BIGENDIAN="-DWORDS_BIGENDIAN=1"
+], [
+  DEFS_BIGENDIAN=""
+])
+AC_SUBST(DEFS_BIGENDIAN)
 
 dnl
 dnl Where to install KDE solid .desktop
@@ -4095,25 +4118,43 @@ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,${VERSION_MINOR}, [version minor number
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,${VERSION_REVISION}, [version revision number])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,${VERSION_EXTRA}, [version extra number])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_DEV,"${VERSION_DEV}", [version development string])
+AC_SUBST(COPYRIGHT_MESSAGE)
+AC_SUBST(VERSION_MESSAGE)
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
+AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
-
 dnl
 dnl  Handle substvars that use $(top_srcdir)
 dnl
 CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS}"
 
 dnl
+dnl Sort the modules list
+dnl
+PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs )
+
+dnl
 dnl  Configuration is finished
 dnl
+AC_SUBST(SYS)
+AC_SUBST(ARCH)
 AC_SUBST(ALIASES)
+AC_SUBST(ASM)
 AC_SUBST(MOC)
 AC_SUBST(RCC)
 AC_SUBST(UIC)
 AC_SUBST(WINDRES)
+AC_SUBST(WINE_SDK_PATH)
 AC_SUBST(LIBEXT)
 AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
+AC_SUBST(FILE_LIBVLCCORE_DLL)
+AC_SUBST(FILE_LIBVLC_DLL)
 
 AC_CONFIG_FILES([
   Makefile