Add language and encoding information

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9cb3675efc44f273b1562cb0728c1f35c5c86d6e..be1657855a8dd713622209bec3d4a9d6697fdbe1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ fi
 AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
 
 # Check for installed python
-AM_PATH_PYTHON(1.5.2,, :)
+AM_PATH_PYTHON(2.3,, :)
 
 # Work around a problem in automake 1.4: when invoking install-strip,
 # INSTALL_PROGRAM is changed to 'install -s', and since
@@ -167,16 +167,6 @@ dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
   case "$frontend" in
-    xforms)
-         XFORMS_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
-         RPM_FRONTEND="xforms"
-         FRONTEND_INFO="${FRONTEND_INFO}\
-  XForms Frontend:\n\
-      libXpm version:\t\t${XPM_VERSION}\n\
-      libforms version:\t\t${XFORMS_VERSION}\n"
-         ;;
     gtk)
          PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
@@ -190,11 +180,11 @@ for frontend in $FRONTENDS ; do
     libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
          ;;
 
-    qt)
+    qt3)
          QT_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt3\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
-         RPM_FRONTEND="qt"
+         RPM_FRONTEND="qt3"
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
       Qt version:\t\t${QT_VERSION}\n"
@@ -276,8 +266,8 @@ AC_FUNC_MKDIR
 
 # check for compression support
 AC_CHECK_HEADERS(zlib.h,
- [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_ERROR([zlib not found!]))],
- [LYX_ERROR([zlib.h not found!])])
+ [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
+ [LYX_LIB_ERROR(zlib.h,zlib)])
 
 dnl This is a slight hack: the tests generated by autoconf 2.52 do not
 dnl work correctly because of some conflict with stdlib.h with g++ 2.96
@@ -443,10 +433,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/controllers/tests/Makefile \
-       src/frontends/xforms/Makefile \
-       src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \
-       src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
-       src/frontends/xforms/forms/Makefile \
        src/frontends/gtk/Makefile \
        src/frontends/gtk/gimages/Makefile \
        src/frontends/gtk/glade/Makefile \
@@ -455,7 +441,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt3/ui/Makefile \
        src/frontends/qt3/ui/moc/Makefile \
        src/frontends/qt4/Makefile \
-       src/frontends/qt4/moc/Makefile \
        src/frontends/qt4/ui/Makefile \
 ])