Small change.

[lyx.git] / config / configure.ac

diff --git a/config/configure.ac b/config/configure.ac
index b31cb9ca3d82e003ba893a785ac336e36577dbd3..48708148595c080bd8dd3289533202d8cfc14ce6 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -1,7 +1,7 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org)
-AC_PREREQ(2.53)
+AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
 
@@ -150,7 +150,6 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 ## Check whether X is new enough to handle the input method stuff
 AC_CHECK_FUNCS(XOpenIM)
 
- 
 ### check which frontend we want to use
 
 #LYX_USE_FRONTEND
@@ -189,17 +188,23 @@ case "$lyx_use_frontend" in
     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
        ;;
-  qt2)
-    QT2_DO_IT_ALL
+  qt)
+    QT_DO_IT_ALL
     FRONTEND="qt2"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
-    FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
-    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
-    FRONTEND_LIBS="\$(QT2_LIBS)";;
+    FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+    FRONTEND_LIBS="\$(QT_LIB)"
+    FRONTEND_INFO="    Qt version:                   ${QT_VERSION}\n"
+    ;;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
+# Do this here instead of in the LYX_USE_XFORMS_IMAGE_LOADER macro
+AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
+              test x$lyx_use_xforms_image_loader = xno)
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
 LYX_ERROR(dnl