From aa697dae4c363b3d24ec9be3a0cd41df3bf806ce Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 4 Sep 2018 10:45:49 +0900 Subject: 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. --- src/gpg-error-config.in | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src') 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@" -- cgit v1.2.3