* configure.ac, Makefile.am: don't use upx in the win32 installer anymore as some...

diff --git a/Makefile.am b/Makefile.am
index 335bef11267ab5f9fb3bf410a1e985029cffdc83..c563f438c85681da20c20a7cc28194a4b6b3fe1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -600,8 +600,6 @@ package-win32-base:
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc.exe.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 sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
@@ -615,9 +613,7 @@ package-win32-base:
          fi ; done
 
        for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \
-            if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \
-         done
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
        mkdir $(srcdir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
@@ -663,8 +659,6 @@ 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 a06d04454ce6bf9e3bec5c26cfc73dc9c3e760d3..ed2152bd42211a8be7ffe7e8c030d83220a8e663 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ 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