diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 29 |
1 files changed, 17 insertions, 12 deletions
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 | |||
1094 | fi | 1094 | fi |
1095 | 1095 | ||
1096 | # Use ip address instead of hostname in $DISPLAY | 1096 | # Use ip address instead of hostname in $DISPLAY |
1097 | DISPLAY_HACK_MSG="no" | 1097 | if test ! -z "$IPADDR_IN_DISPLAY" ; then |
1098 | AC_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 | [ | 1100 | else |
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 | ) | ||
1111 | fi | ||
1107 | 1112 | ||
1108 | # Whether to mess with the default path | 1113 | # Whether to mess with the default path |
1109 | SERVER_PATH_MSG="(default)" | 1114 | SERVER_PATH_MSG="(default)" |