Commit 52cd7d02 authored by Steven Tamm's avatar Steven Tamm

* configure.in: New option, --enable-carbon-app, to specify

	that the application should be installed
	* Makefile.in (install-arch-dep): On Mac OS X, install the
	Emacs.app application if carbon-app is enabled
parent ca2135af
2003-01-07 Steven Tamm <steventamm@mac.com>
* configure.in: New option, --enable-carbon-app, to specify
that the application should be installed
* Makefile.in (install-arch-dep): On Mac OS X, install the
Emacs.app application if carbon-app is enabled
2003-01-06 Dave Love <fx@gnu.org>
* configure.in: Check for nl_langinfo.
......
......@@ -141,6 +141,9 @@ VPATH=@srcdir@
# Where to find the application default.
x_default_search_path=@x_default_search_path@
# Location to install Emacs.app on Mac OS X
carbon_appdir=@carbon_appdir@
# ==================== Emacs-specific directories ====================
# These variables hold the values Emacs will actually use. They are
......@@ -365,6 +368,12 @@ install-arch-dep: mkdir
${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
else true; fi ; \
done
if test "${carbon_appdir}" != ""; then \
umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
(cd mac/Emacs.app; tar -chf - . ) | \
(cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
&& cat > /dev/null) || exit 1; \
fi
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
......
......@@ -114,6 +114,10 @@ AC_ARG_WITH(xim,
[ --without-xim don't use X11 XIM])
AC_ARG_WITH(carbon,
[ --without-carbon don't use Carbon GUI on Mac OS X])
AC_ARG_ENABLE(carbon-app,
[[ --enable-carbon-app[=DIR] [DIR=/Application]
specify install directory for Emacs.app on Mac OS X]],
[ carbon_appdir_x=${enableval}])
#### Make srcdir absolute, if it isn't already. It's important to
#### avoid running the path through pwd unnecessarily, since pwd can
......@@ -2030,6 +2034,15 @@ fi
if test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
window_system=mac
## Specify the install directory
carbon_appdir=
if test "${carbon_appdir_x}" != ""; then
case ${carbon_appdir_x} in
y | ye | yes) carbon_appdir=/Applications ;;
* ) carbon_appdir=${carbon_appdir_x} ;;
esac
fi
fi
### Use session management (-lSM -lICE) if available
......@@ -2395,6 +2408,7 @@ AC_SUBST(X_TOOLKIT_TYPE)
AC_SUBST(machfile)
AC_SUBST(opsysfile)
AC_SUBST(GETLOADAVG_LIBS)
AC_SUBST(carbon_appdir)
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment