comparison configure.ac @ 5495:1f0b15040456

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 861f2601a38b 4dee0387b9de
children 4b5b7dcc19d6
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
61 61
62 in the this directory. You must have autoconf version 2.59. 62 in the this directory. You must have autoconf version 2.59.
63 63
64 This file is part of XEmacs. 64 This file is part of XEmacs.
65 65
66 XEmacs is free software; you can redistribute it and/or modify it 66 XEmacs is free software: you can redistribute it and/or modify it
67 under the terms of the GNU General Public License as published by 67 under the terms of the GNU General Public License as published by the
68 the Free Software Foundation; either version 2, or (at your 68 Free Software Foundation, either version 3 of the License, or (at your
69 option) any later version. 69 option) any later version.
70 70
71 XEmacs is distributed in the hope that it will be useful, but 71 XEmacs is distributed in the hope that it will be useful, but WITHOUT
72 WITHOUT ANY WARRANTY; without even the implied warranty of 72 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
73 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 73 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
74 General Public License for more details. 74 for more details.
75 75
76 You should have received a copy of the GNU General Public License 76 You should have received a copy of the GNU General Public License
77 along with XEmacs; see the file COPYING. If not, write to the Free 77 along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
78 Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
79 Boston, MA 02110-1301, USA.
80 78
81 For usage, run `./configure --help' 79 For usage, run `./configure --help'
82 For more detailed information on building and installing XEmacs, 80 For more detailed information on building and installing XEmacs,
83 read the file `INSTALL'. 81 read the file `INSTALL'.
84 82
975 development environment.]), 973 development environment.]),
976 [], []) 974 [], [])
977 XE_MERGED_ARG([sparcworks], 975 XE_MERGED_ARG([sparcworks],
978 AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), 976 AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]),
979 [], []) 977 [], [])
980 XE_MERGED_ARG([infodock],
981 AS_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]),
982 [], [])
983 dnl 978 dnl
984 XE_HELP_SUBSECTION([Debugging options]) 979 XE_HELP_SUBSECTION([Debugging options])
985 XE_MERGED_ARG([debug], 980 XE_MERGED_ARG([debug],
986 AS_HELP_STRING([--with-debug],[Enable additional debugging information. No noticeable time cost (unlike 981 AS_HELP_STRING([--with-debug],[Enable additional debugging information. No noticeable time cost (unlike
987 `--with-error-checking'). This turns adds `-g' to the compiler options so that 982 `--with-error-checking'). This turns adds `-g' to the compiler options so that
1030 [], []) 1025 [], [])
1031 XE_MERGED_ARG([quick-build], 1026 XE_MERGED_ARG([quick-build],
1032 AS_HELP_STRING([--with-quick-build],[Speed up the build cycle by leaving out steps where 1027 AS_HELP_STRING([--with-quick-build],[Speed up the build cycle by leaving out steps where
1033 XEmacs will still work (more or less) without them. 1028 XEmacs will still work (more or less) without them.
1034 Potentially dangerous if you don't know what you're 1029 Potentially dangerous if you don't know what you're
1035 doing. This (1) doesn't garbage-collect after loading 1030 doing. This (1) Doesn't garbage-collect after loading
1036 each file during dumping, (2) doesn't 1031 each file during dumping, (2) Doesn't
1037 automatically rebuild the DOC file (remove it by hand 1032 automatically rebuild the DOC file (remove it by hand
1038 to get it rebuilt), (3) Removes config.h, lisp.h and 1033 to get it rebuilt), (3) Removes config.h, lisp.h and
1039 associated files from the dependency lists, so changes 1034 associated files from the dependency lists, so changes
1040 to these files don't automatically cause all .c files 1035 to these files don't automatically cause all .c files
1041 to be rebuilt.]), 1036 to be rebuilt, (4) Doesn't check for Lisp shadows.]),
1042 [], []) 1037 [], [])
1043 XE_MERGED_ARG([union-type], 1038 XE_MERGED_ARG([union-type],
1044 AS_HELP_STRING([--with-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]), 1039 AS_HELP_STRING([--with-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]),
1045 [], []) 1040 [], [])
1046 XE_MERGED_ARG([quantify], 1041 XE_MERGED_ARG([quantify],
1106 if test "x$datadir" != "x\${datarootdir}" 1101 if test "x$datadir" != "x\${datarootdir}"
1107 then 1102 then
1108 AC_DEFINE(INFODIR_USER_DEFINED) 1103 AC_DEFINE(INFODIR_USER_DEFINED)
1109 AC_DEFINE(LISPDIR_USER_DEFINED) 1104 AC_DEFINE(LISPDIR_USER_DEFINED)
1110 AC_DEFINE(ETCDIR_USER_DEFINED) 1105 AC_DEFINE(ETCDIR_USER_DEFINED)
1106 AC_DEFINE(LATE_PACKAGE_DIRECTORIES_USER_DEFINED)
1111 fi 1107 fi
1112 1108
1113 if test "x$libdir" != "x\${exec_prefix}/lib" 1109 if test "x$libdir" != "x\${exec_prefix}/lib"
1114 then 1110 then
1115 AC_DEFINE(MODULEDIR_USER_DEFINED) 1111 AC_DEFINE(MODULEDIR_USER_DEFINED)
1126 1122
1127 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp' 1123 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp'
1128 inststaticdir='${PROGNAME}' 1124 inststaticdir='${PROGNAME}'
1129 instvardir='${PROGNAME}-${version}' 1125 instvardir='${PROGNAME}-${version}'
1130 sitemoduledir='${libdir}/${inststaticdir}/site-modules' 1126 sitemoduledir='${libdir}/${inststaticdir}/site-modules'
1127 with_late_packages='${datadir}/${PROGNAME}'
1131 1128
1132 AC_SUBST(inststaticdir) 1129 AC_SUBST(inststaticdir)
1133 AC_SUBST(statedir,$with_statedir) 1130 AC_SUBST(statedir,$with_statedir)
1134 1131
1135 dnl ------------------------------------------------------------------------- 1132 dnl -------------------------------------------------------------------------
1224 if test "$xemacs_release_date" != ""; then 1221 if test "$xemacs_release_date" != ""; then
1225 AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date") 1222 AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date")
1226 fi 1223 fi
1227 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 1224 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
1228 1225
1229 if test "$with_infodock" = "yes"; then 1226 PROGNAME=xemacs
1230 if test ! -f ../../ID-INSTALL; then 1227 SHEBANG_PROGNAME=xemacs-script
1231 echo "Cannot build InfoDock without InfoDock sources"
1232 with_infodock=no
1233 fi
1234 fi
1235
1236 if test "$with_infodock" = "yes"; then
1237 dnl InfoDock version numbers. XEmacs will use the same style of numbering
1238 dnl after the release of XEmacs 21.0.
1239 AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version)
1240 AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version)
1241 AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version)
1242 version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version}
1243 PROGNAME=infodock
1244 SHEBANG_PROGNAME=infodock-script
1245 CPPFLAGS="$CPPFLAGS -DINFODOCK"
1246 else
1247 PROGNAME=xemacs
1248 SHEBANG_PROGNAME=xemacs-script
1249 fi
1250 1228
1251 AC_SUBST(SHEBANG_PROGNAME) 1229 AC_SUBST(SHEBANG_PROGNAME)
1252 1230
1253 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME") 1231 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME")
1254 1232
4487 AC_CHECK_HEADERS(sys/loadavg.h) 4465 AC_CHECK_HEADERS(sys/loadavg.h)
4488 else 4466 else
4489 dnl We define our own getloadavg() using lower level functions. 4467 dnl We define our own getloadavg() using lower level functions.
4490 XE_ADD_OBJS(getloadavg.o) 4468 XE_ADD_OBJS(getloadavg.o)
4491 4469
4492 dnl Used by getloadavg() - does not require root priveleges 4470 dnl Used by getloadavg() - does not require root privileges
4493 AC_CHECK_LIB(kstat, kstat_open) 4471 AC_CHECK_LIB(kstat, kstat_open)
4494 AC_CHECK_HEADERS(kstat.h) 4472 AC_CHECK_HEADERS(kstat.h)
4495 4473
4496 dnl Another way to get the load average 4474 dnl Another way to get the load average
4497 AC_CHECK_LIB(kvm, kvm_read) 4475 AC_CHECK_LIB(kvm, kvm_read)