CXXFLAGS="$ac_save_CXXFLAGS"
else
case $gxx_version in
- 2.95.1) CXXFLAGS="$lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
- 2.95.2) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
- 2.95.*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- 3.0*) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
- *2.91.*) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
- *) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";;
+ 2.95.1) CXXFLAGS="$lyx_opt -fpermissive";;
+ 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 -fno-exceptions";;
+ *) CXXFLAGS="$lyx_opt";;
esac
if test x$enable_debug = xyes ; then
CXXFLAGS="-g $CXXFLAGS"
case $gxx_version in
2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
2.96*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ 3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";;
*) CXXFLAGS="$CXXFLAGS -W -Wall";;
esac
if test $lyx_devel_version = yes ; then
case $gxx_version in
2.95.*) ;;
2.96*) ;;
- 2.97*) ;;
- *2.91*) ;;
- *) ;;
+ *) CXXFLAGS="$CXXFLAGS -Winline";;
esac
fi
fi
])
-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.
-AC_DEFUN(LYX_REGEX,[
- AC_CHECK_HEADERS(regex.h, lyx_regex=no, lyx_regex=yes)
- AM_CONDITIONAL(USE_REGEX, test x$lyx_regex = xyes)
-])
-
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_PATH_XFORMS: Checks for xforms library and flags
-dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flag.
-AC_DEFUN(LYX_PATH_XFORMS,[
-### Check for xforms library
-AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
- [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
- [LYX_LIB_ERROR(libforms or libxforms,xforms)])])
-AC_SUBST(XFORMS_LIB)
-### Check for xforms headers
-lyx_cv_forms_h_location="<forms.h>"
-AC_CHECK_HEADER(X11/forms.h,[
- ac_cv_header_forms_h=yes
- lyx_cv_forms_h_location="<X11/forms.h>"],[
-AC_CHECK_HEADER(forms.h,[],[
-LYX_LIB_ERROR(forms.h,forms)])])
-AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location)
-if test $ac_cv_header_forms_h = yes; then
- AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
- [ cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-
-#include FORMS_H_LOCATION
-#if ! defined(FL_INCLUDE_VERSION)
-"%%%"(unknown)"%%%"
-#else
-"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
-#endif
-EOF
-lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
- grep '^"%%%"' 2>/dev/null | \
- sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
-rm -f conftest*])
-XFORMS_VERSION=$lyx_cv_xfversion
-case "$lyx_cv_xfversion" in
- "(unknown)"|0.8[1-7]*)
- LYX_ERROR(dnl
-Version $lyx_cv_xfversion of xforms is not compatible with LyX.
- This version of LyX works best with versions 0.88 (recommended) and later.) ;;
- 0.88*) ;;
- 0.89[01234]) LYX_WARNING(dnl
-LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
-it is an unproven version and might still have some bugs. You should
-probably use version 0.89.6 (or 0.88) instead) ;;
- 0.89*) ;;
- *) LYX_WARNING(dnl
-Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
- since it is newer than 0.89. You might have slight problems with it.);;
-esac
-fi])
-
-
-dnl Check whether the xforms library has a viable image loader
-AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
-[
-save_LIBS=$LIBS
-LIBS="$XFORMS_LIB $LIBS"
-lyx_use_xforms_image_loader=no
-AC_CHECK_FUNCS(flimage_dup,[
- AC_CHECK_FUNCS(flimage_to_pixmap,[
- lyx_use_xforms_image_loader=yes
- AC_CHECK_FUNCS(flimage_enable_ps)])])
-LIBS=$save_LIBS
-test $lyx_use_xforms_image_loader = yes && lyx_flags="$lyx_flags xforms-image-loader"
-### If the gui cannot load images itself, then we default to the
-### very simple one in graphics/GraphicsImageXPM.[Ch]
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
- test $lyx_use_xforms_image_loader = no)
-])
-
-
-dnl Check if the image loader needs libjpeg
-AC_DEFUN(LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG,
-[
- if test "$lyx_use_xforms_image_loader" = "yes" ; then
- AC_MSG_CHECKING([whether libjpeg is needed])
- AC_LANG_SAVE
- AC_LANG_C
- save_LIBS=$LIBS
- LIBS="$XFORMS_LIB $LIBS"
- AC_TRY_LINK([#include <forms.h>],
- [jpeg_abort(0);],
- [lyx_need_jpeg=no],[lyx_need_jpeg=yes])
- LIBS=$save_LIBS
- AC_LANG_RESTORE
- AC_MSG_RESULT($lyx_need_jpeg)
- if test "$lyx_need_jpeg" = "yes" ; then
- LIBS="-ljpeg $LIBS"
- fi
- 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 *',
dnl var-name.
AC_DEFUN(LYX_ADD_INC_DIR,[$1="${$1} -I$2 "])
-### Check which libsigc++ we're using and make sure any external one works
-### Check for libsigc++ library
-AC_DEFUN(LYX_WITH_SIGC,
-[AC_MSG_CHECKING(whether the included libsigc++ should be used)
-AC_ARG_WITH([included-libsigc],
- [ --without-included-libsigc
- Use the libsigc++ installed on the system],
- [lyx_use_included_libsigc=$withval],
- [lyx_use_included_libsigc=yes])
-AC_MSG_RESULT([$lyx_use_included_libsigc])
-if test x$lyx_use_included_libsigc = xno; then
- ### Check for libsigc++
- ## can't use AC_SUBST right here!
- AM_PATH_SIGC(0.8.7,
- [ INCLUDED_SIGC=
- ],
- [LYX_ERROR(dnl
- [Cannot find libsigc++ library or headers at least as recent as 0.8.7.
- Check your installation. Have you installed the development package?])
- ])
-else
- ### Use the included libsigc++
- ### sigc-config hasn't been created yet so we can't just do the same as above
- ### unless of course someone gets keen and merges the sigc++ configure.in
- ### with this one. We don't really gain much by doing that though except
- ### a considerably smaller dist and more difficult maintenance.
- ### It'd also mean we'd have the equivalent of config/gettext.m4
- lyx_flags="$lyx_flags included-libsigc"
- SIGC_LIBS="\`\${top_builddir}/sigc++/sigc-config --libs-names | sed -e 's/-lsigc//'\`"
- # Libsigc++ always installs into a subdirectory called sigc++. Therefore we
- # have to always use #include <sigc++/signal_system.h> in our code.
- # Remember if you decide to do anything to the sigc++ code to do your mods on
- # the makeLyXsigc.sh script in development/tools using a current cvs checkout
- # of libsigc++. A tarball distribution doesn't have everything in it that we
- # need.
- # We need both these -I entries to build when builddir != srcdir
- if test "x$src_dir" = "x." ; then
- SIGC_CFLAGS="-I\${top_srcdir}"
- else
- SIGC_CFLAGS="-I\${top_builddir} -I\${top_srcdir}"
- fi
- INCLUDED_SIGC="\${top_builddir}/sigc++/libsigc.la"
- ## can't substitute these here like this otherwise all remaining tests fail
- ## instead we SUBST directly into the Makefiles
- ##LIBS="$LIBS \$SIGC_LIBS"
- ##CPPFLAGS="$CPPFLAGS \$SIGC_CFLAGS"
- AC_SUBST(SIGC_LIBS)
- AC_SUBST(SIGC_CFLAGS)
-fi
-AC_SUBST(INCLUDED_SIGC)
-])
-
### Check for a headers existence and location iff it exists
## This is supposed to be a generalised version of LYX_STL_STRING_FWD
## It almost works. I've tried a few variations but they give errors
])
### 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