remove noload/don't typeset

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 498f881ba2efd207643f8906f812a29dd773309f..2da7eede203fc9df53b8246d6c6cbc42ca81dea4 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -156,7 +156,7 @@ AC_DEFUN(LYX_PROG_CXX,
 LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS])
 
 if test -z "$CXX" ; then
-  AC_ERROR([Unable to find a good enough C++ compiler])
+  AC_MSG_ERROR([Unable to find a good enough C++ compiler])
 fi
 AC_MSG_RESULT($CXX)
 
@@ -211,7 +211,7 @@ if test x$GXX = xyes; then
       2.96*)  CXXFLAGS="$lyx_opt -fno-exceptions -Wno-non-template-friend";;
       3.0*)    CXXFLAGS="$lyx_opt";;
       3.1*)    CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
-      3.2*)    CXXFLAGS="$lyx_opt";;
+      3.2*)    CXXFLAGS="$lyx_opt -fno-exceptions";;
       *)       CXXFLAGS="$lyx_opt";;
     esac
     if test x$enable_debug = xyes ; then
@@ -222,7 +222,7 @@ if test x$GXX = xyes; then
     case $gxx_version in
        2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
        2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
-       3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall -Winline";;
+       3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
        *)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
     if test $lyx_devel_version = yes ; then
@@ -284,7 +284,7 @@ AC_CACHE_CHECK(whether the C++ compiler understands explicit,lyx_cv_explicit,
  [AC_TRY_COMPILE([
 class Expl {
 public:
-       explicit Expl() {};
+       explicit Expl() {}
 };],,lyx_cv_explicit=yes,lyx_cv_explicit=no)
 ])
 if test $lyx_cv_explicit = no ; then
@@ -502,8 +502,8 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
 dnl Usage LYX_PATH_XPM: Checks for xpm library and header
 AC_DEFUN(LYX_PATH_XPM,[
 ### Check for Xpm library
-AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,XPM_LIB="-lXpm",
-       [LYX_LIB_ERROR(libXpm,Xpm)], $XPM_LIB)
+AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm",
+       [LYX_LIB_ERROR(libXpm,Xpm)])
 AC_SUBST(XPM_LIB)
 ### Check for Xpm headers
 lyx_cv_xpm_h_location="<xpm.h>"
@@ -591,7 +591,7 @@ AC_DEFUN(LYX_LOOP_DIR,[
 IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 for dir in `eval "echo $1"`; do
   if test ! "$dir" = NONE; then
-    test ! -d "$dir" && AC_ERROR([\"$dir\" is not a directory])
+    test ! -d "$dir" && AC_MSG_ERROR([\"$dir\" is not a directory])
     $2
   fi
 done
@@ -646,34 +646,10 @@ lyx_path_header_path=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
   sed -e 's/.*\(".*$1"\).*/\1/' -e "1q"`
 eval "lyx_cv_path2_${ac_safe}=\$lyx_path_header_path"
 rm -f conftest*])
-  AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path)])
+  AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path, [dummy])])
 ])
 ### end of LYX_PATH_HEADER
 
-dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
-dnl if the cache file is inconsistent with the current host,
-dnl target and build system types, execute CMD or print a default
-dnl error message.
-AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
-    AC_REQUIRE([AC_CANONICAL_SYSTEM])
-    AC_MSG_CHECKING([config.cache system type])
-    if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-        test x"$ac_cv_host_system_type" != x"$host"; } ||
-       { test x"${ac_cv_build_system_type+set}" = x"set" &&
-        test x"$ac_cv_build_system_type" != x"$build"; } ||
-       { test x"${ac_cv_target_system_type+set}" = x"set" &&
-        test x"$ac_cv_target_system_type" != x"$target"; }; then
-       AC_MSG_RESULT([different])
-       ifelse($#, 1, [$1],
-               [AC_MSG_ERROR(["you must remove config.cache and restart configure"])])
-    else
-       AC_MSG_RESULT([same])
-    fi
-    ac_cv_host_system_type="$host"
-    ac_cv_build_system_type="$build"
-    ac_cv_target_system_type="$target"
-])
-
 dnl We use this until autoconf fixes its version.
 AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES,
 [AC_MSG_CHECKING([types of arguments for select()])
@@ -745,7 +721,7 @@ tr_hdr=`echo $2 | tr . _`
 AC_CACHE_VAL([lyx_cv_declare_${tr_hdr}_$1],
 [AC_EGREP_HEADER($1, $2, [eval "lyx_cv_declare_${tr_hdr}_$1=yes"], [eval "lyx_cv_declare_${tr_hdr}_$1=no"])])
 if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
-       AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func})
+       AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func},1,[dummy])
        AC_MSG_RESULT(yes)
 else
        AC_MSG_RESULT(no)