X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=d99f2aaebbc59a2c01de5946c0ad8b2981dec7c0;hb=9ed3420ea10e9e4e82b137d66dc4755be17619a9;hp=b6114f13d2ea67b20614a80244dbf481efd48517;hpb=85f8bf7445db373d95bad64faede475e0f6f9049;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b6114f13d2..d99f2aaebb 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -4,13 +4,10 @@ dnl Lars Gullik Bj dnl Allan Rae (rae@lyx.org) -dnl Usage LYX_GET_VERSION Sets "lyx_version" to the version of LyX being -dnl built, displays it and sets variable "lyx_devel" to yes or no depending -dnl whether the version is a development release or not. -AC_DEFUN(LYX_GET_VERSION,[ +dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and +dnl sets variables "lyx_devel_version" and "lyx_prerelease" +AC_DEFUN(LYX_CHECK_VERSION,[ changequote(, ) dnl -VERSION=`grep '#define *LYX_VERSION' $1 | - sed -e 's/^.*"\(.*\)"$/\1/' 2>/dev/null` echo "configuring LyX version $VERSION" if echo "$VERSION" | grep 'cvs' >/dev/null ; then lyx_devel_version=yes @@ -25,12 +22,30 @@ else lyx_prerelease=no fi changequote([, ]) dnl -PACKAGE=lyx${program_suffix} AC_SUBST(lyx_devel_version) -if test $lyx_devel_version = yes ; then +if test $lyx_devel_version = yes ; then 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[=] install lyx files as lyx], + [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,[ @@ -49,7 +64,7 @@ lyx_warning_txt="$lyx_warning_txt lyx_warning=yes]) -dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication +dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication dnl that 'file' cannot be found because 'lib' may be uncorrectly installed. AC_DEFUN(LYX_LIB_ERROR,[ LYX_ERROR([Cannot find $1. Please check that the $2 library @@ -57,11 +72,11 @@ LYX_ERROR([Cannot find $1. Please check that the $2 library dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR -dnl has occured previously. +dnl has occured previously. AC_DEFUN(LYX_CHECK_ERRORS,[ if test x$lyx_error = xyes; then cat <conftest.C <&5 || CXX= +rm -f conftest.C conftest.o conftest.obj || true ]) AC_DEFUN(LYX_PROG_CXX, -[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl -AC_MSG_CHECKING([for a working C++ compiler]) -LYX_SEARCH_PROG(CXX, $CCC g++ gcc c++ CC cxx xlC cc++, LYX_PROG_CXX_WORKS) +[AC_MSG_CHECKING([for a good enough C++ compiler]) +LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS]) if test -z "$CXX" ; then - AC_ERROR([Unable to find a working C++ compiler]) + AC_ERROR([Unable to find a good enough C++ compiler]) fi - -AC_SUBST(CXX) AC_MSG_RESULT($CXX) -AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler]) -AC_MSG_RESULT($cross_compiling) - -AC_PROG_CXX_GNU +AC_PROG_CXX -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 +### We might want to disable debug +AC_ARG_ENABLE(debug, + [ --enable-debug enable debug information],, + [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then + enable_debug=yes; + else + enable_debug=no; + 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 - GXX=yes -dnl Check whether -g works, even if CXXFLAGS is set, in case the package -dnl plays around with CXXFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= -dnl Check the version of g++ - gxx_version=`${CXX} --version` - - AC_PROG_CXX_G +if test x$GXX = xyes; then + dnl Useful for global version info + gxx_version=`${CXX} -dumpversion` + CXX_VERSION="($gxx_version)" + if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_cxx_g = yes; then + else 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 -fno-rtti -fno-exceptions";; - 2.97*) CXXFLAGS="-g $lyx_opt -fhonor-std -fno-builtin -ffunction-sectons -fdata-sections";; - *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; - *) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";; + 2.95.1) CXXFLAGS="$lyx_opt -fpermissive";; + 2.95.2) CXXFLAGS="$lyx_opt";; + 2.95.*) CXXFLAGS="$lyx_opt";; + 2.96*) CXXFLAGS="$lyx_opt";; + 3.0*) CXXFLAGS="$lyx_opt";; + 3.1*) CXXFLAGS="$lyx_opt";; + 3.2*) CXXFLAGS="$lyx_opt";; + *) CXXFLAGS="$lyx_opt";; esac - else - CXXFLAGS="$lyx_opt" + if test x$enable_debug = xyes ; then + CXXFLAGS="-g $CXXFLAGS" + fi 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";; - 2.97*) CXXFLAGS="$CXXFLAGS -W -Wall -Wconversion -Winline";; - *) CXXFLAGS="$CXXFLAGS -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 + case $gxx_version in + 2.95.*) ;; + 2.96*) ;; + *) CXXFLAGS="$CXXFLAGS -Winline";; + esac fi fi -else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" -fi -])dnl +fi])dnl +dnl NOT USED CURRENTLY************************************* dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler dnl supports RTTI AC_DEFUN(LYX_CXX_RTTI,[ @@ -252,7 +271,7 @@ int main() { ],lyx_cv_rtti=yes,lyx_cv_rtti=no,lyx_cv_rtti=no) ]) if test x$lyx_cv_rtti = xyes ; then - AC_DEFINE(HAVE_RTTI, 1, + AC_DEFINE(HAVE_RTTI, 1, [Define to 1 if your compiler supports runtime type information]) fi]) @@ -269,12 +288,13 @@ public: };],,lyx_cv_explicit=yes,lyx_cv_explicit=no) ]) if test $lyx_cv_explicit = no ; then - AC_DEFINE(explicit,[ ], + AC_DEFINE(explicit,[ ], [Define to nothing if your compiler does not understand the 'explicit' directive]) 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,[ @@ -288,7 +308,7 @@ using std::stack; ],lyx_cv_broken_stack=no,lyx_cv_broken_stack=yes) ]) if test $lyx_cv_broken_stack = yes ; then - AC_DEFINE(BROKEN_STL_STACK, 1, + AC_DEFINE(BROKEN_STL_STACK, 1, [Define if you have the STL from libg++ 2.7.x, where stack<> is not defined correctly]) fi]) @@ -299,17 +319,15 @@ dnl count template, if not the old HP version is assumed. AC_DEFUN(LYX_STD_COUNT,[ AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count, [AC_TRY_COMPILE([ -#include #include -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 @@ -330,7 +348,7 @@ AC_CACHE_CHECK(for modern STL streams,lyx_cv_modern_streams, ],lyx_cv_modern_streams=yes,lyx_cv_modern_streams=no) ]) if test $lyx_cv_modern_streams = yes ; then - AC_DEFINE(MODERN_STL_STREAMS, 1, + AC_DEFINE(MODERN_STL_STREAMS, 1, [Define if you have modern standard-compliant STL streams]) fi]) @@ -339,11 +357,12 @@ dnl Usage: LYX_CXX_STL_STRING : checks whether the C++ compiler 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_REQUIRE([AC_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], - [lyx_cv_with_included_string=$withval], + [lyx_cv_with_included_string=$withval + AC_MSG_RESULT([$with_included_string])], [AC_CACHE_CHECK([],lyx_cv_with_included_string, [AC_TRY_COMPILE([ #include @@ -383,7 +402,7 @@ 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_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([whether the systems std::string is really good], [lyx_cv_std_string_good], [AC_TRY_COMPILE([ @@ -406,12 +425,12 @@ AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[ 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 is the systems std::string is really good.]) + [Define if the systems std::string is really good.]) fi ]) @@ -419,47 +438,21 @@ 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 LYX_CXX_MUTABLE -AC_DEFUN(LYX_CXX_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 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 AC_DEFUN(LYX_CXX_PARTIAL, [ - AC_REQUIRE([LYX_PROG_CXX]) + AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([if C++ compiler supports partial specialization], [lyx_cv_cxx_partial_specialization], [AC_TRY_COMPILE( [ template - class k { + class k { public: }; template class k { }; @@ -473,34 +466,12 @@ AC_DEFUN(LYX_CXX_PARTIAL, [ ]) ]) if test x$lyx_cv_cxx_partial_specialization = xyes ; then - AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1, + AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION, 1, [Defined if your compiler supports partial specialization.]) fi ]) -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) - ]) - 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 -]) - - dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler dnl provides wrappers for C headers and use our alternate version otherwise. AC_DEFUN(LYX_CXX_CHEADERS,[ @@ -516,16 +487,32 @@ AC_CACHE_CHECK(for C headers wrappers,lyx_cv_cxx_cheaders, #include #include ],[lyx_cv_cxx_cheaders=yes],[lyx_cv_cxx_cheaders=no])]) if test $lyx_cv_cxx_cheaders = no ; then - LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders) + 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 + 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,[ ### Check for Xpm library -AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LYX_LIBS="-lXpm $LYX_LIBS", - [LYX_LIB_ERROR(libXpm,Xpm)], $LYX_LIBS) - +AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,XPM_LIB="-lXpm", + [LYX_LIB_ERROR(libXpm,Xpm)], $XPM_LIB) +AC_SUBST(XPM_LIB) ### Check for Xpm headers lyx_cv_xpm_h_location="" AC_CHECK_HEADER(X11/xpm.h,[ @@ -551,18 +538,19 @@ EOF case "$lyx_cv_xpmr" in changequote(,) [0-9]) lyxxpmr_alpha=`echo $lyx_cv_xpmr |tr 123456789 abcdefghi` - lyxxpmv_alpha=" (aka 3.$lyx_cv_xpmv$lyxxpmr_alpha)";; + lyxxpmv_alpha=" (aka 3.$lyx_cv_xpmv$lyxxpmr_alpha)";; changequote([,]) - *) ;; + *) ;; esac lyx_cv_xpmversion="$lyx_cv_xpmv.$lyx_cv_xpmr$lyxxpmv_alpha" rm -f conftest*]) - case "$lyx_cv_xpmr" in + XPM_VERSION=${lyx_cv_xpmversion} + case "$lyx_cv_xpmr" in changequote(,) - [789]|[0-9][0-9]*) ;; + [789]|[0-9][0-9]*) ;; changequote([,]) - *) LYX_WARNING([Version $lyx_cv_xpmversion of the Xpm library is a bit old. - If you experience strange crashes with LyX, try to upgrade + *) LYX_WARNING([Version $lyx_cv_xpmversion of the Xpm library is a bit old. + If you experience strange crashes with LyX, try to upgrade to at least version 4.7 (aka 3.4g). If you have installed a newer version of the library, check whether you have an old xpm.h header file in your include path.]);; @@ -570,55 +558,6 @@ changequote([,]) fi]) -dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags -AC_DEFUN(LYX_PATH_XFORMS,[ -### Check for xforms library -AC_CHECK_LIB(forms, fl_initialize, LYX_LIBS="-lforms $LYX_LIBS", - [AC_CHECK_LIB(xforms, fl_initialize, LYX_LIBS="-lxforms $LYX_LIBS", - [LYX_LIB_ERROR(libforms or libxforms,xforms)], $LYX_LIBS)], $LYX_LIBS) - -### 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*]) -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) 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 -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.);; -esac -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. @@ -668,7 +607,7 @@ 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 argument. This is needed because Solaris 7 (wrongly?) uses 'char *', dnl while everybody else uses the former... AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE, [AC_MSG_CHECKING([type of argument for putenv()]) @@ -683,9 +622,9 @@ AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE, [Define to the type of the argument of putenv(). Needed on Solaris 7.])]) -dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value, -dnl [default-yes-value]) -dnl Adds a --with-'dir-name' option (described by 'desc') and puts the +dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value, +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]) @@ -700,10 +639,10 @@ AC_DEFUN(LYX_WITH_DIR,[ dnl Usage: LYX_LOOP_DIR(value,action) -dnl Executes action for values of variable `dir' in `values'. `values' can +dnl Executes action for values of variable `dir' in `values'. `values' can dnl use ":" as a separator. AC_DEFUN(LYX_LOOP_DIR,[ -IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for dir in `eval "echo $1"`; do if test ! "$dir" = NONE; then test ! -d "$dir" && AC_ERROR([\"$dir\" is not a directory]) @@ -714,76 +653,24 @@ IFS=$ac_save_ifs ]) -dnl Usage: LYX_ADD_LIB_DIR(var-name,dir) Adds a -L directive to variable -dnl var-name. +dnl Usage: LYX_ADD_LIB_DIR(var-name,dir) Adds a -L directive to variable +dnl var-name. AC_DEFUN(LYX_ADD_LIB_DIR,[ $1="${$1} -L$2" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then - if test $ac_cv_prog_gxx = yes ; then - $1="${$1} -Wl[,]-R$2" + if test $ac_cv_prog_gxx = yes ; then + $1="${$1} -Wl[,]-R$2" else $1="${$1} -R$2" fi fi]) -dnl Usage: LYX_ADD_INC_DIR(var-name,dir) Adds a -I directive to variable -dnl var-name. +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$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 @@ -834,7 +721,7 @@ 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 as that will find the LyX - supplied version of the header. + supplied version of the header. e.g. <../include/stl_string_fwd.h> or better yet use an absolute path])]) ]) @@ -847,16 +734,16 @@ AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [ AC_REQUIRE([AC_CANONICAL_SYSTEM]) AC_MSG_CHECKING([config.cache system type]) if { test x"${ac_cv_host_system_type+set}" = x"set" && - test x"$ac_cv_host_system_type" != x"$host"; } || + test x"$ac_cv_host_system_type" != x"$host"; } || { test x"${ac_cv_build_system_type+set}" = x"set" && - test x"$ac_cv_build_system_type" != x"$build"; } || + test x"$ac_cv_build_system_type" != x"$build"; } || { test x"${ac_cv_target_system_type+set}" = x"set" && - test x"$ac_cv_target_system_type" != x"$target"; }; then - AC_MSG_RESULT([different]) - ifelse($#, 1, [$1], - [AC_MSG_ERROR(["you must remove config.cache and restart configure"])]) + test x"$ac_cv_target_system_type" != x"$target"; }; then + AC_MSG_RESULT([different]) + ifelse($#, 1, [$1], + [AC_MSG_ERROR(["you must remove config.cache and restart configure"])]) else - AC_MSG_RESULT([same]) + AC_MSG_RESULT([same]) fi ac_cv_host_system_type="$host" ac_cv_build_system_type="$build" @@ -885,7 +772,7 @@ AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES, #include #endif extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl - [ac_not_found=no ; break 3],ac_not_found=yes) + [ac_not_found=no ; break 3],ac_not_found=yes) done done done @@ -893,29 +780,99 @@ extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func ])dnl AC_CACHE_VAL ])dnl AC_CACHE_VAL if test "$ac_not_found" = yes; then - ac_cv_func_select_arg1=int - ac_cv_func_select_arg234='int *' + ac_cv_func_select_arg1=int + ac_cv_func_select_arg234='int *' ac_cv_func_select_arg5='struct timeval *' fi AC_MSG_RESULT([$ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5]) - AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1,$ac_cv_func_select_arg1) - AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234,($ac_cv_func_select_arg234)) - AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5,($ac_cv_func_select_arg5)) + AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1,$ac_cv_func_select_arg1, + [Define to the type of arg1 for select().]) + AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234,($ac_cv_func_select_arg234), + [Define to the type of args 2, 3 and 4 for select().]) + AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5,($ac_cv_func_select_arg5), + [Define to the type of arg5 for select().]) ]) ### 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_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], + [ --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) 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]) + + +## ------------------------------------------------------------------------ +## 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" +])