* Updates to old port for HP-UX 9.X, after work with Martin Trusler.

4 files changed, 68 insertions, 6 deletions

diff --git a/configure b/configure
index c37cd657..239a33d4 100755
--- a/configure
+++ b/configure
@@ -929,6 +929,7 @@ with_system_mail_directory
 with_c_client_target
 with_bundled_tools
 with_ipv6
+with_dlopen
 with_ntlm
 '
       ac_precious_vars='build_alias
@@ -1785,6 +1786,8 @@ Optional Packages:
                           --with-bundled-tools=no
   --without-ipv6          Disable IPv6, primarily to work around resolver
                           problems
+  --without-dlopen        Do not test for dlopen because this system does not
+                          need it
   --without-ntlm          Disable NTLM client support
 
 Some influential environment variables:
@@ -17115,6 +17118,8 @@ elif test -d /usr/local/ssl ; then
   alpine_SSLDIR="/usr/local/ssl"
   alpine_SSLINCLUDE="$alpine_SSLDIR/include"
   alpine_SSLLIB="$alpine_SSLDIR/lib"
+  alpine_SSLCERTS="$alpine_SSLDIR/certs"
+  alpine_SSLTYPE="nopwd"
 else
     case $host in
     *-linux*|*-k*bsd*-gnu*|*-gnu*)
@@ -17876,6 +17881,12 @@ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
     ;;
+  *-*-hpux9*)
+    systype="HPP"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="gh9"
+    ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
@@ -18275,7 +18286,18 @@ $as_echo "#define HAS_TERMCAP 1" >>confdefs.h
     ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+alpine_dlopen="yes"
+
+# Check whether --with-dlopen was given.
+if test "${with_dlopen+set}" = set; then :
+  withval=$with_dlopen;
+     alpine_dlopen=$withval
+
+fi
+
+
+if test "x$alpine_dlopen" != "xno" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -18333,11 +18355,11 @@ else
    alpine_DL="none"
 fi
 
-if test "x$alpine_DL" = "xnone" ; then
+  if test "x$alpine_DL" = "xnone" ; then
     as_fn_error $? "No library containing dlopen found" "$LINENO" 5
     exit 1
+  fi
 fi
-
 if test "x$alpine_SSLTYPE" != "xnone" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenSSL is LibreSSL" >&5
 $as_echo_n "checking if OpenSSL is LibreSSL... " >&6; }
diff --git a/configure.ac b/configure.ac
index aee1a29e..90a0bd3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,6 +716,8 @@ dnl is the one intended to be used.
   alpine_SSLDIR="/usr/local/ssl"
   alpine_SSLINCLUDE="$alpine_SSLDIR/include" 
   alpine_SSLLIB="$alpine_SSLDIR/lib"
+  alpine_SSLCERTS="$alpine_SSLDIR/certs"
+  alpine_SSLTYPE="nopwd"
 else
   dnl preload c-client default locations/options
   case $host in
@@ -1311,6 +1313,12 @@ case "$host" in
     alpine_mode_readonly="(0600)"
     alpine_c_client_target="neb"
     ;;
+  *-*-hpux9*)
+    systype="HPP"
+    alpine_path_delim="/"
+    alpine_mode_readonly="(0600)"
+    alpine_c_client_target="gh9"
+    ;;
   *-*-dragonfly*)
     systype="DFB"
     alpine_path_delim="/"
@@ -1461,13 +1469,22 @@ case $alpine_termdata in
     ;;
 esac
 
+dnl check if user want us to add dl or ldl before we actually test for it
+alpine_dlopen="yes"
+AC_ARG_WITH(dlopen,
+ AS_HELP_STRING([--without-dlopen],[Do not test for dlopen because this system does not need it]),
+   [
+     alpine_dlopen=$withval
+   ])
+
 dnl is -ldl present? if so, add it
-AC_SEARCH_LIBS([dlopen], [dl dld],, [ alpine_DL="none" ])
-if test "x$alpine_DL" = "xnone" ; then
+if test "x$alpine_dlopen" != "xno" ; then
+  AC_SEARCH_LIBS([dlopen], [dl dld],, [ alpine_DL="none" ])
+  if test "x$alpine_DL" = "xnone" ; then
     AC_MSG_ERROR([No library containing dlopen found])
     exit 1	
+  fi
 fi
-
 dnl Check if openssl = LibreSSL
 if test "x$alpine_SSLTYPE" != "xnone" ; then
   AC_MSG_CHECKING([if OpenSSL is LibreSSL])
diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c
index 0a9b6566..ffecf753 100644
--- a/imap/src/c-client/utf8.c
+++ b/imap/src/c-client/utf8.c
@@ -325,6 +325,8 @@ static const CHARSET utf8_csvalid[] = {
      (void *) ibm_869tab,SC_GREEK,"ISO-8859-7"},
   {"IBM874",CT_1BYTE,CF_PRIMARY | CF_DISPLAY,
      (void *) ibm_874tab,SC_THAI,"ISO-8859-11"},
+  {"ROMAN8",CT_1BYTE,CF_PRIMARY | CF_DISPLAY,
+     (void *) ibm_1051tab,SC_LATIN_1,"ISO-8859-1"},
 				/* deepest sigh */
   {"ANSI_X3.4-1968",CT_ASCII,CF_DISPLAY,
      NIL,NIL,"US-ASCII"},
diff --git a/imap/src/charset/ibm.c b/imap/src/charset/ibm.c
index 1a717329..060f6d3e 100644
--- a/imap/src/charset/ibm.c
+++ b/imap/src/charset/ibm.c
@@ -345,3 +345,24 @@ static const unsigned short ibm_874tab[128] = {
   0x0e50,0x0e51,0x0e52,0x0e53,0x0e54,0x0e55,0x0e56,0x0e57,
   0x0e58,0x0e59,0x0e5a,0x0e5b,UBOGON,UBOGON,UBOGON,UBOGON
 };
+
+
+				/* HP Roman8 = IBM 1051 */
+static const unsigned short ibm_1051tab[128] = {
+  UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,
+  UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,
+  UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,
+  UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,UBOGON,
+  0x00a0,0x00c0,0x00c2,0x00c8,0x00ca,0x00cb,0x00ce,0x00cf,
+  0x00b4,0x0060,0x02c6,0x00a8,0x02dc,0x00d9,0x00db,0x20a4,
+  0x00af,0x00dd,0x00fd,0x00b0,0x00c7,0x00e7,0x00d1,0x00f1,
+  0x00a1,0x00bf,0x00a4,0x00a3,0x00a5,0x00a7,0x0192,0x00a2,
+  0x00e2,0x00ea,0x00f4,0x00fb,0x00e1,0x00e9,0x00f3,0x00fa,
+  0x00e0,0x00e8,0x00f2,0x00f9,0x00e4,0x00eb,0x00f6,0x00fc,
+  0x00c5,0x00ee,0x00d8,0x00c6,0x00e5,0x00ed,0x00f8,0x00e6,
+  0x00c4,0x00ec,0x00d6,0x00dc,0x00c9,0x00ef,0x00df,0x00d4,
+  0x00c1,0x00c3,0x00e3,0x00d0,0x00f0,0x00cd,0x00cc,0x00d3,
+  0x00d2,0x00d5,0x00f5,0x0160,0x0161,0x00da,0x0178,0x00ff,
+  0x00de,0x00fe,0x00b7,0x00b5,0x00b6,0x00be,0x002d,0x00bc,
+  0x00bd,0x00aa,0x00ba,0x00ab,0x25a0,0x00bb,0x00b1,UBOGON
+};