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
lyx_prerelease=no
fi
changequote([, ]) dnl
-PACKAGE=lyx${program_suffix}
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)
])dnl
-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_LANG_RESTORE
-if test $ac_cv_prog_cxx_works = no; then
- CXX=
-fi
-cross_compiling=$ac_cv_prog_cxx_cross
+AC_DEFUN([LYX_PROG_CXX_WORKS],
+[rm -f conftest.C
+cat >conftest.C <<EOF
+class foo {
+ // we require the mutable keyword
+ mutable int bar;
+ };
+ // we require namespace support
+ namespace baz {
+ int bar;
+ }
+ int main() {
+ return(0);
+ }
+EOF
+$CXX -c $CXXFLAGS $CPPFLAGS 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, $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
-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
- 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++
+if test x$GXX = xyes; then
+ dnl Useful for global version info
gxx_version=`${CXX} --version`
+ CXX_VERSION="($gxx_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
+ else
case $gxx_version in
2.95.1) CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
2.95.2) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
*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";;
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*) ;;
- 2.97*) CXXFLAGS="$CXXFLAGS -Wconversion -Winline";;
- *2.91*) ;;
- *) ;;
- esac
+ case $gxx_version in
+ 2.95.*) ;;
+ 2.96*) ;;
+ 2.97*) ;;
+ *2.91*) ;;
+ *) ;;
+ esac
fi
fi
-else
- GXX=
- test "${CXXFLAGS+set}" = set || CXXFLAGS=""
-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,[
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,[
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 <string>
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([
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 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(
])
-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,[
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]*) ;;
grep '^"%%%"' 2>/dev/null | \
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
rm -f conftest*])
+XFORMS_VERSION=$lyx_cv_xfversion
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
+ 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_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)
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