summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.in29
2 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 6042b2d55..d1bfec9bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 - (djm) HPUX 11 needs USE_PIPES as well: Kevin Steves 5 - (djm) HPUX 11 needs USE_PIPES as well: Kevin Steves
6 <stevesk@sweden.hp.com> 6 <stevesk@sweden.hp.com>
7 - (djm) Quieten the pam delete credentials error message 7 - (djm) Quieten the pam delete credentials error message
8 - (djm) Fix printing of $DISPLAY hack if set by system type. Report from
9 Kevin Steves <stevesk@sweden.hp.com>
8 10
920000829 1120000829
10 - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert 12 - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert
diff --git a/configure.in b/configure.in
index 4e5567a96..5321aedc4 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ case "$host" in
59 CFLAGS="$CFLAGS -Ae" 59 CFLAGS="$CFLAGS -Ae"
60 fi 60 fi
61 CFLAGS="$CFLAGS -D_HPUX_SOURCE" 61 CFLAGS="$CFLAGS -D_HPUX_SOURCE"
62 AC_DEFINE(IPADDR_IN_DISPLAY) 62 IPADDR_IN_DISPLAY=yes
63 AC_DEFINE(USE_PIPES) 63 AC_DEFINE(USE_PIPES)
64 AC_MSG_CHECKING(for HPUX trusted system password database) 64 AC_MSG_CHECKING(for HPUX trusted system password database)
65 if test -f /tcb/files/auth/system/default; then 65 if test -f /tcb/files/auth/system/default; then
@@ -76,7 +76,7 @@ case "$host" in
76 ;; 76 ;;
77*-*-hpux11*) 77*-*-hpux11*)
78 CFLAGS="$CFLAGS -D_HPUX_SOURCE" 78 CFLAGS="$CFLAGS -D_HPUX_SOURCE"
79 AC_DEFINE(IPADDR_IN_DISPLAY) 79 IPADDR_IN_DISPLAY=yes
80 AC_DEFINE(USE_PIPES) 80 AC_DEFINE(USE_PIPES)
81 AC_MSG_CHECKING(for HPUX trusted system password database) 81 AC_MSG_CHECKING(for HPUX trusted system password database)
82 if test -f /tcb/files/auth/system/default; then 82 if test -f /tcb/files/auth/system/default; then
@@ -1094,16 +1094,21 @@ if test -z "$disable_shadow" ; then
1094fi 1094fi
1095 1095
1096# Use ip address instead of hostname in $DISPLAY 1096# Use ip address instead of hostname in $DISPLAY
1097DISPLAY_HACK_MSG="no" 1097if test ! -z "$IPADDR_IN_DISPLAY" ; then
1098AC_ARG_WITH(ipaddr-display, 1098 DISPLAY_HACK_MSG="yes"
1099 [ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY], 1099 AC_DEFINE(IPADDR_IN_DISPLAY)
1100 [ 1100else
1101 if test "x$withval" != "xno" ; then 1101 DISPLAY_HACK_MSG="no"
1102 AC_DEFINE(IPADDR_IN_DISPLAY) 1102 AC_ARG_WITH(ipaddr-display,
1103 DISPLAY_HACK_MSG="yes" 1103 [ --with-ipaddr-display Use ip address instead of hostname in \$DISPLAY],
1104 fi 1104 [
1105 ] 1105 if test "x$withval" != "xno" ; then
1106) 1106 AC_DEFINE(IPADDR_IN_DISPLAY)
1107 DISPLAY_HACK_MSG="yes"
1108 fi
1109 ]
1110 )
1111fi
1107 1112
1108# Whether to mess with the default path 1113# Whether to mess with the default path
1109SERVER_PATH_MSG="(default)" 1114SERVER_PATH_MSG="(default)"