Changeset a59bd11

Timestamp:

2015-08-08T00:12:36Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

4850065

Parents:

e88fe7da

git-author:

dequis <dx@…> (07-08-15 23:53:28)

git-committer:

dequis <dx@…> (08-08-15 00:12:36)

Message:

configure: use pkg-config for libotr

File:

• configure (modified) (2 diffs)

configure

@@ -353 +353 @@
 EOF
                 ssl=gnutls
-                if ! pkg-config gnutls --atleast-version=2.8; then
+                if ! $PKG_CONFIG gnutls --atleast-version=2.8; then
                         echo
                         echo 'Warning: With GnuTLS versions <2.8, certificate expire dates are not verified.'
@@ -643 +643 @@
 
 otrprefix=""
-for i in / /usr /usr/local; do
-        if [ -f ${i}/lib/libotr.a ]; then
-                otrprefix=${i}
-                break
-        fi
-done
 if [ "$otr" = "auto" ]; then
-        if [ -n "$otrprefix" ]; then
-                otr=1
-        else
-                otr=0
-        fi
-fi
+        ! $PKG_CONFIG --exists libotr
+        otr=$?
+fi
+
+if [ "$otr" != 0 ] && ! $PKG_CONFIG --atleast-version=4.0 --print-errors libotr; then
+        exit 1
+fi
+
 if [ "$otr" = 1 ]; then
         # BI == built-in
         echo '#define OTR_BI' >> config.h
-        echo "EFLAGS+=-L${otrprefix}/lib -lotr -lgcrypt" >> Makefile.settings
-        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        echo "EFLAGS+=$($PKG_CONFIG --libs libotr)$(libgcrypt-config --libs)" >> Makefile.settings
+        echo "CFLAGS+=$($PKG_CONFIG --cflags libotr)$(libgcrypt-config --cflags)" >> Makefile.settings
         echo 'OTR_BI=otr.o' >> Makefile.settings
 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
-        echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings
-        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        echo "OTRFLAGS=$($PKG_CONFIG --libs libotr)$(libgcrypt-config --libs)" >> Makefile.settings
+        echo "CFLAGS+=$($PKG_CONFIG --cflags libotr)$(libgcrypt-config --cflags)" >> Makefile.settings
         echo 'OTR_PI=otr.so' >> Makefile.settings
-fi
-if [ "$otr" != 0 ] && ! pkg-config libotr --atleast-version=4.0; then
-        echo
-        echo 'WARNING: Your libotr seems to be old. BitlBee now needs at least libotr 4.0.'
-        # Not hard-failing because the code above doesn't use pkg-config, so who knows
-        # what's true at this point...
 fi