Contrib: allow building contribs with no optimization

--
uses the same flag logic as --disable-gpl

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 4d2b826a86fe2c823fccb6febcaf3a5e75a3db7e..ced4fe081abf184588999266723edbeaa591c5db 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
        echo "  --disable-sout   configure to not build stream output packages"
        echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
        echo "  --disable-gpl    configure to not build viral GPL code"
+       echo "  --disable-optim  disable optimization in libraries"
 }
 
 BUILD=
@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
 BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
+WITH_OPTIMIZATION="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -74,6 +76,9 @@ do
                --disable-sout)
                        BUILD_ENCODERS=
                        ;;
+               --disable-optim)
+                       WITH_OPTIMIZATION=
+                       ;;
                --enable-small)
                        ENABLE_SMALL=1
                        ;;
@@ -226,6 +231,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 test -z "$GPL" || add_make_enabled "GPL"
+test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 
 #
 # Checks

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 287a0adef2f6318e9e9cd81da606a463147897b9..1b5dd4a555c6d99920da7c3994eb4be97d5459b3 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -166,6 +166,12 @@ CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g
 CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) -g
 EXTRA_LDFLAGS += -L$(PREFIX)/lib
 LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
+
+ifndef WITH_OPTIMIZATION
+CFLAGS := $(CFLAGS) -O0
+CXXFLAGS := $(CXXFLAGS) -O0
+endif
+
 # Do not export those! Use HOSTVARS.
 
 # Do the FPU detection, after we have figured out our compilers and flags.