correct a wrong nod

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ed6b0acb1411ef4005e3f6a0be5fffbe13f0c5b1..be36a8c8ef7770042a6239d62c23ef8cb9842f06 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
@@ -177,7 +176,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
-         RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
       libXpm version:\t\t${XPM_VERSION}\n\
@@ -200,7 +198,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
-         RPM_FRONTEND_DEPS='gtkmm >= 2.4.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
          LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
          FRONTEND_INFO="${FRONTEND_INFO}\
@@ -214,7 +211,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
          RPM_FRONTEND="qt"
-         RPM_FRONTEND_DEPS='qt >= 2.2.1'
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
       Qt version:\t\t${QT_VERSION}\n"
@@ -265,12 +261,13 @@ AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
-AC_CHECK_FUNCS(snprintf vsnprintf strerror)
-LYX_CHECK_DECL(snprintf, stdio.h)
-LYX_CHECK_DECL(vsnprintf, stdio.h)
+AC_CHECK_FUNCS(strerror)
 LYX_CHECK_DECL(istreambuf_iterator, iterator)
 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 ;;
@@ -296,7 +293,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(memmove memset strchr mkfifo mkstemp mktemp)
+AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
 AC_LANG_POP(C)
 
 AC_FUNC_SELECT_ARGTYPES
@@ -308,9 +305,9 @@ VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
   Special build flags:           ${lyx_flags}\n\
   C   Compiler:                   ${CC}\n\
-  C   Compiler flags:             ${CFLAGS}\n\
+  C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\n\
   C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler flags:             ${CXXFLAGS}\n\
+  C++ Compiler flags:             ${CPPFLAGS} ${CXXFLAGS}\n\
   Linker flags:                   ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
   LyX binary dir:                 ${real_bindir}\n\
@@ -319,7 +316,6 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
 
 ## Some config.h stuff
 
@@ -344,14 +340,6 @@ AH_BOTTOM([
 /************************************************************
  ** You should not need to change anything beyond this point */
 
-#ifndef HAVE_STRCHR
-# define strchr(a,b)    index(a,b)
-#endif
-
-#ifndef HAVE_MEMMOVE
-# define memmove(a,b,c) bcopy(b,a,c)
-#endif
-
 #ifndef HAVE_STRERROR
 #if defined(__cplusplus)
 extern "C"
@@ -359,10 +347,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#ifdef BROKEN_HEADERS
-#include "broken_headers.h"
-#endif
-
 #ifdef HAVE_MKSTEMP
 #ifndef HAVE_DECL_MKSTEMP
 #if defined(__cplusplus)