two osf5 build fixes for gnupg 1.0.3

[Tim Mooney]

gnupg uses several bits borrowed from (older) libtool releases.  Both of
the changes (one is for 4.0f and later, the other is 5.x specific) included
in the patch below have already been incorporated into libtool (the nm fix
is in CVS, the osf 5 PIC fix is in 1.3.5).

Problem #1: gnupg doesn't realize that PIC is possible on Tru64 UNIX 5.x,
since `osf5*' isn't a target in the PIC macro.  Easy fix.  Without the patch,
gnupg's configure says it will build several modules dynamically but it
doesn't since it doesn't think there's a way to do PIC.

Problem #2: gnupg can't find a BSD-compatible nm on 4.0f and later because
the output format on error changed slightly, and the test isn't realizing
that it's found an `nm' that groks `-B'.


Updating the gnupg macros from very recent libtool would obviate the need
for either of these patches.

Tim
-- 
Tim Mooney                              mooney at dogbert.cc.ndsu.NoDak.edu
Information Technology Services         (701) 231-1076 (Voice)
Room 242-J1, IACC Building              (701) 231-8541 (Fax)
North Dakota State University, Fargo, ND 58105-5164


diff -ur gnupg-1.0.3.orig/acinclude.m4 gnupg-1.0.3/acinclude.m4
--- gnupg-1.0.3.orig/acinclude.m4	Thu Sep 14 04:24:02 2000
+++ gnupg-1.0.3/acinclude.m4	Tue Sep 19 13:53:19 2000
@@ -188,7 +188,7 @@
                 # PIC (with -KPIC) is the default.
                 ;;
 
-              osf3* | osf4*)
+              osf3* | osf4* | osf5* )
                 # FIXME - pic_flag is probably required for
                 # hppa*-osf* and i860-osf*
                 ;;
@@ -444,9 +444,12 @@
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+      # Adding the `| object' to the egrep allows Tru64 4.0f+'s nm to be
+      # found, since it doesn't output a filename, just:
+      #   nm: Invalid file or object type
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null| object)' >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null| object)' >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -p"
       else
         ac_cv_path_NM="$ac_dir/nm"
diff -ur gnupg-1.0.3.orig/aclocal.m4 gnupg-1.0.3/aclocal.m4
--- gnupg-1.0.3.orig/aclocal.m4	Thu Sep 14 07:22:51 2000
+++ gnupg-1.0.3/aclocal.m4	Tue Sep 19 13:54:29 2000
@@ -198,7 +198,7 @@
                 # PIC (with -KPIC) is the default.
                 ;;
 
-              osf3* | osf4*)
+              osf3* | osf4* | osf5*)
                 # FIXME - pic_flag is probably required for
                 # hppa*-osf* and i860-osf*
                 ;;
@@ -447,9 +447,12 @@
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+      # Adding the `| object' to the egrep allows Tru64 4.0f+'s nm to be
+      # found, since it doesn't output a filename, just:
+      #   nm: Invalid file or object type
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null| object)' >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null| object)' >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -p"
       else
         ac_cv_path_NM="$ac_dir/nm"