Replace libgcrypt-configure with pkg-config

libgcrypt-configure has been dropped in favour of pkg-config in the latest releases. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070905
bitlbee · Jul 3, 2024 · 684aca2 · 684aca2
1 parent 37ef2cb
commit 684aca2
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/configure b/configure
@@ -435,8 +435,8 @@ detect_gnutls()
 {
 	if $PKG_CONFIG --exists gnutls; then
 		cat <<EOF >>Makefile.settings
-EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs)
-CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags)
+EFLAGS+=$($PKG_CONFIG --libs gnutls) $(pkg-config --libs libgcrypt)
+CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(pkg-config --cflags libgcrypt)
 EOF
 		ssl=gnutls
 		if ! $PKG_CONFIG gnutls --atleast-version=2.8; then
@@ -446,8 +446,8 @@ EOF
 		ret=1
 	elif libgnutls-config --version > /dev/null 2> /dev/null; then
 		cat <<EOF >>Makefile.settings
-EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs)
-CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags)
+EFLAGS+=$(libgnutls-config --libs) $(pkg-config --libs libgcrypt)
+CFLAGS+=$(libgnutls-config --cflags) $(pkg-config --cflags libgcrypt)
 EOF
 
 		ssl=gnutls
@@ -822,17 +822,17 @@ if [ "$otr" = 1 ]; then
 	# BI == built-in
 	echo '#define OTR_BI' >> config.h
 	cat <<EOF >>Makefile.settings
-EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)
-CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)
+EFLAGS+=$($PKG_CONFIG --libs libotr) $(pkg-config --libs libgcrypt)
+CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags libgcrypt)
 OTR_BI=otr.o
 EOF
 elif [ "$otr" = "plugin" ]; then
 	# for some mysterious reason beyond the comprehension of my mortal mind,
 	# the libgcrypt flags aren't needed when building as plugin. add them anyway.
 	echo '#define OTR_PI' >> config.h
 	cat <<EOF >>Makefile.settings
-OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)
-CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)
+OTRFLAGS=$($PKG_CONFIG --libs libotr) $(pkg-config --libs libgcrypt)
+CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags libgcrypt)
 OTR_PI=otr.so
 EOF
 fi