diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-19 17:00:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-19 17:00:30 +0000 |
| commit | f67f0945b7a86cca94c8ea89be59cdceebf2870d (patch) | |
| tree | e21e51ec17933f66586c763156d6d5f8bf4b3f78 /configure.in | |
| parent | 20f066b00b96d44a1054ad85fc4098d294915606 (diff) | |
| download | pango-f67f0945b7a86cca94c8ea89be59cdceebf2870d.tar.gz | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 21 insertions, 0 deletions
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 |