List pkgconfig dependencies in Requires.private

CMakeLists.txt

@@ -153,8 +153,11 @@ set (exec_prefix "\$\{prefix\}")
 set (libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}")
 set (includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}")
 set (VERSION ${PROJECT_VERSION})
-if (EXTERNAL_XIPH_LIBS)
-	set (PC_PRIVATE_LIBS "-lFLAC  -lvorbisenc")
+if (ENABLE_EXTERNAL_LIBS)
+	set (EXTERNAL_XIPH_REQUIRE "flac ogg vorbis vorbisenc opus")
+	if (ENABLE_EXPERIMENTAL)
+		set (EXTERNAL_XIPH_REQUIRE "${EXTERNAL_XIPH_REQUIRE} speex")
+	endif ()
 endif ()
 configure_file (sndfile.pc.in sndfile.pc @ONLY)
 

configure.ac

@@ -321,6 +321,7 @@ dnl  Check for Ogg, Vorbis and FLAC.
 HAVE_EXTERNAL_XIPH_LIBS=0
 EXTERNAL_XIPH_CFLAGS=""
 EXTERNAL_XIPH_LIBS=""
+EXTERNAL_XIPH_REQUIRE=""
 
 dnl Check for pkg-config outside the if statement.
 PKG_PROG_PKG_CONFIG
@@ -361,6 +362,11 @@ AS_IF([test -n "$PKG_CONFIG"], [
 
 					EXTERNAL_XIPH_CFLAGS="$FLAC_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS $OPUS_CFLAGS $OGG_CFLAGS "
 					EXTERNAL_XIPH_LIBS="$FLAC_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS $OPUS_LIBS $OGG_LIBS "
+					EXTERNAL_XIPH_REQUIRE="flac ogg vorbis vorbisenc opus"
+
+					if test x$ac_cv_speex = "xyes" ; then
+						EXTERNAL_XIPH_REQUIRE="$EXTERNAL_XIPH_REQUIRE speex"
+					fi
 				], [
 					AS_ECHO([""])
 					AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]])
@@ -660,6 +666,7 @@ AC_SUBST(SNDIO_LIBS)
 
 AC_SUBST(EXTERNAL_XIPH_CFLAGS)
 AC_SUBST(EXTERNAL_XIPH_LIBS)
+AC_SUBST(EXTERNAL_XIPH_REQUIRE)
 AC_SUBST(SRC_BINDIR)
 AC_SUBST(TEST_BINDIR)
 

sndfile.pc.in

@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: sndfile
 Description: A library for reading and writing audio files
-Requires: 
+Requires:
+Requires.private: @EXTERNAL_XIPH_REQUIRE@
 Version: @VERSION@
 Libs: -L${libdir} -lsndfile
-Libs.private: @EXTERNAL_XIPH_LIBS@
-Cflags: -I${includedir} 
+Cflags: -I${includedir}