X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=d99f2aaebbc59a2c01de5946c0ad8b2981dec7c0;hb=9ed3420ea10e9e4e82b137d66dc4755be17619a9;hp=7d40f0ddd948341b4e0911fd8772ed1ef7c5f393;hpb=0e284bbf5533f6092dc75a674e2282eea97dc11c;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 7d40f0ddd9..d99f2aaebb 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -212,6 +212,7 @@ if test x$GXX = xyes; then 2.96*) CXXFLAGS="$lyx_opt";; 3.0*) CXXFLAGS="$lyx_opt";; 3.1*) CXXFLAGS="$lyx_opt";; + 3.2*) CXXFLAGS="$lyx_opt";; *) CXXFLAGS="$lyx_opt";; esac if test x$enable_debug = xyes ; then @@ -228,7 +229,7 @@ if test x$GXX = xyes; then case $gxx_version in 2.95.*) ;; 2.96*) ;; - *) ;; + *) CXXFLAGS="$CXXFLAGS -Winline";; esac fi fi @@ -437,10 +438,10 @@ AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[ 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 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 @@ -557,99 +558,6 @@ changequote([,]) 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="" -AC_CHECK_HEADER(X11/forms.h,[ - ac_cv_header_forms_h=yes - lyx_cv_forms_h_location=""],[ -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 <&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 ], - [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. @@ -763,58 +671,6 @@ dnl Usage: LYX_ADD_INC_DIR(var-name,dir) Adds a -I directive to variable 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 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$srcdir" = "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