[git] GPG-ERROR - branch, gniibe/pkg-config-support, updated. libgpg-error-1.32-28-gf77c968

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, gniibe/pkg-config-support has been updated
       via  f77c9687187419ee8e5bb7b3a2981199ca6a1332 (commit)
       via  aa697dae4c363b3d24ec9be3a0cd41df3bf806ce (commit)
      from  1b025ca89b58cb630530084c49e40166e4a8e089 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f77c9687187419ee8e5bb7b3a2981199ca6a1332
Merge: 1b025ca aa697da
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Sep 4 10:57:43 2018 +0900

    Merge branch 'master' into gniibe/pkg-config-support


commit aa697dae4c363b3d24ec9be3a0cd41df3bf806ce
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Sep 4 10:45:49 2018 +0900

    gpg-error-config: Determine output at configure time.
    
    * src/gpg-error-config.in (isubdirafter): Remove.
    Also for --cflags and --libs.
    * configure.ac (GPG_ERROR_CONFIG_ISUBDIRAFTER): Remove.
    (GPG_ERROR_CONFIG_CFLAGS): Add -idirafter gpg-extra for W32CE.
    (GPG_ERROR_CONFIG_CFLAGS): Decide here if adding -I$includedir.
    (GPG_ERROR_CONFIG_LIBS): Decide here if adding -L$libdir.
    
    --
    
    Don't do string substitution at the time of its command invocation,
    but let it determine at configure time.

diff --git a/configure.ac b/configure.ac
index b5c01ba..089cb7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,19 +483,55 @@ if test "x$LIBMULTITHREAD" != x; then
 else
   GPG_ERROR_CONFIG_MT_LIBS=""
 fi
-GPG_ERROR_CONFIG_CFLAGS=""
+if test "$have_w32ce_system" = yes; then
+  GPG_ERROR_CONFIG_CFLAGS="-idirafter \${includedir}/gpg-extra"
+else
+  GPG_ERROR_CONFIG_CFLAGS=""
+fi
 if test "x$THREADLIB_CPPFLAGS" != x; then
   GPG_ERROR_CONFIG_MT_CFLAGS="${THREADLIB_CPPFLAGS}"
 else
   GPG_ERROR_CONFIG_MT_CFLAGS=""
 fi
-GPG_ERROR_CONFIG_ISUBDIRAFTER=""
 GPG_ERROR_CONFIG_HOST="$host"
+
+case "$includedir" in
+  /usr/include|/include) ;;
+  '${prefix}/include')
+    if test "$prefix" != / -a "$prefix" != /usr; then
+      if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then
+        GPG_ERROR_CONFIG_CFLAGS="-I$includedir"
+      else
+        GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS"
+      fi
+    fi
+    ;;
+  *)
+    if test -z "$GPG_ERROR_CONFIG_CFLAGS"; then
+      GPG_ERROR_CONFIG_CFLAGS="-I$includedir"
+    else
+      GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS"
+    fi
+    ;;
+esac
+case "$libdir" in
+  /usr/lib|/usr/lib64|/lib|/lib64) ;;
+  '${exec_prefix}/lib')
+    if test "$exec_prefix" = "NONE"; then
+      if test "$prefix" != / -a "$prefix" != /usr; then
+        GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS"
+      fi
+    elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then
+      GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS"
+    fi
+    ;;
+  *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;;
+esac
+
 AC_SUBST(GPG_ERROR_CONFIG_LIBS)
 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
 AC_SUBST(GPG_ERROR_CONFIG_MT_LIBS)
 AC_SUBST(GPG_ERROR_CONFIG_MT_CFLAGS)
-AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER)
 AC_SUBST(GPG_ERROR_CONFIG_HOST)
 
 
@@ -510,7 +546,6 @@ if test "$have_w32_system" = yes; then
     fi
     if test "$have_w32ce_system" = yes; then
       AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
-      GPG_ERROR_CONFIG_ISUBDIRAFTER="gpg-extra"
     fi
     force_use_syscfg=yes
 fi
diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
index aa7cb67..93f25f7 100644
--- a/src/gpg-error-config.in
+++ b/src/gpg-error-config.in
@@ -14,7 +14,6 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
-isubdirafter="@GPG_ERROR_CONFIG_ISUBDIRAFTER@"
 
 if echo "$0" | grep gpg-error-config 2>/dev/null >/dev/null; then
   myname="gpg-error-config"
@@ -69,26 +68,12 @@ while test $# -gt 0; do
 	    exit 0
 	    ;;
         --cflags)
-	    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
-		output="$output -I$includedir"
-	    fi
-            # Note: -idirafter is a gcc extension.  It is only used on
-            # systems where gcc is the only compiler we support (WindowsCE).
-            for i in $isubdirafter; do
-                output="$output -idirafter ${includedir}/${i}"
-            done
 	    output="$output @GPG_ERROR_CONFIG_CFLAGS@"
             if test $mt = yes ; then
                 output="$output @GPG_ERROR_CONFIG_MT_CFLAGS@"
             fi
 	    ;;
 	--libs)
-	    case "$libdir" in
-		/usr/lib|/usr/lib64|/lib|/lib64) ;;
-		*)
-		    output="$output -L$libdir"
-		    ;;
-	    esac
 	    output="$output @GPG_ERROR_CONFIG_LIBS@"
             if test $mt = yes ; then
                 output="$output @GPG_ERROR_CONFIG_MT_LIBS@"

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org