rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN

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

diff --git a/configure b/configure
index faf1cc4..7493ed2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1972,11 +1972,11 @@ if test "$dc1394" = "yes" ; then
 fi
 
 if test "$dlopen" = "yes" ; then
-  echo "#define CONFIG_HAVE_DLOPEN 1" >> $TMPH
+  echo "#define HAVE_DLOPEN 1" >> $TMPH
 fi
 
 if test "$dlfcn" = "yes" ; then
-  echo "#define CONFIG_HAVE_DLFCN 1" >> $TMPH
+  echo "#define HAVE_DLFCN 1" >> $TMPH
 fi
 
 if test "$audio_oss" = "yes" ; then

diff --git a/ffserver.c b/ffserver.c
index 3c94a28..4100ec2 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -37,7 +37,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <signal.h>
-#ifdef CONFIG_HAVE_DLFCN
+#ifdef HAVE_DLFCN
 #include <dlfcn.h>
 #endif
 
@@ -3706,7 +3706,7 @@ static int opt_video_codec(const char *arg)
 
 /* simplistic plugin support */
 
-#ifdef CONFIG_HAVE_DLOPEN
+#ifdef HAVE_DLOPEN
 static void load_module(const char *filename)
 {
     void *dll;
@@ -4377,7 +4377,7 @@ static int parse_ffconfig(const char *filename)
             redirect = NULL;
         } else if (!strcasecmp(cmd, "LoadModule")) {
             get_arg(arg, sizeof(arg), &p);
-#ifdef CONFIG_HAVE_DLOPEN
+#ifdef HAVE_DLOPEN
             load_module(arg);
 #else
             fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n",

diff --git a/libavformat/framehook.c b/libavformat/framehook.c
index c852961..df1f4b5 100644 (file)
--- a/libavformat/framehook.c
+++ b/libavformat/framehook.c
@@ -23,7 +23,7 @@
 #include "avformat.h"
 #include "framehook.h"
 
-#ifdef CONFIG_HAVE_DLFCN
+#ifdef HAVE_DLFCN
 #include <dlfcn.h>
 #endif