AC_DEFINE(DEVEL_VERSION, 1, Define if you are building a development version of LyX)
fi])
+
+dnl Define the option to set a LyX version on installed executables and directories
+dnl
+dnl
+AC_DEFUN(LYX_VERSION_SUFFIX,[
+AC_MSG_CHECKING([for install target ... ])
+AC_ARG_WITH(version-suffix,
+ [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
+ [if test "x$withval" = "xyes";
+ then
+ withval="-$VERSION"
+ ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
+ fi
+ lyxname="lyx$withval"
+ program_suffix=$withval],
+ [lyxname=lyx])
+AC_MSG_RESULT([$lyxname])
+])
+
dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the
dnl flag lyx_error to yes.
AC_DEFUN(LYX_ERROR,[
AC_DEFUN(LYX_PROG_CXX_WORKS,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_TRY_COMPILER([class foo { int bar; }; int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
+AC_TRY_COMPILER(
+[class foo {
+ // we require the mutable keyword
+ mutable int bar;
+ };
+ // we require namespace support
+ namespace baz {
+ int bar;
+ }
+ int main() {
+ return(0);
+ }
+], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
AC_LANG_RESTORE
if test $ac_cv_prog_cxx_works = no; then
CXX=
AC_PROG_CXX_GNU
-dnl We might want to get or shut warnings.
-AC_ARG_WITH(warnings,
- [ --with-warnings tell the compiler to display more warnings],,
+### We might want to get or shut warnings.
+AC_ARG_ENABLE(warnings,
+ [ --enable-warnings tell the compiler to display more warnings],,
[ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
- with_warnings=yes;
+ enable_warnings=yes;
else
- with_warnings=no;
+ enable_warnings=no;
fi;])
-if test x$with_warnings = xyes ; then
+if test x$enable_warnings = xyes ; then
lyx_flags="$lyx_flags warnings"
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
-# optimize less for development versions
-if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
- lyx_opt="-O"
-else
- lyx_opt="-O2"
-fi
+### set up optimization
+AC_ARG_ENABLE(optimization,
+ [ --enable-optimization[=value] enable compiler optimisation],,
+ enable_optimization=yes;)
+case $enable_optimization in
+ yes) lyx_opt=-O;;
+ no) lyx_opt=;;
+ *) lyx_opt=${enable_optimization};;
+esac
# set the debug flags correctly.
if test $ac_cv_prog_gxx = yes; then
elif test $ac_cv_prog_cxx_g = yes; then
case $gxx_version in
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 -fhonor-std";;
+ 2.95.2) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+ 2.95.*) CXXFLAGS="-g $lyx_opt -fno-exceptions";;
+ 2.96*) CXXFLAGS="-g $lyx_opt -fno-exceptions";;
+ 3.0*) CXXFLAGS="-g $lyx_opt";;
*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
+ if test x$enable_warnings = xyes ; then
case $gxx_version in
- 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
- 2.96*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";;
- *) CXXFLAGS="$CXXFLAGS -ansi -W -Wall -Wno-return-type";;
+ 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ 2.96*) 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 -pedantic";;
+ *) ;;
esac
fi
fi
else
GXX=
- test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+ test "${CXXFLAGS+set}" = set || CXXFLAGS=""
fi
])dnl
+dnl NOT USED CURRENTLY*************************************
dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler
dnl supports RTTI
AC_DEFUN(LYX_CXX_RTTI,[
fi])
+dnl NOT USED CURRENTLY*************************************
dnl Usage: LYX_CXX_STL_STACK : checks whether the C++ compiler
dnl has a working stl stack template
AC_DEFUN(LYX_CXX_STL_STACK,[
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_MSG_RESULT([$with_included_string])],
+ [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.erase();
a = "hey";
- char s[] = "y";
- int t = a.compare(a.length() - 1, 1, s);
+ //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
])
AM_CONDITIONAL(USE_REGEX, test x$lyx_regex = xyes)
])
-
-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])
-])
-
-
+dnl NOT USED CURRENTLY*************************************
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])
-])
-
-
-dnl Usage: LYX_CXX_NAMESPACES : checks whether the C++ compiler
-dnl has a correct namespace handling and define CXX_WORKING_NAMESPACES
-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;
- }
-],[
- foo::bar = 0;
- return 0;
-],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
+ 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
])
-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.8[1-7])
+ "(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) LYX_WARNING(dnl
+ 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. If you
-have problems[,] please use version 0.88 instead.) ;;
+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.88. You might have slight problems with it.);;
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],
+ [ --with-frontend=THIS Use THIS frontend as main GUI:
+ Possible values: xforms, qt2, 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_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])
+
+
+## ------------------------------------------------------------------------
+## Find a file (or one of more files in a list of dirs)
+## ------------------------------------------------------------------------
+##
+AC_DEFUN(AC_FIND_FILE,
+[
+$3=NO
+for i in $2;
+do
+ for j in $1;
+ do
+ if test -r "$i/$j"; then
+ $3=$i
+ break 2
+ fi
+ done
+done
+])
+
+dnl just a wrapper to clean up configure.in
+AC_DEFUN(LYX_PROG_LIBTOOL,
+[
+AC_REQUIRE([AC_ENABLE_SHARED])
+AC_REQUIRE([AC_ENABLE_STATIC])
+dnl libtool is only for C, so I must force him
+dnl to find the correct flags for C++
+ac_save_cc=$CC
+ac_save_cflags="$CFLAGS"
+CC=$CXX
+CFLAGS="$CXXFLAGS"
+AM_PROG_LIBTOOL dnl for libraries
+CC=$ac_save_cc
+CFLAGS="$ac_save_cflags"
+])
projects / lyx.git / blobdiff