Add a AC_TRY_LINK() for qt, since broken setups seem to be common.

Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
	seem to be common.

	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.

8 files changed, 70 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bab215d..df0de650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3bab215d..df0de650 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Sat Jan 19 11:50:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add a AC_TRY_LINK() for	qt, since broken setups
+	seem to be common.
+
+	* configure.in: Save ACLOCAL_FLAGS for --enable-maintainer-mode rebuilds.
+
 2002-01-18  Alexander Larsson  <alla@lysator.liu.se>
 	
         * pango/pangoft2-private.h:
diff --git a/configure.in b/configure.in
index 25b401d5..bbc6dc9b 100644
--- a/configure.in
+++ b/configure.in
@@ -380,6 +380,24 @@ if test "$CXX" != "" ; then
   fi
 fi
 
+if test x"$QTDIR" != "x" ; then
+  AC_MSG_CHECKING(For working Qt)
+
+  pango_save_libs="$LIBS"
+  pango_save_cppflags="$CPPFLAGS"
+  LIBS="-L$QTDIR/lib -lqt $LIBS"
+  CPPFLAGS="-I $QTDIR/include"
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_LINK([#include <qapplication.h>],
+              [QApplication a ();], 
+               [AC_MSG_RESULT(yes)],
+               [QTDIR=""; AC_MSG_RESULT(no)])
+  AC_LANG_RESTORE
+  LIBS="$pango_save_libs"
+  CPPFLAGS="$pango_save_cppflags"
+fi
+
 AM_CONDITIONAL(BUILD_QT_TEST, test "x$QTDIR" != x)
 AC_SUBST(QTDIR)
   
@@ -571,6 +589,9 @@ included_modules=$included_modules
 AC_HEADER_DIRENT
 AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
 
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 AC_OUTPUT([
 Makefile 
 pango/Makefile