uses references instead of returning vectors

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index eb20c0c6f9d21ebaab2d3adc7fb461ee60ebea87..172309f9786cbb3541e1fc017c5f4b0165896d61 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -207,12 +207,11 @@ if test x$GXX = xyes; then
   else
     case $gxx_version in
       2.95.1)  CXXFLAGS="$lyx_opt -fpermissive";;
-      2.95.2)  CXXFLAGS="$lyx_opt";;
-      2.95.*)  CXXFLAGS="$lyx_opt";;
+      2.95.*)  CXXFLAGS="$lyx_opt -Wno-non-template-friend";;
       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
@@ -223,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
@@ -513,7 +512,8 @@ AC_CHECK_HEADER(X11/xpm.h,[
   lyx_cv_xpm_h_location="<X11/xpm.h>"],[
 AC_CHECK_HEADER(xpm.h,[],[
 LYX_LIB_ERROR(xpm.h,Xpm)])])
-AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location)
+AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location,
+  [define this to the location of xpm.h to be used with #include, e.g. <xpm.h>])
 
 ### Test for the header version
 if test $ac_cv_header_xpm_h = yes; then
@@ -551,53 +551,6 @@ changequote([,])
 fi])
 
 
-dnl Usage: LYX_HPUX  Checks for HP-UX and update CXXFLAGS accordingly
-AC_DEFUN(LYX_HPUX,
-[#It seems that HPUX requires using -fpcc-struct-return with gcc.
-AC_CACHE_CHECK(for HP-UX,ac_cv_hpux,[
-os=`uname -s | tr '[A-Z]' '[a-z]'`
-ac_cv_hpux=no
-test "$os" = hp-ux && ac_cv_hpux=yes])
-if test "$ac_cv_hpux" = yes; then
- test "x$GXX" = xyes && CXXFLAGS="$CXXFLAGS -fpcc-struct-return"
-fi])
-
-
-dnl Usage: LYX_SUNOS4 Checks for SunOS 4.x and sets the flag lyx_broken_headers
-dnl   if necessary
-AC_DEFUN(LYX_SUNOS4,
-[#The headers are not correct under SunOS4
-AC_CACHE_CHECK(for SunOS 4.x,ac_cv_sunos4,[
-changequote(, ) dnl
-os=`uname -a | sed -e 's/^\([^ ]*\) [^ ]* \([0-9]\)\..*/\1\2/'`
-changequote([, ]) dnl
-ac_cv_sunos4=no
-test "$os" = SunOS4 && ac_cv_sunos4=yes])
-if test "$ac_cv_sunos4" = yes; then
- test "x$GXX" = xyes && lyx_broken_headers=yes
-fi])
-
-
-dnl Usage: LYX_SCO Checks for SCO and sets the flag lyx_broken_headers
-dnl   if necessary
-AC_DEFUN(LYX_SCO,
-[AC_CACHE_CHECK(for SCO 3.2v4,ac_cv_sco,[
-ac_cv_sco=no
-if test `uname -s` != "SCO_SV"; then
-  lyx_machine_rel=`uname -m`:`uname -r`
-  if test $lyx_machine_rel = i386:3.2 || test $lyx_machine_rel = i486:3.2;
-  then
-    if test -f /usr/options/cb.name; then
-      ac_cv_sco=no
-    elif /bin/uname -X 2>/dev/null >/dev/null ; then
-      ac_cv_sco=yes
-    fi
-  fi
-fi])
-if test "$ac_cv_sco" = yes; then
- test "x$GXX" = xyes && lyx_broken_headers=yes
-fi])
-
 dnl Usage: LYX_FUNC_PUTENV_ARGTYPE
 dnl Checks whether putenv() takes 'char const *' or 'char *' as
 dnl argument. This is needed because Solaris 7 (wrongly?) uses 'char *',