X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=481468841845f41544a17f3dbc1ea78235a7bb34;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=5bcbe727e643d1eae769c985a7af8fb5a958d104;hpb=12a6d463703010a006b2dcd15ccddafa6335fa59;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 5bcbe727e6..4814688418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +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_SUBST(LYX_DATE, ["Mon, Feb 19, 2007"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
@@ -179,38 +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
-    gtk)
-	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
-	  RPM_FRONTEND="gtk"
-	  GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
-	  LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
-	  FRONTEND_INFO="${FRONTEND_INFO}\
-  GTK Frontend:\n\
-    libgtkmm version:\t\t${GTKMM_VERSION}\n\
-    libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
-	  ;;
-
-    qt3)
-	  QT_DO_IT_ALL
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt3\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
-	  RPM_FRONTEND="qt3"
-	  FRONTEND_INFO="${FRONTEND_INFO}\
-  Qt Frontend:\n\
-      Qt version:\t\t${QT_VERSION}\n"
-dnl qt build will fail without moc or uic
-	  if test -z "$MOC"; then
-	    LYX_ERROR([moc binary not found !])
-	  fi
-	  if test -z "$UIC"; then
-	    LYX_ERROR([uic binary not found !])
-	  fi
-	  if test -z "$QT_LIB"; then
-	    LYX_ERROR([qt library not found !])
-	  fi
-      ;;
     qt4)
 	  QT4_DO_IT_ALL
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
@@ -268,7 +236,7 @@ AC_HEADER_STAT
 AC_HEADER_TIME
 
 # some standard types
-AC_TYPE_MODE_T
+AC_CHECK_TYPE(mode_t,[AC_DEFINE(HAVE_MODE_T, 1, [Define this to 1 if your compiler supports the mode_t type.])])
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIGNAL
@@ -292,7 +260,7 @@ dnl work correctly because of some conflict with stdlib.h with g++ 2.96
 dnl We aim to remove this eventually, since we should test as much as
 dnl possible with the compiler which will use the functions (JMarc)
 AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
+AC_CHECK_FUNCS(chmod close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
 AC_LANG_POP(C)
 
 LYX_CHECK_SPELL_ENGINES
@@ -317,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
@@ -388,7 +356,7 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) && !defined(__CYGWIN__)
+#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
 #  define USE_BOOST_FORMAT 1
 #else
 #  define USE_BOOST_FORMAT 0
@@ -415,6 +383,10 @@ int mkstemp(char*);
 #  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+#  define LIBC_WCTYPE_USES_UCS4
+#endif
+
 #endif
 ])
 
@@ -453,12 +425,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/controllers/tests/Makefile \
-       src/frontends/gtk/Makefile \
-       src/frontends/gtk/gimages/Makefile \
-       src/frontends/gtk/glade/Makefile \
-       src/frontends/qt3/Makefile \
-       src/frontends/qt3/ui/Makefile \
-       src/frontends/qt3/ui/moc/Makefile \
        src/frontends/qt4/Makefile \
        src/frontends/qt4/ui/Makefile \
 ])