Marc Wäckerlin 14 years ago
parent da9da075d0
commit 75bd40e560
  1. 9
      configure.in

@ -42,7 +42,7 @@ AC_SUBST(LEAST)
AC_MSG_CHECKING(QT4 directory) AC_MSG_CHECKING(QT4 directory)
QTDIR="no" QTDIR="no"
AC_ARG_WITH([qt-dir], 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.]), [to specify the path to the Qt4 directory.]),
[QTPATHS="$withval"], [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"]) [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) AC_MSG_WARN(Could not locate QT 4.1)
case $host in case $host in
*darwin*) *darwin*)
CPPFLAGS+=" -DQ_OS_MAC" LDFLAGS+=" -lproxy"
;; ;;
*mingw*|*win*) *mingw*|*win*)
LDFLAGS+=" -lwinhttp" LDFLAGS+=" -lwinhttp"
CPPFLAGS+=" -DQ_OS_WIN32"
;; ;;
*) *)
LDFLAGS+=" -lproxy" LDFLAGS+=" -lproxy"
CPPFLAGS+=" -DQ_OS_LINUX"
;; ;;
esac esac
else else
# by now, Linux/Unix always uses libproxy # by now, Linux/Unix always uses libproxy
case $host in case $host in
*darwin*) *darwin*)
CPPFLAGS+=" -DQ_OS_MAC"
LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui" LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
;; ;;
*mingw*|*win*) *mingw*|*win*)
LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4" LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4"
CPPFLAGS+=" -DQ_OS_WIN32"
;; ;;
*) *)
LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui" LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
LDFLAGS+=" -lproxy" LDFLAGS+=" -lproxy"
CPPFLAGS+=" -DQ_OS_LINUX"
;; ;;
esac esac
CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG" CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"

Loading…
Cancel
Save