dnl Some useful functions for LyXs configure.in -*- sh -*-
dnl Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
dnl Lars Gullik Bjønnes (larsbj@lyx.org)
+dnl Allan Rae (rae@lyx.org)
dnl Usage LYX_GET_VERSION Sets "lyx_version" to the version of LyX being
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
dnl Check the version of g++
- gxx_version=`g++ --version`
+ gxx_version=`${CXX} --version`
AC_PROG_CXX_G
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
elif test $ac_cv_prog_cxx_g = yes; then
case $gxx_version in
- 2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti";;
- 2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
- 2.96*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
- *2.91.*) CXXFLAGS="-g $lyx_opt -Wno-return-type -fno-exceptions -fno-rtti";;
- *) CXXFLAGS="-g $lyx_opt -fno-exceptions -fno-rtti";;
+ 2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
+ 2.95.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+ 2.96*) CXXFLAGS="-g $lyx_opt -fno-exceptions";;
+ 2.97*) CXXFLAGS="-g $lyx_opt -fvtable-thunks -fno-builtin -ffunction-sections -fdata-sections"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1";;
+ *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+ *) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
esac
else
CXXFLAGS="$lyx_opt"
fi
if test x$with_warnings = xyes ; then
case $gxx_version in
- 2.95.*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";;
- 2.96*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";;
- *) CXXFLAGS="$CXXFLAGS -ansi -Wall -W";;
+ 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ 2.96*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ 2.97*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ *) CXXFLAGS="$CXXFLAGS -W -Wall";;
esac
if test $lyx_devel_version = yes ; then
case $gxx_version in
2.95.*) ;;
2.96*) ;;
- *) CXXFLAGS="$CXXFLAGS -pedantic";;
+ 2.97*) CXXFLAGS="$CXXFLAGS -Wconversion -Winline";;
+ *2.91*) ;;
+ *) ;;
esac
fi
fi
AC_DEFUN(LYX_STD_COUNT,[
AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count,
[AC_TRY_COMPILE([
-#include <string>
#include <algorithm>
-using std::string;
using std::count;
-int countChar(string const & a, char const c)
+int countChar(char * b, char * e, char const c)
{
- return count(a.begin(), a.end(), c);
+ return count(b, e, c);
}
],[
- string a("hello");
- int i = countChar(a, 'l');
+ char a[] = "hello";
+ int i = countChar(a, a + 5, 'l');
],lyx_cv_std_count=yes,lyx_cv_std_count=no)
])
if test $lyx_cv_std_count = yes ; then
dnl Usage: LYX_CXX_STL_STRING : checks whether the C++ compiler
-dnl has a working stl string container, the check is really stupid
-dnl and could need some improvement.
+dnl has a std::string that is usable for LyX. LyX does not require this
+dnl std::string to be standard.
AC_DEFUN(LYX_CXX_STL_STRING,[
AC_REQUIRE([LYX_PROG_CXX])
AC_MSG_CHECKING(whether the included std::string should be used)
AC_ARG_WITH(included-string,
[ --with-included-string use LyX string class instead of STL string],
- [with_included_string=$withval],
- [AC_TRY_COMPILE([
+ [lyx_cv_with_included_string=$withval],
+ [AC_CACHE_CHECK([],lyx_cv_with_included_string,
+ [AC_TRY_COMPILE([
#include <string>
using std::string;
],[
+ // LyX has reduced its requirements on the basic_string
+ // implementation so that the basic_string supplied
+ // with gcc is usable. In particular this means that
+ // lyx does not use std::string::clear and not the
+ // strncmp version of std::string::compare. This is mainly
+ // done so that LyX can use precompiled C++ libraries that
+ // already uses the systems basic_string, e.g. gtk--
string a("hello there");
- a.clear();
+ a.erase();
a = "hey";
+ //char s[] = "y";
+ //int t = a.compare(a.length() - 1, 1, s);
a.erase();
],[
- with_included_string=no
+ lyx_cv_with_included_string=no
],[
- with_included_string=yes
-
+ lyx_cv_with_included_string=yes
+ ])
])
])
- if test x$with_included_string = xyes ; then
+ if test x$lyx_cv_with_included_string = xyes ; then
AC_DEFINE(USE_INCLUDED_STRING, 1,
[Define to use the lyxstring class bundled with LyX.])
lyx_flags="$lyx_flags included-string"
fi
- AM_CONDITIONAL(USE_LYXSTRING, test x$with_included_string = xyes)
- AC_MSG_RESULT([$with_included_string])
+ AM_CONDITIONAL(USE_LYXSTRING, test x$lyx_cv_with_included_string = xyes)
+dnl AC_MSG_RESULT([$with_included_string])
+])
+
+
+dnl Usage: LYX_CXX_GOOD_STD_STRING : checks whether the C++ compiler
+dnl has a std::string that is close to the standard. So close that
+dnl methods not found in "unstandard" std::strings are present here.
+AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[
+ AC_REQUIRE([LYX_PROG_CXX])
+ AC_CACHE_CHECK([whether the systems std::string is really good],
+ [lyx_cv_std_string_good],
+ [AC_TRY_COMPILE([
+ #include <string>
+ using std::string;
+ ],[
+ // From a std::string that is supposed to be close to the
+ // standard we require at least three things:
+ // - clear() and erase()
+ // - the strncmp of compare()
+ // - push_back()
+ string a("hello there");
+ a.erase();
+ a = "hey";
+ char s[] = "y";
+ int t = a.compare(a.length() - 1, 1, s);
+ a.push_back('g');
+ a.clear();
+ ],[
+ lyx_cv_std_string_good=yes
+ ],[
+ lyx_cv_std_string_good=no
+
+ ])
+ ])
+ if test x$lyx_cv_std_string_good = xyes ; then
+ AC_DEFINE(STD_STRING_IS_GOOD, 1,
+ [Define if the systems std::string is really good.])
+ fi
])
dnl LYX_CXX_MUTABLE
AC_DEFUN(LYX_CXX_MUTABLE, [
-AC_REQUIRE([LYX_PROG_CXX])
-AC_MSG_CHECKING(if C++ compiler supports mutable)
-AC_TRY_COMPILE(
-[
-class k {
- mutable char *c;
-public:
- void foo() const { c=0; }
-};
-],[
-],[
- ac_mutable=yes
- AC_DEFINE(HAVE_MUTABLE, 1,
- [Defined if you compiler supports 'mutable'.])
-],[
- ac_mutable=no
-])
-AC_MSG_RESULT([$ac_mutable])
+ AC_REQUIRE([LYX_PROG_CXX])
+ AC_CACHE_CHECK([if C++ compiler supports mutable],
+ lyx_cv_cxx_mutable,[
+ AC_TRY_COMPILE(
+ [
+ class k {
+ mutable char *c;
+ public:
+ void foo() const { c=0; }
+ };
+ ],[
+ ],[
+ lyx_cv_cxx_mutable=yes
+ ],[
+ lyx_cv_cxx_mutable=no
+ ])
+ ])
+ if test $lyx_cv_cxx_mutable = yes ; then
+ AC_DEFINE(HAVE_MUTABLE, 1,
+ [Defined if your compiler suports 'mutable'.])
+ fi
])
dnl LYX_CXX_PARTIAL
AC_DEFUN(LYX_CXX_PARTIAL, [
-AC_REQUIRE([LYX_PROG_CXX])
-AC_MSG_CHECKING(if C++ compiler supports partial specialization)
-AC_TRY_COMPILE(
-[
-template<class T, class K>
-class k {
-public:
-};
-template<class T> class k<void,T> { };
-],[
- k<float, float> b;
- k<void,void> a;
-],[
- ac_partial_specialization=yes
- AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1,
- [Defined if your compiler supports partial specialization.])
-],[
- ac_partial_specialization=no
-])
-AC_MSG_RESULT([$ac_partial_specialization])
+ AC_REQUIRE([LYX_PROG_CXX])
+ AC_CACHE_CHECK([if C++ compiler supports partial specialization],
+ [lyx_cv_cxx_partial_specialization],
+ [AC_TRY_COMPILE(
+ [
+ template<class T, class K>
+ class k {
+ public:
+ };
+ template<class T> class k<void,T> { };
+ ],[
+ k<float, float> b;
+ k<void,void> a;
+ ],[
+ lyx_cv_cxx_partial_specialization=yes
+ ],[
+ lyx_cv_cxx_partial_specialization=no
+ ])
+ ])
+ if test x$lyx_cv_cxx_partial_specialization = xyes ; then
+ AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1,
+ [Defined if your compiler supports partial specialization.])
+ fi
])
dnl if true. This macro does not do a thourough test, but it should be
dnl good enough to suit our needs.
AC_DEFUN(LYX_CXX_NAMESPACES,[
-AC_CACHE_CHECK(for correct namespaces support,lyx_cv_cxx_namespace,
- [AC_TRY_COMPILE([
- namespace foo {
- int bar;
- }
-],[
+ AC_CACHE_CHECK(for correct namespaces support,lyx_cv_cxx_namespace,
+ [AC_TRY_COMPILE([
+ namespace foo {
+ int bar;
+ }
+ ],[
foo::bar = 0;
return 0;
-],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
+ ],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
+ ])
+ if test x$lyx_cv_cxx_namespace = xyes ; then
+ AC_DEFINE(CXX_WORKING_NAMESPACES, 1,
+ [Define if your C++ compiler has correct support for namespaces])
+ fi
])
-if test $lyx_cv_cxx_namespace = yes ; then
- AC_DEFINE(CXX_WORKING_NAMESPACES, 1,
- [Define if your C++ compiler has correct support for namespaces])
-fi])
dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler
LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders)
fi])
+dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions
+dnl are already in the global namespace
+AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
+ AC_CACHE_CHECK(whether C library functions are already in the global namespace,
+ lyx_cv_cxx_global_cstd,
+ [AC_TRY_COMPILE([
+ #include <cctype>
+ using std::tolower;
+ ],[
+ return 0;
+ ],[lyx_cv_cxx_global_cstd=no],[lyx_cv_cxx_global_cstd=yes])])
+ if test x$lyx_cv_cxx_global_cstd = xyes; then
+ AC_DEFINE(CXX_GLOBAL_CSTD,1,
+ [Define if your C++ compiler puts C library functions in the global namespace])
+ fi
+])
dnl Usage LYX_PATH_XPM: Checks for xpm library and header
AC_DEFUN(LYX_PATH_XPM,[
#if ! defined(FL_INCLUDE_VERSION)
"%%%"(unknown)"%%%"
#else
-"%%%"FL_VERSION.FL_REVISION"%%%"
+"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
#endif
EOF
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
rm -f conftest*])
case "$lyx_cv_xfversion" in
- "(unknown)"|0.82|0.83|0.84|0.85)
- LYX_ERROR(dnl
+ "(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 version 0.88[,] although it
- supports also versions 0.81[,] 0.86 and 0.87.) ;;
- 0.81|0.86|0.87)
- LYX_WARNING(dnl
-While LyX is compatible with version $lyx_cv_xfversion of xforms[,]
- it is recommended that you upgrade to version 0.88.) ;;
- 0.88) ;;
- 0.89) LYX_WARNING(dnl
+ This version of LyX works best with versions 0.88 (recommended) and later.) ;;
+ 0.88*) ;;
+ 0.89*) 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. If you
have problems[,] please use version 0.88 instead.) ;;
- *) LYX_WARNING(dnl
+ *) LYX_WARNING(dnl
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
- since it is newer than 0.88. You might have slight problems with it.);;
+ since it is newer than 0.88. You might have slight problems with it.);;
esac
fi])
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
## actual header _is_ found though and the cache variable is set however
## the reported setting (on screen) is equal to $ac_safe for some unknown
## reason.
+## Additionally, autoheader can't figure out what to use as the name in
+## the config.h.in file so we need to write our own entries there -- one for
+## each header in the form PATH_HEADER_NAME_H
+##
AC_DEFUN(LYX_PATH_HEADER,
[ AC_CHECK_HEADER($1,[
ac_tr_safe=PATH_`echo $ac_safe | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- AC_CACHE_CHECK([path to $1],lyx_cv_path_$ac_safe,
+### the only remaining problem is getting the second parameter to this
+### AC_CACHE_CACHE to print correctly. Currently it just results in value
+### of $ac_safe being printed.
+ AC_CACHE_CHECK([path to $1],[lyx_cv_path2_$ac_safe],
[ cat > conftest.$ac_ext <<EOF
#line __oline__ "configure"
#include "confdefs.h"
#include <$1>
EOF
-lyx_cv_path_$ac_safe=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
+lyx_path_header_path=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
grep $1 2>/dev/null | \
sed -e 's/.*\(".*$1"\).*/\1/' -e "1q"`
+eval "lyx_cv_path2_${ac_safe}=\$lyx_path_header_path"
rm -f conftest*])
- AC_DEFINE_UNQUOTED(${ac_tr_safe},${lyx_cv_path_$ac_safe})])
+ AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path)])
])
### end of LYX_PATH_HEADER
AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5,($ac_cv_func_select_arg5))
])
+### Check which frontend we want to use. The default is XForms
+###
+AC_DEFUN(LYX_USE_FRONTEND,
+[AC_MSG_CHECKING(what frontend should be used as main GUI)
+AC_ARG_WITH(frontend,
+ [ --with-frontend[=value] Use THIS frontend as main GUI:
+ Possible values: xforms,kde,gnome],
+ [lyx_use_frontend="$withval"], [lyx_use_frontend="xforms"])
+AC_MSG_RESULT($lyx_use_frontend)
+lyx_flags="$lyx_flags frontend-$lyx_use_frontend"
+AC_SUBST(FRONTEND)
+AC_SUBST(FRONTEND_GUILIB)
+AC_SUBST(FRONTEND_LDFLAGS)
+AC_SUBST(FRONTEND_INCLUDES)
+AC_SUBST(FRONTEND_LIBS)
+])
+
+
+dnl Check things are declared in headers to avoid errors or warnings.
+dnl Called like LYX_CHECK_DECL(function, headerfile)
+dnl Defines HAVE_DECL_{FUNCTION}
+AC_DEFUN(LYX_CHECK_DECL,
+[AC_MSG_CHECKING(if $1 is declared by header $2)
+tr_func=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+
+tr_hdr=`echo $2 | tr . _`
+AC_CACHE_VAL([lyx_cv_declare_${tr_hdr}_$1],
+[AC_EGREP_HEADER($1, $2, [eval "lyx_cv_declare_${tr_hdr}_$1=yes"], [eval "lyx_cv_declare_${tr_hdr}_$1=no"])])
+if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
+ AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func})
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi])
+
+dnl This is the multiple headers version of the LYX_CHECK_DECL macro above.
+dnl Called like LYX_CHECK_DECL_HDRS(function, file1 file2 file3)
+AC_DEFUN(LYX_CHECK_DECL_HDRS,
+[ got="no"
+for I in $2; do
+tr_hdr=`echo $I | tr . _`
+if test "${got}" = "no"; then
+ LYX_CHECK_DECL($1, $I)
+fi
+if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
+ got="yes"
+fi
+done])
projects / lyx.git / blobdiff