[patch] npth.m4

upgrade-npth.m4.patch (text/plain), 6.84 KB, created by Joe Harvell on 2018-04-25 07:27:19 UTC

--- a/m4/npth.m4	2018-04-25 00:17:45.417296119 -0600
+++ b/m4/npth.m4	2018-04-25 00:54:57.971525728 -0600
@@ -1,5 +1,5 @@
-# npth.m4 - autoconf macro to detect NPTH.
-# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH
+# npth.m4 - autoconf macro to detect libnpth.
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,32 +8,59 @@
 # This file is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Last-changed: 2014-10-02
 
-AC_DEFUN([_AM_PATH_NPTH_CONFIG],
-[ AC_ARG_WITH(npth-prefix,
-            AC_HELP_STRING([--with-npth-prefix=PFX],
-                           [prefix where NPTH is installed (optional)]),
-     npth_config_prefix="$withval", npth_config_prefix="")
-  if test "x$npth_config_prefix" != x ; then
-      NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
-  fi
-  AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
-
-  if test "$NPTH_CONFIG" != "no" ; then
-    npth_version=`$NPTH_CONFIG --version`
-  fi
-  npth_version_major=`echo $npth_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-  npth_version_minor=`echo $npth_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-])
 
 dnl AM_PATH_NPTH([MINIMUM-VERSION,
-dnl               [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libnpth and define NPTH_CFLAGS and NPTH_LIBS.
+dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl
+dnl Test for npth-config and define NPTH_CFLAGS, NPTH_LIBS,
+dnl NPTH_MT_CFLAGS, and NPTH_MT_LIBS.  The _MT_ variants are
+dnl used for programs requiring real multi thread support.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/usr/bin and then along $PATH.  If the used
+dnl config script does not match the host specification the script
+dnl is added to the npth_script_warn variable.
 dnl
 AC_DEFUN([AM_PATH_NPTH],
-[ AC_REQUIRE([_AM_PATH_NPTH_CONFIG])dnl
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  npth_config_prefix=""
+  dnl --with-libnpth-prefix=PFX is the preferred name for this option,
+  dnl since that is consistent with how our three siblings use the directory/
+  dnl package name in --with-$dir_name-prefix=PFX.
+  AC_ARG_WITH(libnpth-prefix,
+              AC_HELP_STRING([--with-libnpth-prefix=PFX],
+                             [prefix where npth is installed (optional)]),
+              [npth_config_prefix="$withval"])
+
+  dnl Accept --with-npth-prefix and make it work the same as
+  dnl --with-libnpth-prefix above, for backwards compatibility,
+  dnl but do not document this old, inconsistently-named option.
+  AC_ARG_WITH(npth-prefix,,
+              [npth_config_prefix="$withval"])
+
+  if test x"${NPTH_CONFIG}" = x ; then
+     if test x"${npth_config_prefix}" != x ; then
+        NPTH_CONFIG="${npth_config_prefix}/usr/bin/npth-config"
+     else
+       case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/usr/bin/npth-config" ; then
+             NPTH_CONFIG="${SYSROOT}/usr/bin/npth-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+       esac
+     fi
+  fi
+
+  AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
   tmp=ifelse([$1], ,1:0.91,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_npth_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -41,72 +68,62 @@
   else
      req_npth_api=1
      min_npth_version="$tmp"
-  fi
+fi
 
   AC_MSG_CHECKING(for NPTH - version >= $min_npth_version)
   ok=no
-  if test "$NPTH_CONFIG" != "no" ; then
+  if test "$NPTH_CONFIG" != "no" \
+     && test -f "$NPTH_CONFIG" ; then
     req_major=`echo $min_npth_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_npth_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    if test "$npth_version_major" -gt "$req_major"; then
+    npth_config_version=`$NPTH_CONFIG $npth_config_args --version`
+    major=`echo $npth_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $npth_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    if test "$major" -gt "$req_major"; then
         ok=yes
     else
-        if test "$npth_version_major" -eq "$req_major"; then
-            if test "$npth_version_minor" -gt "$req_minor"; then
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -ge "$req_minor"; then
                ok=yes
-            else
-               if test "$npth_version_minor" -eq "$req_minor"; then
-                  ok=yes
-               fi
             fi
         fi
     fi
   fi
   if test $ok = yes; then
-    AC_MSG_RESULT([yes ($npth_version)])
-  else
-    AC_MSG_RESULT(no)
-  fi
-  if test $ok = yes; then
-     # If we have a recent NPTH, we should also check that the
-     # API is compatible.
-     if test "$req_npth_api" -gt 0 ; then
-        tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([NPTH API version])
-           if test "$req_npth_api" -eq "$tmp" ; then
-             AC_MSG_RESULT([okay])
-           else
-             ok=no
-             AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp])
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    NPTH_CFLAGS=`$NPTH_CONFIG --cflags`
-    NPTH_LIBS=`$NPTH_CONFIG --libs`
+    NPTH_CFLAGS=`$NPTH_CONFIG $npth_config_args --cflags`
+    NPTH_LIBS=`$NPTH_CONFIG $npth_config_args --libs`
+    NPTH_MT_CFLAGS=`$NPTH_CONFIG $npth_config_args --mt --cflags 2>/dev/null`
+    NPTH_MT_LIBS=`$NPTH_CONFIG $npth_config_args --mt --libs 2>/dev/null`
+    AC_MSG_RESULT([yes ($npth_config_version)])
     ifelse([$2], , :, [$2])
-    npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+    npth_config_host=`$NPTH_CONFIG $npth_config_args --host 2>/dev/null || echo none`
     if test x"$npth_config_host" != xnone ; then
       if test x"$npth_config_host" != x"$host" ; then
-        AC_MSG_WARN([[
+  AC_MSG_WARN([[
 ***
 *** The config script $NPTH_CONFIG was
 *** built for $npth_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-npth-prefix
-*** to specify a matching config script.
+*** to specify a matching config script or use \$SYSROOT.
 ***]])
+        npth_script_warn="$npth_script_warn libnpth"
       fi
     fi
   else
     NPTH_CFLAGS=""
     NPTH_LIBS=""
+    NPTH_MT_CFLAGS=""
+    NPTH_MT_LIBS=""
+    AC_MSG_RESULT(no)
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(NPTH_CFLAGS)
   AC_SUBST(NPTH_LIBS)
+  AC_SUBST(NPTH_MT_CFLAGS)
+  AC_SUBST(NPTH_MT_LIBS)
 ])