[Scummvm-git-logs] scummvm master -> 7016605fe8f33fedd67cd21370c010b93bbe0da0

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7016605fe8 Revert "CONFIGURE: Switch vorbis and flac detection to pkg-config"


Commit: 7016605fe8f33fedd67cd21370c010b93bbe0da0
    https://github.com/scummvm/scummvm/commit/7016605fe8f33fedd67cd21370c010b93bbe0da0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-01-17T23:28:25+01:00

Commit Message:
Revert "CONFIGURE: Switch vorbis and flac detection to pkg-config"

This reverts commit 7134f5e2c2f9f3052950382dbd7b8e7c074d2432.

At least on the buildbot vorbis is not in pkg-config

Changed paths:
    configure


diff --git a/configure b/configure
index 0cd20a3b677..3affb8bc35d 100755
--- a/configure
+++ b/configure
@@ -5157,14 +5157,16 @@ if test "$_vorbis" = auto ; then
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
 	if test "$_ogg" = yes ; then
-		cc_check `pkg-config --cflags --libs ogg vorbis vorbisfile` && _vorbis=yes
+		cc_check $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
+			-lvorbisfile -lvorbis -logg && _vorbis=yes
 	else
-		cc_check `pkg-config --cflags --libs vorbis vorbisfile` && _vorbis=yes
+		cc_check $VORBIS_CFLAGS $VORBIS_LIBS \
+			-lvorbisfile -lvorbis && _vorbis=yes
 	fi
 fi
 if test "$_vorbis" = yes ; then
-	append_var LIBS "`pkg-config --libs vorbis vorbisfile`"
-	append_var LIBS "`pkg-config --cflags vorbis vorbisfile`"
+	append_var LIBS "$VORBIS_LIBS -lvorbisfile -lvorbis"
+	append_var INCLUDES "$VORBIS_CFLAGS"
 fi
 define_in_config_if_yes "$_vorbis" 'USE_VORBIS'
 echo "$_vorbis"
@@ -5268,14 +5270,16 @@ int main(void) {
 }
 EOF
 	if test "$_ogg" = yes ; then
-		cc_check `pkg-config --cflags --libs flac ogg` && _flac=yes
+		cc_check $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
+			-lFLAC -logg && _flac=yes
 	else
-		cc_check `pkg-config --cflags --libs flac` && _flac=yes
+		cc_check $FLAC_CFLAGS $FLAC_LIBS \
+			-lFLAC && _flac=yes
 	fi
 fi
 if test "$_flac" = yes ; then
-	append_var LIBS "`pkg-config --libs flac`"
-	append_var INCLUDES "`pkg-config --cflags flac`"
+	append_var LIBS "$FLAC_LIBS -lFLAC"
+	append_var INCLUDES "$FLAC_CFLAGS"
 fi
 define_in_config_if_yes "$_flac" 'USE_FLAC'
 echo "$_flac"