revert last accidental commit and do the intended one

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b7c322b9225f6e22551d3b4ce024c210ed81219b..8650aa044b130ba62fe59e6b0da5f17326be141c 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
@@ -118,7 +118,8 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
 ### These are needed in windows
-AC_CHECK_LIB(shlwapi, main)
+AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
+AC_SUBST(LIBSHLWAPI)
 AC_CHECK_LIB(gdi32, main)
 
 AC_ARG_WITH(aiksaurus,
@@ -275,8 +276,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
@@ -379,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
@@ -458,7 +455,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 \
 ])