Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index d5dce19dba314aad9c73e7d03ca5479243e563d0..4eb93d755b4b0a6095fc36f5cf10406265494660 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -15,7 +15,7 @@ case AC_PACKAGE_VERSION in
          AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
          LYX_DATE="not released yet"
          echo "WARNING: This is a development version. Expect bugs.";;
-  *pre*|*alpha*|*beta*) lyx_prerelease=yes
+  *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes
         echo "WARNING: This is a prerelease. Be careful and backup your documents.";;
 esac
 AC_SUBST(lyx_devel_version)])
@@ -35,7 +35,7 @@ AC_ARG_WITH(version-suffix,
      withval="-"AC_PACKAGE_VERSION
      ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
    fi
-   version_suffix=$withval
+   AC_SUBST(version_suffix,$withval)
    RPM_VERSION_SUFFIX="--with-version-suffix=$withval"])
 AC_SUBST(RPM_VERSION_SUFFIX)
 AC_MSG_RESULT([$withval])
@@ -167,9 +167,6 @@ AC_ARG_ENABLE(warnings,
     fi;])
 if test x$enable_warnings = xyes ; then
   lyx_flags="warnings $lyx_flags"
-  AC_DEFINE(WITH_WARNINGS, 1,
-  [Define this if you want to see the warning directives put here and
-   there by the developpers to get attention])
 fi
 
 ### We might want to disable debug
@@ -411,7 +408,7 @@ dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
 dnl        be used.
 AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
        AC_ARG_WITH(included-boost,
-           [  --with-included-boost  use the boost lib supplied with LyX],
+           [  --without-included-boost  do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found],
            [lyx_cv_with_included_boost=$withval
                AC_MSG_RESULT([$with_included_boost])],
            [lyx_cv_with_included_boost=yes])
@@ -471,7 +468,7 @@ dnl                       [default-yes-value])
 dnl  Adds a --with-'dir-name' option (described by 'desc') and puts the
 dnl  resulting directory name in 'dir-var-name'.
 AC_DEFUN([LYX_WITH_DIR],[
-  AC_ARG_WITH($1,[  --with-$1        specify $2])
+  AC_ARG_WITH($1,[AC_HELP_STRING([--with-$1],[specify $2])])
   AC_MSG_CHECKING([for $2])
   if test -z "$with_$3"; then
      AC_CACHE_VAL(lyx_cv_$3, lyx_cv_$3=$4)
@@ -581,6 +578,7 @@ AC_ARG_WITH(packaging,
                   *) lyx_use_packaging=posix;;
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
+lyx_install_macosx=false
 case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
           PACKAGE=LyX${version_suffix}
@@ -589,7 +587,8 @@ case $lyx_use_packaging in
           libdir='${prefix}/Contents/Resources'
           datadir='${prefix}/Contents/Resources'
           pkgdatadir='${datadir}'
-          mandir='${datadir}/man' ;;
+          mandir='${datadir}/man' 
+          lyx_install_macosx=true ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
           PACKAGE=LyX${version_suffix}
           default_prefix="C:/Program Files/${PACKAGE}"
@@ -605,6 +604,7 @@ case $lyx_use_packaging in
           default_prefix=$ac_default_prefix ;;
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
 esac
+AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
 AC_SUBST(pkgdatadir)
 AC_SUBST(program_suffix)
 ])
@@ -694,3 +694,23 @@ AC_DEFUN([MSYS_AC_CANONICAL_PATH],
  $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"'
    s?/*$[]??'`
 ])
+
+dnl this is used by the macro blow to general a proper config.h.in entry
+m4_define([LYX_AH_CHECK_DECL],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1),
+  [Define if you have the prototype for function `$1'])])
+
+dnl Check things are declared in headers to avoid errors or warnings.
+dnl Called like LYX_CHECK_DECL(function, header1 header2...)
+dnl Defines HAVE_DECL_{FUNCTION}
+AC_DEFUN([LYX_CHECK_DECL],
+[LYX_AH_CHECK_DECL($1)
+for ac_header in $2
+do
+  AC_MSG_CHECKING([if $1 is declared by header $ac_header])
+  AC_EGREP_HEADER($1, $ac_header,
+      [AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DECL_$1))
+       break],
+      [AC_MSG_RESULT(no)])
+done])