[libbluray-devel] Moved dlopen library from LDFLAGS to LIBADD

hpi1 git at videolan.org
Wed Apr 25 11:55:45 CEST 2012


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Mar 20 08:44:42 2012 +0200| [2c7be02d69ec97c2f28541821e2d0f56290802da] | committer: npzacs

Moved dlopen library from LDFLAGS to LIBADD

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=2c7be02d69ec97c2f28541821e2d0f56290802da
---

 configure.ac    |    6 +++---
 src/Makefile.am |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c15ceb..e509375 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,9 +139,9 @@ fi
 if test "${SYS}" != "mingw32" ; then
   AC_CHECK_FUNCS(
     [dlopen],
-    [DLOPEN_LDFLAGS=""],
+    [DLOPEN_LIBS=""],
     [AC_CHECK_LIB([dl], [dlopen],
-      [DLOPEN_LDFLAGS="-ldl"],
+      [DLOPEN_LIBS="-ldl"],
       [AC_MSG_ERROR($library_not_found)])])
 fi
 
@@ -272,7 +272,7 @@ AC_SUBST(LT_VERSION_INFO)
 
 # generate output files
 AC_SUBST(BDJAVA_CFLAGS)
-AC_SUBST(DLOPEN_LDFLAGS)
+AC_SUBST(DLOPEN_LIBS)
 AC_SUBST(SET_WARNINGS)
 AC_SUBST(SET_OPTIMIZATIONS)
 AC_SUBST(SET_DEBUG_OPTS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 12e8036..f68db55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,8 +88,8 @@ libbluray_la_SOURCES=libbluray/bluray.h \
 	util/bits.h \
 	util/logging.h
 libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
-libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO) $(DLOPEN_LDFLAGS)
-libbluray_la_LIBADD= $(LIBXML2_LIBS)
+libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(DLOPEN_LIBS)
 
 if USING_BDJAVA
 libbluray_la_SOURCES+=$(SOURCES_bdj)



More information about the libbluray-devel mailing list