[libbluray-devel] [Git][videolan/libbluray][master] Fix pkg-config Libs.Private

[Petri Hintukainen]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
af69041d by hpi1 at 2019-04-05T07:54:32Z
Fix pkg-config Libs.Private

- - - - -


3 changed files:

- Makefile.am
- configure.ac
- src/libbluray.pc.in


Changes:

=====================================
Makefile.am
=====================================
@@ -205,7 +205,7 @@ endif
 endif
 
 libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_"
-libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) $(EXTRA_LIBS)
 
 noinst_HEADERS = \
 	jni/jni.h \


=====================================
configure.ac
=====================================
@@ -174,8 +174,7 @@ AS_IF([test "x$with_freetype" != "xno"], [
       PACKAGES="$PACKAGES fontconfig"
     ])
   ],[
-    FONTCONFIG_LIBS="-lgdi32"
-    AC_SUBST([FONTCONFIG_LIBS])
+    EXTRA_LIBS="$EXTRA_LIBS -lgdi32"
   ])
 ])
 
@@ -302,6 +301,7 @@ AC_CONFIG_FILES([Makefile src/libbluray.pc src/libbluray/bluray-version.h])
 AC_OUTPUT
 
 AC_SUBST([PACKAGES])
+AC_SUBST([EXTRA_LIBS])
 
 dnl ---------------------------------------------
 dnl Some infos:


=====================================
src/libbluray.pc.in
=====================================
@@ -7,6 +7,6 @@ Name: libbluray
 Description: library supporting Blu-ray playback
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lbluray
-Libs.private: @DLOPEN_LIBS@ @FONTCONFIG_LIBS@
+Libs.private: @DLOPEN_LIBS@ @EXTRA_LIBS@
 Requires.private: @PACKAGES@
 Cflags: -I${includedir}



View it on GitLab: https://code.videolan.org/videolan/libbluray/commit/af69041d6aa97a57f87a4ff97afa609abc6f5968

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/commit/af69041d6aa97a57f87a4ff97afa609abc6f5968
You're receiving this email because of your account on code.videolan.org.