From 65d1bea201823178fced4ed1429485eca527e733 Mon Sep 17 00:00:00 2001
From: Michel Bardiaux <mbardiaux@peaktime.be>
Date: Fri, 1 Oct 2004 13:32:13 +0000
Subject: [PATCH] Help debugging by keeping symbols ans line numbers patch by
 (Michel Bardiaux <mbardiaux at peaktime dot be>)

Originally committed as revision 3545 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile             |  2 +-
 configure            | 11 +++++++++++
 libavcodec/Makefile  |  4 ++--
 libavformat/Makefile |  4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d0ae79099d..7ec6a3cef7 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ install: all install-man $(INSTALLVHOOK)
 	$(MAKE) -C libavcodec install
 	$(MAKE) -C libavformat install
 	install -d "$(bindir)"
-	install -c -s -m 755 $(PROG) "$(bindir)"
+	install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
 
 # create the window installer
 wininstaller: all install
diff --git a/configure b/configure
index 84cd39e857..48cd59ad60 100755
--- a/configure
+++ b/configure
@@ -65,6 +65,7 @@ echo "  --disable-ffplay         disable ffplay build"
 echo "  --disable-risky          disables patent encumbered codecs"
 echo "  --enable-small           optimize for size instead of speed"
 echo "  --enable-memalign-hack   emulate memalign, interferes with memory debuggers"
+echo "  --disable-strip          disable stripping of executables and shared libraries"
 echo ""
 echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
@@ -155,6 +156,7 @@ os2="no"
 lshared="no"
 optimize="yes"
 debug="yes"
+dostrip="yes"
 extralibs="-lm"
 simpleidct="yes"
 bigendian="no"
@@ -439,6 +441,8 @@ for opt do
   ;;
   --enable-memalign-hack) memalignhack="yes"
   ;;
+  --disable-strip) dostrip="no"
+  ;;
   esac
 done
 
@@ -1004,6 +1008,7 @@ echo "a52 dlopened     $a52bin"
 echo "dts support      $dts"
 echo "pp support       $pp"
 echo "debug symbols    $debug"
+echo "strip symbols    $dostrip"
 echo "optimize         $optimize"
 echo "shared pp        $shared_pp"
 echo "Video hooking    $vhook"
@@ -1040,7 +1045,13 @@ echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
+if test "$dostrip" = "yes" ; then
 echo "STRIP=$strip" >> config.mak
+echo "INSTALLSTRIP=-s" >> config.mak
+else
+echo "STRIP=echo ignoring strip" >> config.mak
+echo "INSTALLSTRIP=" >> config.mak
+fi
 
 # SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic.  Used when building 
 # shared modules on OS/X (vhook/Makefile).
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9f26bf3625..df77990932 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -280,10 +280,10 @@ fft-test: fft-test.o $(LIB)
 ifeq ($(BUILD_SHARED),yes)
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
-	install -s -m 755 $(SLIB) "$(prefix)"
+	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(prefix)/lib
-	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
 	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
 	ldconfig || true
 endif
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ed5416d9ce..577dc77bce 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -102,10 +102,10 @@ depend: $(SRCS)
 ifeq ($(BUILD_SHARED),yes)
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
-	install -s -m 755 $(SLIB) "$(prefix)"
+	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(prefix)/lib
-	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
 	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
 	ldconfig || true
 endif