blob: c2eae73b2b440d4864917ea5fb74df78c577045b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
--- acinclude.m4.old 2005-08-07 05:58:52.000000000 -0400
+++ acinclude.m4 2006-10-14 08:52:42.000000000 -0400
@@ -75,8 +75,6 @@
AC_MSG_CHECKING([QTDIR])
AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=$QTDIR]], QTDIR=$withval)
-AC_ARG_WITH([qt-includes], [ --with-qt-includes=DIR Directory containing the qt include files ], QT_INC_DIR=$withval)
-AC_ARG_WITH([qt-libs], [ --with-qt-libraries=DIR Directory containing the qt libraries ], QT_LIB_DIR=$withval)
# Check that QTDIR is defined or that --with-qtdir given
if test x"$QTDIR" = x; then
@@ -95,6 +93,9 @@
QT_LIB_DIR=$QTDIR/lib
fi
+AC_ARG_WITH([qt-includes], [ --with-qt-includes=DIR Directory containing the qt include files ], QT_INC_DIR=$withval)
+AC_ARG_WITH([qt-libs], [ --with-qt-libs=DIR Directory containing the qt libraries ], QT_LIB_DIR=$withval)
+
#Some distributions don't use QTDIR and use "standard" places like /usr/include/qt3 for headers and /usr/lib for libs
#We try to detect qt in those standard places when we haven't found anything in QTDIR
if test x$QT_INC_DIR = x; then
|
GitWeb
