--- configure.in 2003/07/29 18:20:09 1.22
+++ configure.in 2003/11/17 19:03:50 1.23
@@ -62,6 +62,23 @@
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
LIBS="`echo $PTHREAD_CFLAGS | sed -e 's;.*\(-[[pmk]]thread[[s]]*\).*;\1;'` $LIBS"
+dnl Do Qt checks
+PKG_CHECK_MODULES(QT, qt >= 3.2.0, have_qt=true, AC_MSG_ERROR([No qt installation found]))
+ AC_SUBST(QT_LIBS)
+ AC_SUBST(QT_CFLAGS)
+
+dnl Find Qt locations
+AC_CHECK_QT
+AC_SUBST(QTBASE)
+AC_CHECK_UIC
+AC_SUBST(UIC)
+AC_CHECK_MOC
+AC_SUBST(MOC)
+
+dnl Check generic libraries
+AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"])
+AC_CHECK_LIB(rt, sched_get_priority_min, [LIBS="$LIBS -lrt"])
+
dnl Check other requirements
AC_PROG_MAKE_SET
AC_CHECK_DEBUGGING
@@ -86,28 +103,6 @@
AC_TEST_ESOAP
AC_SUBST(SOAPBASE)
-dnl Find out where the Qt implementation resides
-AC_CHECK_QT
-AC_SUBST(QTBASE)
-AC_CHECK_UIC
-AC_SUBST(UIC)
-AC_CHECK_MOC
-AC_SUBST(MOC)
-
-dnl Check our X environment
-AC_PATH_X
-if test ".$no_x" = .yes; then
- AC_ERROR([X11 includes and libraries are required, but none were found.])
-else
-if test $x_includes; then
- CXXFLAGS="$CXXFLAGS -I$x_includes"
-fi
-if test $x_libraries; then
- LDFLAGS="$LDFLAGS -L$x_libraries"
- LIBS="$LIBS -lX11 -lXext -lSM -lm"
-fi
-fi
-
dnl Check data type sizes of particular architecture
dnl Hack: We're really interested in the unsigned types,
dnl but they're the same size according to ISO C++
@@ -117,15 +112,6 @@
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
-dnl Check some X resources, typical of XFree86
-AC_CHECK_LIB(Xft, XftFreeTypeOpen, [LIBS="$LIBS -lXft"])
-AC_CHECK_LIB(Xrender, XRenderFindFormat, [LIBS="$LIBS -lXrender"])
-AC_CHECK_LIB(Xinerama, XineramaIsActive, [LIBS="$LIBS -lXinerama"])
-AC_CHECK_LIB(GL, glBegin, [LIBS="$LIBS -lGL"])
-AC_CHECK_LIB(ICE, IceOpenConnection, [LIBS="$LIBS -lICE"])
-AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"])
-AC_CHECK_LIB(rt, sched_get_priority_min, [LIBS="$LIBS -lrt"])
-
enable_shared=no
export enable_shared
enable_headline=no
|
