Changeset 684aca2

Timestamp:

2024-07-03T07:58:38Z (3 days ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Parents:

37ef2cb

git-author:

matt <matt@…> (02-07-24 14:39:46)

git-committer:

Jelmer Vernooij <jelmer@…> (03-07-24 07:58:38)

Message:

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

File:

• configure (modified) (4 diffs)

configure

@@ -436 +436 @@
         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
@@ -447 +447 @@
         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
                 
@@ -823 +823 @@
         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
@@ -832 +832 @@
         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