From 75bd40e56057b1e8d829500341816fe04df530fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 16 Feb 2011 14:49:01 +0000 Subject: [PATCH] refs #10 --- configure.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index dc56eba..5e0e660 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_SUBST(LEAST) AC_MSG_CHECKING(QT4 directory) QTDIR="no" AC_ARG_WITH([qt-dir], - AC_HELP_STRING([--with-qt-dir=/path/to/Qt4], + AC_HELP_STRING([--with-qt-dir=/path/to/Qt4/include], [to specify the path to the Qt4 directory.]), [QTPATHS="$withval"], [QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"]) @@ -62,29 +62,30 @@ if test -z "$QTLIBDIR"; then AC_MSG_WARN(Could not locate QT 4.1) case $host in *darwin*) - CPPFLAGS+=" -DQ_OS_MAC" + LDFLAGS+=" -lproxy" ;; *mingw*|*win*) LDFLAGS+=" -lwinhttp" - CPPFLAGS+=" -DQ_OS_WIN32" ;; *) LDFLAGS+=" -lproxy" - CPPFLAGS+=" -DQ_OS_LINUX" ;; esac else # by now, Linux/Unix always uses libproxy case $host in *darwin*) + CPPFLAGS+=" -DQ_OS_MAC" LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui" ;; *mingw*|*win*) LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4" + CPPFLAGS+=" -DQ_OS_WIN32" ;; *) LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui" LDFLAGS+=" -lproxy" + CPPFLAGS+=" -DQ_OS_LINUX" ;; esac CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"