X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=ecb4cd26c3f99829f953deb2ec3ea1baf7b8511e;hb=becfc55b08dc77519b82b1064d8f10d86c164273;hp=ef015a540a999abb14acea7c7563da9ddf4fe025;hpb=479abc6efdbfb69b3f9097fb89984768d287d74e;p=lyx.git

diff --git a/configure.ac b/configure.ac
index ef015a540a..ecb4cd26c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_SUBST(LYX_DATE, ["Fri, Jul 13, 2006"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
@@ -48,7 +49,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
@@ -63,6 +64,9 @@ AC_PROG_CC
 AC_ISC_POSIX
 AC_AIX
 
+### we need to know the byte order for unicode conversions
+AC_C_BIGENDIAN
+
 ### check which frontend we want to use
 LYX_USE_FRONTENDS
 
@@ -118,7 +122,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,
@@ -142,7 +147,15 @@ AC_SUBST(AIKSAURUS_LIBS)
 
 LYX_USE_INCLUDED_BOOST
 
+# Needed for our char_type
+AC_CHECK_SIZEOF(wchar_t)
+
 ### Setup libtool
+dnl Dirty trick ahead: disable libtool checking for a fortran compiler
+dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
+dnl Note that this will reportedly not be needed with libtool 2.0
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
@@ -166,16 +179,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)"
@@ -189,11 +192,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"
@@ -243,6 +246,12 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
   prefix=`pwd`/installprefix
 fi
 
+### We need iconv for unicode support
+AM_ICONV
+if test "$am_cv_func_iconv" = no; then
+  LYX_ERROR([Cannot find required library iconv])
+fi
+
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
@@ -275,8 +284,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
@@ -398,6 +407,8 @@ int mkstemp(char*);
 
 #ifdef __CYGWIN__
 #  define BOOST_POSIX 1
+#  define BOOST_POSIX_API 1
+#  define BOOST_POSIX_PATH 1
 #endif
 
 #if defined(HAVE_NEWAPIS_H)
@@ -442,19 +453,13 @@ 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 \
        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 \
 ])