[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109317: * configure.ac (opsysfile, S
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109317: * configure.ac (opsysfile, S_FILE): Now they are always empty. |
Date: |
Mon, 30 Jul 2012 23:52:13 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109317
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 23:52:13 -0700
message:
* configure.ac (opsysfile, S_FILE): Now they are always empty.
modified:
ChangeLog
configure.ac
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-31 06:46:42 +0000
+++ b/ChangeLog 2012-07-31 06:52:13 +0000
@@ -1,5 +1,7 @@
2012-07-31 Glenn Morris <address@hidden>
+ * configure.ac (opsysfile, S_FILE): Now they are always empty.
+
* configure.ac (opsysfile): Forgot to set it to empty on sol2-10
when removing src/s/sol2-6.h yesterday.
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-31 06:46:42 +0000
+++ b/configure.ac 2012-07-31 06:52:13 +0000
@@ -365,9 +365,6 @@
* ) srcdir="`(cd ${srcdir}; pwd)`" ;;
esac
-#### Given the configuration name, set opsysfile to the
-#### name of s/*.h file we should use.
-
### Canonicalize the configuration name.
AC_CANONICAL_HOST
@@ -555,8 +552,6 @@
Check `etc/MACHINES' for recognized configuration names.])
fi
-opsysfile="s/${opsys}.h"
-
#### Choose a compiler.
@@ -3689,7 +3684,6 @@
case $opsys in
aix4-2)
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
dnl This symbol should be defined on AIX Version 3 ???????
@@ -3701,12 +3695,10 @@
;;
cygwin)
- opsysfile=
AC_DEFINE(CYGWIN, 1, [Define if the system is Cygwin.])
;;
darwin)
- opsysfile=
dnl BSD4_3 and BSD4_4 are already defined in sys/param.h.
AC_DEFINE(BSD4_2, [])
AC_DEFINE(BSD_SYSTEM, [])
@@ -3718,7 +3710,6 @@
;;
freebsd)
- opsysfile=
AC_DEFINE(BSD4_2, [])
dnl Hack to avoid calling AC_PREPROC_IFELSE multiple times.
dnl Would not be needed with autoconf >= 2.67, where the
@@ -3736,20 +3727,17 @@
;;
gnu-linux | gnu-kfreebsd )
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with
GNU/Linux.])
;;
hpux*)
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
AC_DEFINE(HPUX, [], [Define if the system is HPUX.])
;;
irix6-5)
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
AC_DEFINE(USG5_4, [])
@@ -3757,7 +3745,6 @@
;;
sol2*)
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
AC_DEFINE(USG5_4, [])
@@ -3765,7 +3752,6 @@
;;
unixware)
- opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
AC_DEFINE(USG5_4, [])
@@ -3784,8 +3770,6 @@
using GTK.])
;;
- gnu) opsysfile= ;;
-
hpux11)
dnl See comments in sysdep.c:sys_signal.
dnl SA_RESTART resets the timeout of `select' on hpux11.
@@ -3806,12 +3790,9 @@
should not call setpgrp.])
;;
- netbsd | openbsd ) opsysfile= ;;
-
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
on Solaris.])
- opsysfile=
;;
esac
@@ -3865,11 +3846,7 @@
AC_SUBST(CFLAGS)
## Used in lwlib/Makefile.in.
AC_SUBST(X_TOOLKIT_TYPE)
-if test -n "${opsysfile}"; then
- S_FILE="\$(srcdir)/${opsysfile}"
-else
- S_FILE=
-fi
+S_FILE=
AC_SUBST(S_FILE)
AC_SUBST(ns_appdir)
AC_SUBST(ns_appbindir)
@@ -3882,9 +3859,8 @@
[Define to the canonical Emacs configuration name.])
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
[Define to the options passed to configure.])
-if test -n "$opsysfile"; then
- AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
- [Define to the used os dependent file.])
+if test -z "No longer used"; then
+ AC_DEFINE(config_opsysfile, [], [Define to the used os dependent file.])
fi
XMENU_OBJ=
@@ -4247,7 +4223,6 @@
Configured for \`${canonical}'.
Where should the build process find the source code? ${srcdir}
- What operating system file should Emacs use? ${opsysfile:-none}
What compiler should emacs be built with? ${CC} ${CFLAGS}
Should Emacs use the GNU version of malloc?
${GNU_MALLOC}${GNU_MALLOC_reason}
Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109317: * configure.ac (opsysfile, S_FILE): Now they are always empty.,
Glenn Morris <=