Mercurial > hg > xemacs-beta

comparison configure.ac @ 4450:ac6231e0c1df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 07 May 2008 21:21:08 +0200
parents 13ce402e1736 e4225b6d9389
children 49f8ed034500
comparison
equal deleted inserted replaced
4449:13ce402e1736 4450:ac6231e0c1df
864 dnl 864 dnl
865 XE_HELP_SUBSECTION([Database options]) 865 XE_HELP_SUBSECTION([Database options])
866 XE_COMPLEX_ARG([database], 866 XE_COMPLEX_ARG([database],
867 AS_HELP_STRING([--enable-database=TYPE],[Compile with database support. Valid types are 867 AS_HELP_STRING([--enable-database=TYPE],[Compile with database support. Valid types are
868 `no' or a comma-separated list of one or more 868 `no' or a comma-separated list of one or more
869 of `berkdb' and either `dbm' or `gnudbm'.]), 869 of `berkdb' and either `dbm' or `gdbm'.]),
870 [ 870 [
871 if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then 871 if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
872 USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified 872 USAGE_ERROR("Only one of \`dbm' and \`gdbm' may be specified
873 with the \`--with-database' option.") 873 with the \`--with-database' option.")
874 fi 874 fi
875 ], 875 ],
876 [], 876 [],
877 [XE_COMPLEX_OPTION([berkdb],[""]), 877 [XE_COMPLEX_OPTION([berkdb],[""]),
1174 dnl ------------------------------------------------------------------------- 1174 dnl -------------------------------------------------------------------------
1175 1175
1176 dnl ---------------------------------------- 1176 dnl ----------------------------------------
1177 dnl Find out which version of XEmacs this is 1177 dnl Find out which version of XEmacs this is
1178 dnl ---------------------------------------- 1178 dnl ----------------------------------------
1179 dnl This should be the same code as in Makefile.in.in
1180 cp "$srcdir/version.sh.in" "$srcdir/version.sh"
1181 if test -d "$srcdir/.hg"; then
1182 (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
1183 fi
1179 . "$srcdir/version.sh" || exit 1; 1184 . "$srcdir/version.sh" || exit 1;
1180 dnl Must do the following first to determine verbosity for AC_DEFINE 1185 dnl Must do the following first to determine verbosity for AC_DEFINE
1181 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi 1186 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
1182 : "${verbose=$beta}" 1187 : "${verbose=$beta}"
1183 version="${emacs_major_version}.${emacs_minor_version}" 1188 version="${emacs_major_version}.${emacs_minor_version}"
1810 1815
1811 if test "$enable_newgc" = "yes"; then 1816 if test "$enable_newgc" = "yes"; then
1812 if test "$enable_vdb" = "auto"; then 1817 if test "$enable_vdb" = "auto"; then
1813 case "$opsys" in 1818 case "$opsys" in
1814 darwin ) case "$machine" in 1819 darwin ) case "$machine" in
1815 i686 ) check_vdb_posix=yes ;; 1820 i[[3-9]]86 ) check_vdb_posix=yes ;;
1816 * ) AC_DEFINE(VDB_MACH) have_vdb_mach=yes ;; 1821 * ) AC_DEFINE(VDB_MACH) have_vdb_mach=yes ;;
1817 esac ;; 1822 esac ;;
1818 cygwin* ) AC_DEFINE(VDB_WIN32) have_vdb_win32=yes ;; 1823 cygwin* ) AC_DEFINE(VDB_WIN32) have_vdb_win32=yes ;;
1819 linux* ) check_vdb_posix=yes ;; 1824 linux* ) check_vdb_posix=yes ;;
1820 freebsd ) check_vdb_posix=yes ;; 1825 freebsd ) check_vdb_posix=yes ;;
4240 dnl Search for the Athena library... 4245 dnl Search for the Athena library...
4241 if test "$athena_3d" = "no"; then 4246 if test "$athena_3d" = "no"; then
4242 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, 4247 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
4243 [ 4248 [
4244 dnl Must not be a 3d library... 4249 dnl Must not be a 3d library...
4245 AC_CHECK_LIB($athena_variant, threeDClassRec, 4250 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB,
4246 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], 4251 [AC_MSG_WARN([Could not find a non-3d Athena widget library.])],
4247 athena_lib=$athena_variant) 4252 athena_lib=$athena_variant)
4248 ], 4253 ],
4249 AC_MSG_WARN([Could not find an Athena widget library.])) 4254 AC_MSG_WARN([Could not find an Athena widget library.]))
4250 else 4255 else
4251 dnl The real configuration, need 3d library 4256 dnl The real configuration, need 3d library
4252 AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, 4257 AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant,
4253 dnl OK, couldn't find it with a proper name, try the standard Athena lib 4258 dnl OK, couldn't find it with a proper name, try the standard Athena lib
4254 dnl If that is 3d, presume the user asked for what they have installed. 4259 dnl If that is 3d, presume the user asked for what they have installed.
4255 AC_CHECK_LIB(Xaw, threeDClassRec, 4260 AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB,
4256 [ 4261 [
4257 athena_lib=Xaw; 4262 athena_lib=Xaw;
4258 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); 4263 AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
4259 ], 4264 ],
4260 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) 4265 [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))