[Mesa-dev] [PATCH 14/15] build: Remove HAVE_DLOPEN

[Matt Turner]

---
 Android.common.mk   | 1 -
 configure.ac        | 4 ++--
 meson.build         | 1 -
 src/mesa/SConscript | 4 ----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Android.common.mk b/Android.common.mk
index 4d5daf8e9d..483f6c5be2 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -64,7 +64,6 @@ LOCAL_CFLAGS += \
 	-DHAVE___BUILTIN_UNREACHABLE \
 	-DHAVE_PTHREAD=1 \
 	-DHAVE_DLADDR \
-	-DHAVE_DLOPEN \
 	-DHAVE_DL_ITERATE_PHDR \
 	-DMAJOR_IN_SYSMACROS \
 	-fvisibility=hidden \
diff --git a/configure.ac b/configure.ac
index cfc97d9f06..903a3979d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -831,9 +831,9 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
 
 dnl Check to see if dlopen is in default libraries (like Solaris, which
 dnl has it in libc), or if libdl is needed to get it.
-AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"],
+AC_CHECK_FUNC([dlopen], [],
     [AC_CHECK_LIB([dl], [dlopen],
-       [DEFINES="$DEFINES -DHAVE_DLOPEN"; DLOPEN_LIBS="-ldl"])])
+       [DLOPEN_LIBS="-ldl"])])
 AC_SUBST([DLOPEN_LIBS])
 
 dnl Check if that library also has dladdr
diff --git a/meson.build b/meson.build
index 5353a41748..f1613ffcab 100644
--- a/meson.build
+++ b/meson.build
@@ -260,7 +260,6 @@ if cc.has_function('dlopen')
 else
   dep_dl = cc.find_library('dl')
 endif
-pre_args += '-DHAVE_DLOPEN'
 
 if not cc.has_function('dladdr', dependencies : dep_dl)
   error('dl library doesn\'t have dladdr')
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index b63e15a3f0..ba98ad4323 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -31,10 +31,6 @@ if env['platform'] == 'windows':
     if not env['gles']:
         # prevent _glapi_* from being declared __declspec(dllimport)
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-else:
-    env.Append(CPPDEFINES = [
-        ('HAVE_DLOPEN', '1'),
-    ])
 
 # parse Makefile.sources
 source_lists = env.ParseSourceList('Makefile.sources')
-- 
2.13.6