We are going to 0.9.2. Use pkgconfig in configure if possible

This commit is contained in:
Christian Hohnstaedt 2012-03-23 06:58:23 +01:00
parent 3d4d790b04
commit 92b1e334cc
2 changed files with 25 additions and 14 deletions

View File

@ -1 +1 @@
0.9.1
0.9.2-dev

37
configure vendored
View File

@ -163,22 +163,33 @@ check_frameworks() {
return 0
}
######################### QT
if test -z "$DARWIN"; then
subdirs="/qt /qt4"
search_includes QtCore/QObject || err "The QT Library headerfiles were not found. Set QTDIR appropriately."
search_lib QtCore4 QtCore || err "The QT Core library was not found."
search_lib QtGui4 QtGui || err "The QT Gui library was not found."
search_lib ltdl || err "Libtool ltdl not found."
search_lib c_r || true
if test "$#" = "0" && test -z "$DARWIN" && \
pkg-config QtGui openssl --libs >/dev/null;
then
CF="`pkg-config QtGui openssl --cflags`"
LIBS="`pkg-config QtGui openssl --libs` -lltdl"
else
check_frameworks QtGui QtCore || err "QT Framework not found, needed on Mac OSX, please install QT"
by_hand=true
fi
###################### OpenSSL
subdirs=""
search_includes openssl/opensslv.h || err "The OpenSSL library headerfiles were not found."
search_lib crypto || err "The OpenSSL library was not found."
if test "$by_hand" = "true"; then
######################### QT
if test -z "$DARWIN"; then
subdirs="/qt /qt4"
search_includes QtCore/QObject || err "The QT Library headerfiles were not found. Set QTDIR appropriately."
search_lib QtCore4 QtCore || err "The QT Core library was not found."
search_lib QtGui4 QtGui || err "The QT Gui library was not found."
search_lib ltdl || err "Libtool ltdl not found."
search_lib c_r || true
else
check_frameworks QtGui QtCore || err "QT Framework not found, needed on Mac OSX, please install QT"
fi
###################### OpenSSL
subdirs=""
search_includes openssl/opensslv.h || err "The OpenSSL library headerfiles were not found."
search_lib crypto || err "The OpenSSL library was not found."
fi
cat << EOF