X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=4eb93d755b4b0a6095fc36f5cf10406265494660;hb=e54ae72e5fac6f750c3f7972c74bb42b57f3a049;hp=b43b37b78a0175837ba6a696ef562d6a44c60283;hpb=f15780a9b39c3ef6e4ce89c6503289a2462c14ba;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b43b37b78a..4eb93d755b 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -6,49 +6,45 @@ dnl Allan Rae (rae@lyx.org) 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 -echo "configuring LyX version $VERSION" -if echo "$VERSION" | grep 'cvs' >/dev/null ; then - lyx_devel_version=yes - echo "WARNING: This is a development version. Expect bugs." -else - lyx_devel_version=no -fi -if echo "$VERSION" | grep 'pre' > /dev/null ; then - lyx_prerelease=yes - echo "WARNING: This is a prerelease. Be careful and backup your documents." -else - lyx_prerelease=no -fi -changequote([, ]) dnl -AC_SUBST(lyx_devel_version) -if test $lyx_devel_version = yes ; then - AC_DEFINE(DEVEL_VERSION, 1, Define if you are building a development version of LyX) -fi]) +AC_DEFUN([LYX_CHECK_VERSION],[ +echo "configuring LyX version" AC_PACKAGE_VERSION +lyx_devel_version=no +lyx_prerelease=no +case AC_PACKAGE_VERSION in + *svn*) lyx_devel_version=yes + 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*|*rc*) lyx_prerelease=yes + echo "WARNING: This is a prerelease. Be careful and backup your documents.";; +esac +AC_SUBST(lyx_devel_version)]) 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_DEFUN([LYX_VERSION_SUFFIX],[ +AC_MSG_CHECKING([for version suffix]) +dnl We need the literal double quotes in the rpm spec file +RPM_VERSION_SUFFIX='""' AC_ARG_WITH(version-suffix, [ --with-version-suffix[=] install lyx files as lyx], [if test "x$withval" = "xyes"; then - withval="-$VERSION" + withval="-"AC_PACKAGE_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]) + AC_SUBST(version_suffix,$withval) + RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) +AC_SUBST(RPM_VERSION_SUFFIX) +AC_MSG_RESULT([$withval]) ]) + 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_ERROR],[ lyx_error_txt="$lyx_error_txt ** $1 " @@ -57,7 +53,7 @@ lyx_error=yes]) dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the dnl flag lyx_warning to yes. -AC_DEFUN(LYX_WARNING,[ +AC_DEFUN([LYX_WARNING],[ lyx_warning_txt="$lyx_warning_txt == $1 " @@ -66,14 +62,22 @@ lyx_warning=yes]) 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,[ +AC_DEFUN([LYX_LIB_ERROR],[ LYX_ERROR([Cannot find $1. Please check that the $2 library is correctly installed on your system.])]) dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR dnl has occured previously. -AC_DEFUN(LYX_CHECK_ERRORS,[ +AC_DEFUN([LYX_CHECK_ERRORS],[ +if test x$lyx_warning = xyes; then +cat < @@ -317,7 +367,7 @@ fi]) dnl Usage: LYX_STD_COUNT : checks wherer the C++ library have a conforming dnl count template, if not the old HP version is assumed. -AC_DEFUN(LYX_STD_COUNT,[ +AC_DEFUN([LYX_STD_COUNT],[ AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count, [AC_TRY_COMPILE([ #include @@ -339,7 +389,7 @@ fi]) dnl Usage: LYX_CXX_STL_MODERN_STREAMS : checks whether the C++ compiler dnl supports modern STL streams -AC_DEFUN(LYX_CXX_STL_MODERN_STREAMS,[ +AC_DEFUN([LYX_CXX_STL_MODERN_STREAMS],[ AC_CACHE_CHECK(for modern STL streams,lyx_cv_modern_streams, [AC_TRY_COMPILE([ #include @@ -354,91 +404,21 @@ if test $lyx_cv_modern_streams = yes ; then fi]) -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([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 - AC_MSG_RESULT([$with_included_string])], - [AC_CACHE_CHECK([],lyx_cv_with_included_string, - [AC_TRY_COMPILE([ - #include - 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); - a.erase(); - ],[ - lyx_cv_with_included_string=no - ],[ - lyx_cv_with_included_string=yes - ]) - ]) - ]) - 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$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([AC_PROG_CXX]) - AC_CACHE_CHECK([whether the systems std::string is really good], - [lyx_cv_std_string_good], - [AC_TRY_COMPILE([ - #include - 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 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, + [ --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]) + AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) ]) dnl NOT USED CURRENTLY************************************* dnl LYX_CXX_PARTIAL -AC_DEFUN(LYX_CXX_PARTIAL, [ +AC_DEFUN([LYX_CXX_PARTIAL], [ AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([if C++ compiler supports partial specialization], [lyx_cv_cxx_partial_specialization], @@ -465,27 +445,9 @@ AC_DEFUN(LYX_CXX_PARTIAL, [ ]) -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,[ -AC_CACHE_CHECK(for C headers wrappers,lyx_cv_cxx_cheaders, - [AC_TRY_CPP([ -#include -#include -#include -#include -#include -#include -#include -#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) -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_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([ @@ -500,127 +462,13 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[ 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,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,[ - ac_cv_header_xpm_h=yes - lyx_cv_xpm_h_location=""],[ -AC_CHECK_HEADER(xpm.h,[],[ -LYX_LIB_ERROR(xpm.h,Xpm)])]) -AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location) - -### Test for the header version -if test $ac_cv_header_xpm_h = yes; then - AC_CACHE_CHECK([xpm header version],lyx_cv_xpmversion, - [ cat > conftest.$ac_ext <&5 | \ - grep '^"%%%"' 2>/dev/null | \ - sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'` - 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)";; -changequote([,]) - *) ;; - esac - lyx_cv_xpmversion="$lyx_cv_xpmv.$lyx_cv_xpmr$lyxxpmv_alpha" - rm -f conftest*]) - XPM_VERSION=${lyx_cv_xpmversion} - case "$lyx_cv_xpmr" in -changequote(,) - [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 - 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.]);; - 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. -AC_CACHE_CHECK(for HP-UX,ac_cv_hpux,[ -os=`uname -s | tr '[A-Z]' '[a-z]'` -ac_cv_hpux=no -test "$os" = hp-ux && ac_cv_hpux=yes]) -if test "$ac_cv_hpux" = yes; then - test "x$GXX" = xyes && CXXFLAGS="$CXXFLAGS -fpcc-struct-return" -fi]) - - -dnl Usage: LYX_SUNOS4 Checks for SunOS 4.x and sets the flag lyx_broken_headers -dnl if necessary -AC_DEFUN(LYX_SUNOS4, -[#The headers are not correct under SunOS4 -AC_CACHE_CHECK(for SunOS 4.x,ac_cv_sunos4,[ -changequote(, ) dnl -os=`uname -a | sed -e 's/^\([^ ]*\) [^ ]* \([0-9]\)\..*/\1\2/'` -changequote([, ]) dnl -ac_cv_sunos4=no -test "$os" = SunOS4 && ac_cv_sunos4=yes]) -if test "$ac_cv_sunos4" = yes; then - test "x$GXX" = xyes && lyx_broken_headers=yes -fi]) - - -dnl Usage: LYX_SCO Checks for SCO and sets the flag lyx_broken_headers -dnl if necessary -AC_DEFUN(LYX_SCO, -[AC_CACHE_CHECK(for SCO 3.2v4,ac_cv_sco,[ -ac_cv_sco=no -if test `uname -s` != "SCO_SV"; then - lyx_machine_rel=`uname -m`:`uname -r` - if test $lyx_machine_rel = i386:3.2 || test $lyx_machine_rel = i486:3.2; - then - if test -f /usr/options/cb.name; then - ac_cv_sco=no - elif /bin/uname -X 2>/dev/null >/dev/null ; then - ac_cv_sco=yes - fi - fi -fi]) -if test "$ac_cv_sco" = yes; then - test "x$GXX" = xyes && lyx_broken_headers=yes -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 while everybody else uses the former... -AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE, -[AC_MSG_CHECKING([type of argument for putenv()]) - AC_CACHE_VAL(lyx_cv_func_putenv_arg,dnl - [AC_TRY_COMPILE(dnl -[#include ], -[char const * foo = "bar"; - putenv(foo);],dnl - [lyx_cv_func_putenv_arg='char const *'],[lyx_cv_func_putenv_arg='char *'])]) - AC_MSG_RESULT($lyx_cv_func_putenv_arg) - AC_DEFINE_UNQUOTED(PUTENV_TYPE_ARG,$lyx_cv_func_putenv_arg,dnl - [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 resulting directory name in 'dir-var-name'. -AC_DEFUN(LYX_WITH_DIR,[ - AC_ARG_WITH($1,[ --with-$1 specify $2]) +AC_DEFUN([LYX_WITH_DIR],[ + 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) @@ -634,11 +482,11 @@ 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 use ":" as a separator. -AC_DEFUN(LYX_LOOP_DIR,[ +AC_DEFUN([LYX_LOOP_DIR],[ 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]) + test ! -d "$dir" && AC_MSG_ERROR([\"$dir\" is not a directory]) $2 fi done @@ -648,7 +496,7 @@ IFS=$ac_save_ifs dnl Usage: LYX_ADD_LIB_DIR(var-name,dir) Adds a -L directive to variable dnl var-name. -AC_DEFUN(LYX_ADD_LIB_DIR,[ +AC_DEFUN([LYX_ADD_LIB_DIR],[ $1="${$1} -L$2" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then @@ -662,7 +510,7 @@ fi]) 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 "]) +AC_DEFUN([LYX_ADD_INC_DIR],[$1="${$1} -I$2 "]) ### Check for a headers existence and location iff it exists ## This is supposed to be a generalised version of LYX_STL_STRING_FWD @@ -675,7 +523,7 @@ AC_DEFUN(LYX_ADD_INC_DIR,[$1="${$1} -I$2 "]) ## 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_DEFUN([LYX_PATH_HEADER], [ AC_CHECK_HEADER($1,[ ac_tr_safe=PATH_`echo $ac_safe | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ### the only remaining problem is getting the second parameter to this @@ -693,131 +541,80 @@ lyx_path_header_path=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \ 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_path_header_path)]) + AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path, [dummy])]) ]) ### end of LYX_PATH_HEADER -dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)] -dnl if the cache file is inconsistent with the current host, -dnl target and build system types, execute CMD or print a default -dnl error message. -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_build_system_type+set}" = x"set" && - 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"])]) - else - AC_MSG_RESULT([same]) - fi - ac_cv_host_system_type="$host" - ac_cv_build_system_type="$build" - ac_cv_target_system_type="$target" -]) - -dnl We use this until autoconf fixes its version. -AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES, -[AC_MSG_CHECKING([types of arguments for select()]) - AC_CACHE_VAL(ac_cv_func_select_arg234,dnl - [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl - [AC_CACHE_VAL(ac_cv_func_select_arg5,dnl - [for ac_cv_func_select_arg234 in 'fd_set *' 'int *' 'void *'; do - for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do - AC_TRY_COMPILE(dnl -[#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#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) - done - done - done - ])dnl AC_CACHE_VAL - ])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_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, - [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 +### Check which frontends we want to use. ### -AC_DEFUN(LYX_USE_FRONTEND, -[AC_MSG_CHECKING([what frontend should be used as main GUI]) +AC_DEFUN([LYX_USE_FRONTENDS], +[AC_MSG_CHECKING([what frontend should be used for the GUI]) AC_ARG_WITH(frontend, [ --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) -AC_SUBST(FRONTEND) -AC_SUBST(FRONTEND_GUILIB) -AC_SUBST(FRONTEND_LDFLAGS) -AC_SUBST(FRONTEND_INCLUDES) -AC_SUBST(FRONTEND_LIBS) + Possible values: qt4], + [FRONTENDS="$withval"],[FRONTENDS="qt4"]) +if test "x$FRONTENDS" = x ; then + AC_MSG_RESULT(none) + AC_ERROR("Please select a frontend using --with-frontend") +fi +AC_MSG_RESULT($FRONTENDS) +AC_SUBST(FRONTENDS) +AC_SUBST(FRONTENDS_SUBDIRS) +AC_SUBST(FRONTENDS_PROGS) ]) -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]) +## Check what kind of packaging should be used at install time. +## The default is autodetected. +AC_DEFUN([LYX_USE_PACKAGING], +[AC_MSG_CHECKING([what packaging should be used]) +AC_ARG_WITH(packaging, + [ --with-packaging=THIS Use THIS packaging for installation: + Possible values: posix, windows, macosx], + [lyx_use_packaging="$withval"], [ + case $host in + *-apple-darwin*) lyx_use_packaging=macosx ;; + *-pc-mingw32*) lyx_use_packaging=windows;; + *) 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} + default_prefix="/Applications/${PACKAGE}.app" + bindir='${prefix}/Contents/MacOS' + libdir='${prefix}/Contents/Resources' + datadir='${prefix}/Contents/Resources' + pkgdatadir='${datadir}' + 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}" + bindir='${prefix}/bin' + libdir='${prefix}/Resources' + datadir='${prefix}/Resources' + pkgdatadir='${datadir}' + mandir='${prefix}/Resources/man' ;; + posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) + PACKAGE=lyx${version_suffix} + program_suffix=$version_suffix + pkgdatadir='${datadir}/${PACKAGE}' + 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) +]) ## ------------------------------------------------------------------------ ## Find a file (or one of more files in a list of dirs) ## ------------------------------------------------------------------------ ## -AC_DEFUN(AC_FIND_FILE, +AC_DEFUN([AC_FIND_FILE], [ $3=NO for i in $2; @@ -833,7 +630,7 @@ done ]) dnl just a wrapper to clean up configure.in -AC_DEFUN(LYX_PROG_LIBTOOL, +AC_DEFUN([LYX_PROG_LIBTOOL], [ AC_REQUIRE([AC_ENABLE_SHARED]) AC_REQUIRE([AC_ENABLE_STATIC]) @@ -843,7 +640,77 @@ ac_save_cc=$CC ac_save_cflags="$CFLAGS" CC=$CXX CFLAGS="$CXXFLAGS" -AM_PROG_LIBTOOL dnl for libraries +AC_PROG_LIBTOOL dnl for libraries CC=$ac_save_cc CFLAGS="$ac_save_cflags" ]) + + +## ------------------------------------------------------------------------ +## Check whether mkdir() is mkdir or _mkdir, and whether it takes +## one or two arguments. +## +## http://ac-archive.sourceforge.net/C_Support/ac_func_mkdir.html +## ------------------------------------------------------------------------ +## +AC_DEFUN([AC_FUNC_MKDIR], +[AC_CHECK_FUNCS([mkdir _mkdir]) +AC_CACHE_CHECK([whether mkdir takes one argument], + [ac_cv_mkdir_takes_one_arg], +[AC_TRY_COMPILE([ +#include +#if HAVE_UNISTD_H +# include +#endif +], [mkdir (".");], +[ac_cv_mkdir_takes_one_arg=yes], [ac_cv_mkdir_takes_one_arg=no])]) +if test x"$ac_cv_mkdir_takes_one_arg" = xyes; then + AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, + [Define if mkdir takes only one argument.]) +fi +]) + + +dnl Set VAR to the canonically resolved absolute equivalent of PATHNAME, +dnl (which may be a relative path, and need not refer to any existing +dnl entity). + +dnl On Win32-MSYS build hosts, the returned path is resolved to its true +dnl native Win32 path name, (but with slashes, not backslashes). + +dnl On any other system, it is simply the result which would be obtained +dnl if PATHNAME represented an existing directory, and the pwd command was +dnl executed in that directory. +AC_DEFUN([MSYS_AC_CANONICAL_PATH], +[ac_dir="$2" + ( exec 2>/dev/null; cd / && pwd -W ) | grep ':' >/dev/null && + ac_pwd_w="pwd -W" || ac_pwd_w=pwd + until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w` + do + ac_dir=`AS_DIRNAME(["$ac_dir"])` + done + ac_dir=`echo "$ac_dir" | sed 's?^[[./]]*??'` + ac_val=`echo "$ac_val" | sed 's?/*$[]??'` + $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])