diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-29 15:14:37 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-29 15:14:37 +0000 |
| commit | aef1b0073214cd31fe38a17064db21ec5260e237 (patch) | |
| tree | 849e2330c9d5531a4a3e59facf1961efd013cfaa | |
| parent | 01ddd34f67aa41dbe06f09c12ef884a07669b651 (diff) | |
| download | pango-aef1b0073214cd31fe38a17064db21ec5260e237.tar.gz | |
don't get confused by qt3
2001-06-29 Havoc Pennington <hp@redhat.com>
* configure.in (QTDIR): don't get confused by qt3
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | configure.in | 14 |
8 files changed, 37 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 7c1d8338..cbe183fe 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * configure.in (QTDIR): don't get confused by qt3 + Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 diff --git a/configure.in b/configure.in index ee3ed155..45bd60e5 100644 --- a/configure.in +++ b/configure.in @@ -269,12 +269,16 @@ AC_MSG_CHECKING(For Qt location) 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=`ls -d -r /usr/lib/qt*` + dirs=`cd /usr/lib && ls -d -r qt*` for dir in $dirs ; do - if test -x $dir/bin/moc ; then - QTDIR=$dir - break - fi + case $dir in + qt2*|qt-2*) + if test -x /usr/lib/$dir/bin/moc ; then + QTDIR=/usr/lib/$dir + break + fi + ;; + esac done else |