Don't build/package mozilla plugin for win64

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index cdb611b3a651b680682092b9bb33f4e270dda714..6c8a5623752523db77568a86d0f508696bb13693 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,7 @@ LDFLAGS_vlc="${LDFLAGS}"
 dnl
 dnl  Check the operating system
 dnl
+HAVE_WIN64="0"
 case "${host_os}" in
   "")
     SYS=unknown
@@ -327,6 +328,21 @@ case "${host_os}" in
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
         ac_default_prefix="`pwd`/_win32"
         DESTDIR="`pwd`/_win32/"
+
+        dnl
+        dnl NSIS Installer prefix and WIN64
+        dnl
+        case "${host}" in
+            amd64*|i686-w64*|x86_64*)
+                HAVE_WIN64="1"
+                PROGRAMFILES="PROGRAMFILES64"
+            ;;
+            *)
+                PROGRAMFILES="PROGRAMFILES"
+            ;;
+        esac
+        AC_SUBST(PROGRAMFILES)
+
     fi
     if test "${SYS}" = "mingwce"; then
         # add ws2 for closesocket, select, recv
@@ -370,6 +386,7 @@ AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
 AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
 AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
+AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
 AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
 
@@ -1736,7 +1753,7 @@ if test "${enable_live555}" != "no"; then
         [#include <liveMedia_version.hh>
          #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
          #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
-         NO!
+         yes
          #endif
          #endif],
         [AC_MSG_RESULT([no])