summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rwxr-xr-xconfigure3
-rw-r--r--src/config.in4
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d10a3aef1a4..ef1cfba9a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-01 Eli Zaretskii <eliz@gnu.org>
+
+ * configure: Regenerated.
+
+2006-04-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
+
+ * configure.in (HAVE_XAW3D): Disable Xaw3d check if
+ --without-toolkit-scroll-bars was specified.
+
+2006-04-01 Eli Zaretskii <eliz@gnu.org>
+
+ * configure.in (hppa*-hp-hpux1[1-9]*): Add
+ -D_INCLUDE__STDC_A1_SOURCE to CFLAGS. Update Copyright years
+ written to src/config.in.
+
2006-03-18 Claudio Fontana <claudio@gnu.org>
* Makefile.in (INFO_FILES): New variable, contains all Info file names.
diff --git a/configure b/configure
index 624cffc8251..7e0799badae 100755
--- a/configure
+++ b/configure
@@ -2093,6 +2093,7 @@ _ACEOF
;;
hppa*-hp-hpux1[1-9]* )
machine=hp800 opsys=hpux11
+ CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
;;
hppa*-*-linux-gnu* )
@@ -11412,7 +11413,7 @@ fi
### Is -lXaw3d available?
HAVE_XAW3D=no
if test "${HAVE_X11}" = "yes"; then
- if test "${USE_X_TOOLKIT}" != "none"; then
+ if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5
echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6
if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then
diff --git a/src/config.in b/src/config.in
index 11b842c3d00..2bc4ba56e79 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,8 +1,8 @@
/* src/config.in. Generated from configure.in by autoheader. */
/* GNU Emacs site configuration template file.
- Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005,
- 2006 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.