* configure.ac, Makefile.am: Use upx for the win32 package if present. Fixed the...

diff --git a/Makefile.am b/Makefile.am
index 80f5002d4f028969c1679b1bdff12b67c5c85dc2..758bb1d7543320b1f27c4827266563411fca8bba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -577,6 +577,9 @@ package-win32-base:
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
        $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
+       @if test -n "$(UPX)"; then \
+           $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
+
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
          unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
@@ -589,7 +592,9 @@ package-win32-base:
          fi ; done
 
        for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \
+            if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \
+         done
 
        mkdir $(srcdir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
@@ -627,6 +632,8 @@ package-win32-base:
 if BUILD_MOZILLA
        cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
        $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+       @if test $(UPX); then \
+         $(UPX) -9 $(srcdir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); fi ; \
        cp $(srcdir)/mozilla/vlcintf.xpt  $(srcdir)/vlc-${VERSION}/mozilla/ ;
 endif
 

diff --git a/configure.ac b/configure.ac
index e8ed35809aab4276692246bb893365b8881a2579..33916ea6d269414eeda0a736a7d6bd1bc779d5ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
 AC_CHECK_TOOL(AR, ar, :)
 AC_CHECK_TOOL(LD, ld, :)
+AC_CHECK_TOOL(UPX, upx, "")
 
 dnl Sam, if you think I didn't see that... --Meuuh
 dnl AM_PROG_LIBTOOL
@@ -3620,6 +3621,7 @@ then
 dnl special case for mingw32
 elif test "${enable_mozilla}" = "yes"
 then
+  AC_CHECK_TOOL(CYGPATH, cygpath, "")
   AC_ARG_WITH(mozilla-sdk-path,
     [    --with-mozilla-sdk-path=PATH path to win32 mozilla sdk], [
     real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
@@ -3628,7 +3630,12 @@ then
       mozilla=:
       AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
       AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at])
-      XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" ])
+      XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl"
+      if test -n "${CYGPATH}"; then
+        XPIDL="${real_mozilla_sdk}/xpcom/bin/xpidl"
+        real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`"
+        XPIDL_INCL="${XPIDL_INCL} -I${real_mozilla_sdk}/xpcom/idl"
+      fi ])
     CPPFLAGS="${CPPFLAGS_save}"
   ])
 fi