aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-07-31 19:12:24 -0400
committerGlenn Morris2012-07-31 19:12:24 -0400
commit68169a334979326ce18b81df8874a34bccc425b9 (patch)
treed91f302f35a75b0e8debfaa19c5dd83c5af64fcb
parent8ad96b1dcc1b88428f7705558c35e89007e52013 (diff)
downloademacs-68169a334979326ce18b81df8874a34bccc425b9.tar.gz
emacs-68169a334979326ce18b81df8874a34bccc425b9.zip
* configure.ac (opsysfile): Use AH_TEMPLATE. Doc fix.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76772a60100..dd206adfcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12012-07-31 Glenn Morris <rgm@gnu.org> 12012-07-31 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.ac (opsysfile): Use AH_TEMPLATE. Doc fix.
4
3 * configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME): 5 * configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME):
4 Move here from src. 6 Move here from src.
5 7
diff --git a/configure.ac b/configure.ac
index c5befd0cc35..7b8766b0c5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3889,9 +3889,8 @@ AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
3889 [Define to the canonical Emacs configuration name.]) 3889 [Define to the canonical Emacs configuration name.])
3890AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", 3890AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
3891 [Define to the options passed to configure.]) 3891 [Define to the options passed to configure.])
3892if test -z "No longer used"; then 3892AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
3893 AC_DEFINE(config_opsysfile, [], [Define to the used os dependent file.]) 3893 define this to include extra configuration information.])
3894fi
3895 3894
3896XMENU_OBJ= 3895XMENU_OBJ=
3897XOBJ= 3896XOBJ=