From 43c16bed73a5a9335d554828675933318afd0c5f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 14 Feb 2002 20:32:19 +0000 Subject: Respect QTDIR if set. Look for qt3 as well as qt2. Thu Feb 14 14:46:26 2002 Owen Taylor * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. --- ChangeLog | 4 ++++ ChangeLog.pre-1-0 | 4 ++++ ChangeLog.pre-1-10 | 4 ++++ ChangeLog.pre-1-2 | 4 ++++ ChangeLog.pre-1-4 | 4 ++++ ChangeLog.pre-1-6 | 4 ++++ ChangeLog.pre-1-8 | 4 ++++ configure.in | 35 ++++++++++++++++++++++------------- 8 files changed, 50 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9b77b7c..312fffca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a9b77b7c..312fffca 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +Thu Feb 14 14:46:26 2002 Owen Taylor + + * configure.in: Respect QTDIR if set. Look for qt3 as well as qt2. + 2002-02-14 Sven Neumann * configure.in: updated the list of available modules (bug #71411). diff --git a/configure.in b/configure.in index 1a747ff6..addab346 100644 --- a/configure.in +++ b/configure.in @@ -364,28 +364,35 @@ AC_CHECK_FUNCS(flockfile) AC_ARG_WITH(qt, [ --with-qt=DIR Location where Qt is installed],,with_qt=yes) -QTDIR= if test "$CXX" != "" ; then AC_MSG_CHECKING(For Qt location) - if test "x$with_qt" = xyes ; then + if test "x$with_qt" = xyes ; then # Search for Qt in a common location. The ls -r is an attempt to find the newest - dirs=`cd /usr/lib && ls -d -r qt*` - for dir in $dirs ; do - case $dir in - qt2*|qt-2*) - if test -x /usr/lib/$dir/bin/moc ; then - QTDIR=/usr/lib/$dir - break - fi - ;; - esac - done + if test "x$QTDIR" != x ; then + if test -x $QTDIR/bin/moc ; then : ; else + QTDIR= + fi + else + dirs=`cd /usr/lib && ls -d -r qt*` + for dir in $dirs ; do + case $dir in + qt2*|qt-2*|qt3*|qt-3*) + if test -x /usr/lib/$dir/bin/moc ; then + QTDIR=/usr/lib/$dir + break + fi + ;; + esac + done + fi else if test "x$with_qt" != xno ; then if test -x $with_qt/bin/moc ; then QTDIR=$with_qt fi + else + QTDIR="" fi fi @@ -394,6 +401,8 @@ if test "$CXX" != "" ; then else AC_MSG_RESULT($QTDIR) fi +else + QTDIR="" fi if test x"$QTDIR" != "x" ; then -- cgit v1.2.1