Mercurial > emacs

comparison configure.in @ 97351:945ae0a5779f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configure.in: Correctly handle --enable-cocoa-experimental-ctrl-g=no and --enable-ns-self-contained=yes. * configure: Regenerate.
author Andreas Schwab <schwab@suse.de>
date Thu, 07 Aug 2008 08:54:11 +0000
parents ac1bfb10ff9e
children 0defde3a9c5f
comparison
equal deleted inserted replaced
97350:f0689cd563e3 97351:945ae0a5779f
151 dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html 151 dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
152 OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals]) 152 OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
153 153
154 dnl Can remove these in Emacs 24. 154 dnl Can remove these in Emacs 24.
155 AC_ARG_WITH([gtk],, 155 AC_ARG_WITH([gtk],,
156 AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to 156 [AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to
157 specify a toolkit.]),,) 157 specify a toolkit.])],,)
158 158
159 AC_ARG_WITH([gcc],, 159 AC_ARG_WITH([gcc],,
160 AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment 160 [AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment
161 variable to specify a compiler.]),,) 161 variable to specify a compiler.])],,)
162 162
163 AC_ARG_WITH([pkg-config-prog],dnl 163 AC_ARG_WITH([pkg-config-prog],dnl
164 [AS_HELP_STRING([--with-pkg-config-prog=PATH], 164 [AS_HELP_STRING([--with-pkg-config-prog=PATH],
165 [Path to pkg-config for finding GTK and librsvg])]) 165 [Path to pkg-config for finding GTK and librsvg])])
166 if test "X${with_pkg_config_prog}" != X; then 166 if test "X${with_pkg_config_prog}" != X; then
168 PKG_CONFIG="${with_pkg_config_prog}" 168 PKG_CONFIG="${with_pkg_config_prog}"
169 fi 169 fi
170 fi 170 fi
171 171
172 AC_ARG_ENABLE(cocoa-experimental-ctrl-g, 172 AC_ARG_ENABLE(cocoa-experimental-ctrl-g,
173 [ --enable-cocoa-experimental-ctrl-g enable experimental improved ctrl-g recognition], 173 [AS_HELP_STRING([--enable-cocoa-experimental-ctrl-g],
174 EN_COCOA_EXPERIMENTAL_CTRL_G=yes, 174 [enable experimental improved ctrl-g recognition])],
175 EN_COCOA_EXPERIMENTAL_CTRL_G=$enableval,
175 EN_COCOA_EXPERIMENTAL_CTRL_G=no) 176 EN_COCOA_EXPERIMENTAL_CTRL_G=no)
176 177
177 AC_ARG_ENABLE(ns-self-contained, 178 AC_ARG_ENABLE(ns-self-contained,
178 [ --disable-ns-self-contained disable self contained build under NS], 179 [AS_HELP_STRING([--disable-ns-self-contained],
179 EN_NS_SELF_CONTAINED=no, 180 [disable self contained build under NeXTstep])],
181 EN_NS_SELF_CONTAINED=$enableval,
180 EN_NS_SELF_CONTAINED=yes) 182 EN_NS_SELF_CONTAINED=yes)
181 183
182 AC_ARG_ENABLE(asserts, 184 AC_ARG_ENABLE(asserts,
183 [AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])], 185 [AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])],
184 USE_XASSERTS=$enableval, 186 USE_XASSERTS=$enableval,