diff options
Diffstat (limited to 'src/gpg-error-config-main.sh')
-rw-r--r-- | src/gpg-error-config-main.sh | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/gpg-error-config-main.sh b/src/gpg-error-config-main.sh index 37eb193..d7b9c56 100644 --- a/src/gpg-error-config-main.sh +++ b/src/gpg-error-config-main.sh @@ -88,21 +88,36 @@ while test $# -gt 0; do shift done -if [ opt_cflags = yes ]; then - output="$output $(get_attr Cflags)" +cflags="$(get_attr Cflags)" +libs="$(get_attr Libs)" + +mtcflags="$(get_var mtcflags)" +mtlibs="$(get_var mtlibs)" + +requires="$(get_attr Requires)" +cleanup_vars_attrs +pkg_list=$(all_required_config_files $requires) + +for p in $pkg_list; do + read_config_file $p $PKG_CONFIG_PATH + cflags="$cflags $(get_attr Cflags)" + libs="$libs $(get_attr Libs)" + cleanup_vars_attrs +done + +if [ $opt_cflags = yes ]; then + output="$output $cflags" # Backward compatibility to old gpg-error-config if [ $mt = yes ]; then - output="$output $(get_var mtcflags)" + output="$output $mtcflags" fi fi -if [ opt_libs = yes ]; then - output="$output $(get_attr Libs)" +if [ $opt_libs = yes ]; then + output="$output $libs" # Backward compatibility to old gpg-error-config if [ $mt = yes ]; then - output="$output $(get_var mtlibs)" + output="$output $mtlibs" fi fi -# cleanup_vars_attrs - echo $output |