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[=<version>] install lyx files as lyx<version>],
[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
"
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
"
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 <<EOF
+=== The following minor problems have been detected by configure.
+=== Please check the messages below before running 'make'.
+=== (see the section 'Problems' in the INSTALL file)
+$lyx_warning_txt
+EOF
+fi
if test x$lyx_error = xyes; then
cat <<EOF
**** The following problems have been detected by configure.
$lyx_error_txt
$lyx_warning_txt
EOF
+exit 1
else
-if test x$lyx_warning = xyes; then
-cat <<EOF
-=== The following minor problems have been detected by configure.
-=== Please check the messages below before running 'make'.
-=== (see the section 'Problems' in the INSTALL file)
-$lyx_warning_txt
-EOF
-fi
cat <<EOF
Configuration of LyX was successful.
Type 'make' to compile the program,
])
-AC_DEFUN(LYX_PROG_CXX,
+AC_DEFUN([LYX_PROG_CXX],
[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])
enable_warnings=no;
fi;])
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])
+ lyx_flags="warnings $lyx_flags"
fi
### We might want to disable debug
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],[enable debug information]),,
- [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
+ [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
enable_debug=yes;
else
enable_debug=no;
fi;])
+AC_ARG_ENABLE(stdlib-debug,
+ AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),,
+ [ if test $lyx_devel_version = yes ; then
+ enable_stdlib_debug=yes;
+ else
+ enable_stdlib_debug=no;
+ fi;])
+
+AC_ARG_ENABLE(concept-checks,
+ AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
+ [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+ enable_concept_checks=yes;
+ else
+ enable_concept_checks=no;
+ fi;])
+
+AC_ARG_ENABLE(profiling,
+ AC_HELP_STRING([--enable-profiling],[enable profiling]),,
+ enable_profiling=no;)
+
### set up optimization
AC_ARG_ENABLE(optimization,
- AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
- enable_optimization=yes;)
+ AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
+ enable_optimization=yes;)
case $enable_optimization in
- yes) lyx_opt=-O;;
- no) lyx_opt=;;
+ yes)
+ if test $lyx_devel_version = yes ; then
+ lyx_opt=-O
+ else
+ lyx_opt=-O2
+ fi;;
+ no) lyx_opt=;;
*) lyx_opt=${enable_optimization};;
esac
-# set the debug flags correctly.
+AC_ARG_ENABLE(pch,
+ AC_HELP_STRING([--enable-pch],[enable precompiled headers]),,
+ enable_pch=yes;)
+lyx_pch_comp=no
+
+# set the compiler options correctly.
if test x$GXX = xyes; then
dnl Useful for global version info
gxx_version=`${CXX} -dumpversion`
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
else
- case $gxx_version in
- 2.95.1) CXXFLAGS="$lyx_opt -fpermissive -ftemplate-depth-30";;
- 2.95.*) CXXFLAGS="$lyx_opt -Wno-non-template-friend -ftemplate-depth-30";;
- 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend";;
- 3.0*) CXXFLAGS="$lyx_opt";;
- 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
- 3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- 3.3*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- 3.4*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- *) CXXFLAGS="$lyx_opt";;
- esac
+ CFLAGS="$lyx_opt"
+ CXXFLAGS="$lyx_opt"
if test x$enable_debug = xyes ; then
+ CFLAGS="-g $CFLAGS"
CXXFLAGS="-g $CXXFLAGS"
fi
+ if test x$enable_profiling = xyes ; then
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+ LDFLAGS="-pg $LDFLAGS"
+ fi
+ fi
+ if test "$ac_env_CPPFLAGS_set" != set; then
+ if test x$enable_warnings = xyes ; then
+ case $gxx_version in
+ 3.1*|3.2*|3.3*)
+ CPPFLAGS="-W -Wall $CPPFLAGS"
+ ;;
+ *)
+ CPPFLAGS="-Wextra -Wall $CPPFLAGS "
+ ;;
+ esac
+ fi
+ fi
+ case $gxx_version in
+ 3.1*) AM_CXXFLAGS="-finline-limit=500 ";;
+ 3.2*|3.3*) AM_CXXFLAGS="";;
+ 3.4*|4.*)
+ AM_CXXFLAGS=""
+ test $enable_pch = yes && lyx_pch_comp=yes
+ ;;
+ *) AM_CXXFLAGS="";;
+ esac
+ if test x$enable_stdlib_debug = xyes ; then
+ case $gxx_version in
+ 3.4*|4.*)
+ lyx_flags="stdlib-debug $lyx_flags"
+ AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
+ AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
+ ;;
+ esac
fi
- if test x$enable_warnings = xyes ; then
+ if test x$enable_concept_checks = xyes ; then
case $gxx_version in
- 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
- 2.96*) CXXFLAGS="$CXXFLAGS -W -Wall";;
- 3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";;
- *) CXXFLAGS="$CXXFLAGS -W -Wall";;
+ 3.3*)
+ lyx_flags="concept-checks $lyx_flags"
+ AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
+ ;;
+ 3.4*|4.*)
+ lyx_flags="concept-checks $lyx_flags"
+ AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
+ ;;
esac
fi
-fi])dnl
+fi
+test "$lyx_pch_comp" = yes && lyx_flags="pch $lyx_flags"
+AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
+])dnl
dnl NOT USED CURRENTLY*************************************
dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler
dnl supports RTTI
-AC_DEFUN(LYX_CXX_RTTI,[
+AC_DEFUN([LYX_CXX_RTTI],[
### Check whether the compiler supports runtime type information
AC_CACHE_CHECK(whether the C++ compiler supports RTTI,lyx_cv_rtti,
[AC_TRY_RUN([
dnl Usage: LYX_CXX_EXPLICIT : checks whether the C++ compiler
dnl understands the "explicit" directive.
-AC_DEFUN(LYX_CXX_EXPLICIT,[
+AC_DEFUN([LYX_CXX_EXPLICIT],[
### Check whether the compiler understands the keyword `explicit'
AC_CACHE_CHECK(whether the C++ compiler understands explicit,lyx_cv_explicit,
[AC_TRY_COMPILE([
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_CXX_STL_STACK],[
AC_CACHE_CHECK(for broken STL stack template,lyx_cv_broken_stack,
[AC_TRY_COMPILE([
#include <stack>
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 <algorithm>
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 <iostream>
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 <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);
- 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_USE_INCLUDED_BOOST : select if the included boost should
dnl be used.
-AC_DEFUN(LYX_USE_INCLUDED_BOOST,[
+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])
AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
])
-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 <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 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],
])
-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 <clocale>
-#include <cctype>
-#include <cerrno>
-#include <cmath>
-#include <csignal>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>],[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([
fi
])
+
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)
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
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
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
## 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
])
### end of LYX_PATH_HEADER
-### Check which frontends we want to use. The default is XForms only
+### Check which frontends we want to use.
###
-AC_DEFUN(LYX_USE_FRONTENDS,
+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, qt],
- [FRONTENDS="$withval"], [FRONTENDS="xforms"])
+ 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)
])
+## 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;
])
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])
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 <sys/stat.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#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])
projects / lyx.git / blobdiff