Remove redundant --enable-shared-pp configure option and make the PP code

use the standard --enable-shared option.

Originally committed as revision 4858 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 23b3696a4e5ad9a39b81fed1a6fab711bd2c6789..7980e3676d6e21ce776f9277029745bb9b10db2d 100755 (executable)
--- a/configure
+++ b/configure
@@ -30,7 +30,6 @@ echo "  --enable-a52             enable GPLed A52 support [default=no]"
 echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
 echo "  --enable-dts             enable GPLed DTS support [default=no]"
 echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
-echo "  --enable-shared-pp       use libpostproc.so [default=no]"
 echo "  --enable-shared          build shared libraries [default=no]"
 echo "  --enable-amr_nb          enable amr_nb float audio codec"
 echo "  --enable-amr_nb-fixed    use fixed point for amr-nb codec"
@@ -201,7 +200,6 @@ a52="no"
 a52bin="no"
 dts="no"
 pp="no"
-shared_pp="no"
 mingw32="no"
 cygwin="no"
 os2="no"
@@ -504,8 +502,6 @@ for opt do
   ;;
   --enable-pp) pp="yes"
   ;;
-  --enable-shared-pp) pp="yes"; shared_pp="yes"
-  ;;
   --enable-libgsm) libgsm="yes"
     extralibs="$extralibs -lgsm"
   ;;
@@ -621,7 +617,7 @@ if test "$vorbis" = "yes" ; then
 fi
 
 if test "$gpl" != "yes"; then
-    if test "$pp" != "no" -o "$shared_pp" != "no"; then
+    if test "$pp" != "no"; then
         echo "The Postprocessing code is under GPL and --enable-gpl is not specified."
         fail="yes"
     fi
@@ -1290,7 +1286,7 @@ echo "pp support       $pp"
 echo "debug symbols    $debug"
 echo "strip symbols    $dostrip"
 echo "optimize         $optimize"
-echo "shared pp        $shared_pp"
+echo "shared           $shared"
 echo "video hooking    $vhook"
 echo "SDL support      $sdl"
 if test $sdl_too_old = "yes"; then
@@ -1560,11 +1556,6 @@ fi
 if test "$pp" = "yes" ; then
   echo "#define CONFIG_PP 1" >> $TMPH
   echo "CONFIG_PP=yes" >> config.mak
-
-  if test "$shared_pp" = "yes" ; then
-    echo "#define SHARED_PP 1" >> $TMPH
-    echo "SHARED_PP=yes" >> config.mak
-  fi
 fi
 
 # MPEG audio high precision mode

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fc91026afd5eab5dd289080ed2f63dcaa5bbb9c3..2d1302a5febe667255ab4172d4e4543f12830d1d 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -290,7 +290,7 @@ OBJS+= x264.o
 endif
 
 ifeq ($(CONFIG_PP),yes)
-ifeq ($(SHARED_PP),yes)
+ifeq ($(BUILD_SHARED),yes)
 EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
 else
 # LIBS += libpostproc/libpostproc.a ... should be fixed

diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index 7ea52b2868b675f342679af84f03949d84a92344..7c7f8b487fc46b073ace64b027e5803f9369cc7f 100644 (file)
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -4,7 +4,7 @@ include ../../config.mak
 VPATH=$(SRC_PATH)/libavcodec/libpostproc
 
 NAME=postproc
-ifeq ($(SHARED_PP),yes)
+ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)
 endif
@@ -35,7 +35,7 @@ dep:    depend
 depend:
        $(CC) -MM $(CFLAGS) postprocess.c 1>.depend
 
-ifeq ($(SHARED_PP),yes)
+ifeq ($(BUILD_SHARED),yes)
 postprocess_pic.o: postprocess.c
        $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
@@ -49,7 +49,7 @@ $(LIB): $(OBJS)
        $(RANLIB) $@
 
 install: all
-ifeq ($(SHARED_PP),yes)
+ifeq ($(BUILD_SHARED),yes)
 ifeq ($(CONFIG_WIN32),yes)
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else