else
case $gxx_version in
2.95.1) CXXFLAGS="$lyx_opt -fpermissive";;
- 2.95.2) CXXFLAGS="$lyx_opt";;
- 2.95.*) CXXFLAGS="$lyx_opt";;
- 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions";;
+ 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
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
])
-dnl Usage: LYX_REGEX : checks if the header regex.h is available
-dnl if it is not available the automake variable USE_REGEX will be
-dnl defined and the regex.h and regex.c that we provide will be used.
-dnl AC_DEFUN(LYX_REGEX,[
-dnl AC_CHECK_HEADERS(regex.h, lyx_regex=no, lyx_regex=yes)
-dnl AM_CONDITIONAL(USE_REGEX, test x$lyx_regex = xyes)
-dnl ])
-
dnl NOT USED CURRENTLY*************************************
dnl LYX_CXX_PARTIAL
AC_DEFUN(LYX_CXX_PARTIAL, [
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
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 *',
])
### end of LYX_PATH_HEADER
-### Check for stl_string_fwd.h existence and location if it exists
-AC_DEFUN(LYX_STL_STRING_FWD,
-[ AC_CHECK_HEADER(stl_string_fwd.h,[
- AC_CACHE_CHECK([path to stl_string_fwd.h],lyx_cv_path_stl_string_fwd_h,
- [ cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-
-#include <stl_string_fwd.h>
-EOF
-lyx_cv_path_stl_string_fwd_h=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
- grep 'stl_string_fwd.h' 2>/dev/null | \
- sed -e 's/.*\(".*stl_string_fwd.h"\).*/\1/' -e "1q"`
-rm -f conftest*])
- AC_DEFINE_UNQUOTED(STL_STRING_FWD_H_LOCATION,$lyx_cv_path_stl_string_fwd_h,
-[define this to the location of stl_string_fwd.h to be used with #include,
- NOTE: Do not set it to <stl_string_fwd.h> as that will find the LyX
- supplied version of the header.
- e.g. <../include/stl_string_fwd.h> or better yet use an absolute path])])
-])
-
-
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
projects / lyx.git / blobdiff