revert last accidental commit and do the intended one

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 985c3214f7ec4eb0b5c7497203003e772390daac..8650aa044b130ba62fe59e6b0da5f17326be141c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ LYX_VERSION_SUFFIX
 AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
 # We need to define these variables here and the no-define option of
-# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. 
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
 dnl default maintainer mode to true for development versions
@@ -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
@@ -117,6 +117,11 @@ LYX_LOOP_DIR($lyx_cv_extra_prefix,[
 LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
+### These are needed in windows
+AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
+AC_SUBST(LIBSHLWAPI)
+AC_CHECK_LIB(gdi32, main)
+
 AC_ARG_WITH(aiksaurus,
   [  --without-aiksaurus     do not use the Aiksaurus library],
   [lyx_use_aiksaurus=$withval])
@@ -144,9 +149,6 @@ AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
 
-### Check for some Cygwin-specific details.
-CHECK_WITH_CYGWIN
-
 ### Check for X libraries
 AC_PATH_XTRA
 case $have_x in
@@ -191,7 +193,7 @@ for frontend in $FRONTENDS ; do
     qt)
          QT_DO_IT_ALL
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
-         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
+         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
          RPM_FRONTEND="qt"
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
@@ -272,25 +274,10 @@ LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
 # Check the form of mkdir()
 AC_FUNC_MKDIR
 
-AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[
-    case "${enableval}" in
-       yes) use_compression=true ;;
-       no) use_compression=false ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;;
-    esac
-],[use_compression=true])
-if test $use_compression=true ; then
-       AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
-       AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
-       if test $use_compression = true ; then
-               AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
-               lyx_flags="compression $lyx_flags"
-       fi
-fi
-AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
-AC_MSG_CHECKING([whether to support compressed files])
-AC_MSG_RESULT($use_compression)
-
+# check for compression support
+AC_CHECK_HEADERS(zlib.h,
+ [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
@@ -309,9 +296,9 @@ save_LIBS="$LIBS"
 LIBS=
 AC_CHECK_FUNCS(fcntl,
   [AC_SEARCH_LIBS([gethostbyname], [nsl])
-   AC_SEARCH_LIBS([socket], [socket], [], 
+   AC_SEARCH_LIBS([socket], [socket], [],
      [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
-                [], [-lnsl])])], 
+               [], [-lnsl])])],
   [lyx_client_subdir=false])
 AC_SUBST(SOCKET_LIBS,$LIBS)
 LIBS="$save_LIBS"
@@ -393,10 +380,6 @@ int mkstemp(char*);
 #endif
 #endif
 
-#ifdef __EMX__
-#  include "support/os2_defines.h"
-#endif
-
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
 #  define USE_BOOST_FORMAT 1
 #else
@@ -431,6 +414,8 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/libs/Makefile \
        boost/libs/filesystem/Makefile \
        boost/libs/filesystem/src/Makefile \
+       boost/libs/iostreams/Makefile \
+       boost/libs/iostreams/src/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
        boost/libs/signals/Makefile \
@@ -465,16 +450,13 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/gtk/Makefile \
        src/frontends/gtk/gimages/Makefile \
        src/frontends/gtk/glade/Makefile \
-       src/frontends/qt2/Makefile \
-       src/frontends/qt2/moc/Makefile \
-       src/frontends/qt2/ui/Makefile \
-       src/frontends/qt2/ui/moc/Makefile \
+       src/frontends/qt3/Makefile \
+       src/frontends/qt3/moc/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 \
 ])
-echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
-(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix")
 
 AC_OUTPUT
 # show version information