diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2018-09-03 11:29:00 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2018-09-03 11:29:00 +0900 |
| commit | 8a6ca0194b6c4ba5dd839c25f97e594017fcd7e7 (patch) | |
| tree | eb199d8a916bc5b89f0130a2361f9cd520df5de0 | |
| parent | 5a30c1dc7843abe252dc870a51e5510ebf291d96 (diff) | |
| download | libgpg-error-8a6ca0194b6c4ba5dd839c25f97e594017fcd7e7.tar.gz | |
Fix old gpg-config-error with configure.ac substitution.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gpg-error-config.in | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 9d629d4..16896a6 100644 --- a/configure.ac +++ b/configure.ac @@ -495,11 +495,11 @@ else fi GPG_ERROR_CONFIG_HOST="$host" case "$includedir" in - '${prefix}/include'|/usr/include|/include) ;; + /usr/include|/include) ;; *) GPG_ERROR_CONFIG_CFLAGS="-I$includedir $GPG_ERROR_CONFIG_CFLAGS" ;; esac case "$libdir" in - '${exec_prefix}/lib'|/usr/lib|/usr/lib64|/lib|/lib64) ;; + /usr/lib|/usr/lib64|/lib|/lib64) ;; *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; esac diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in index 92bc13a..93f25f7 100644 --- a/src/gpg-error-config.in +++ b/src/gpg-error-config.in @@ -68,21 +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 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@" |