Changeset 684aca2


Ignore:
Timestamp:
2024-07-03T07:58:38Z (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r37ef2cb r684aca2  
    436436        if $PKG_CONFIG --exists gnutls; then
    437437                cat <<EOF >>Makefile.settings
    438 EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs)
    439 CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags)
     438EFLAGS+=$($PKG_CONFIG --libs gnutls) $(pkg-config --libs libgcrypt)
     439CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(pkg-config --cflags libgcrypt)
    440440EOF
    441441                ssl=gnutls
     
    447447        elif libgnutls-config --version > /dev/null 2> /dev/null; then
    448448                cat <<EOF >>Makefile.settings
    449 EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs)
    450 CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags)
     449EFLAGS+=$(libgnutls-config --libs) $(pkg-config --libs libgcrypt)
     450CFLAGS+=$(libgnutls-config --cflags) $(pkg-config --cflags libgcrypt)
    451451EOF
    452452               
     
    823823        echo '#define OTR_BI' >> config.h
    824824        cat <<EOF >>Makefile.settings
    825 EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)
    826 CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)
     825EFLAGS+=$($PKG_CONFIG --libs libotr) $(pkg-config --libs libgcrypt)
     826CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags libgcrypt)
    827827OTR_BI=otr.o
    828828EOF
     
    832832        echo '#define OTR_PI' >> config.h
    833833        cat <<EOF >>Makefile.settings
    834 OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)
    835 CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)
     834OTRFLAGS=$($PKG_CONFIG --libs libotr) $(pkg-config --libs libgcrypt)
     835CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags libgcrypt)
    836836OTR_PI=otr.so
    837837EOF
Note: See TracChangeset for help on using the changeset viewer.