diff options
Diffstat (limited to 'misc/gen-pkgconfig.in')
| -rw-r--r-- | misc/gen-pkgconfig.in | 58 |
1 files changed, 50 insertions, 8 deletions
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index 8f00b824b9e4..5a71ab0203c6 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.44 2020/02/12 00:09:26 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.49 2021/01/24 00:35:28 tom Exp $ ############################################################################## -# Copyright 2018-2019,2020 Thomas E. Dickey # +# Copyright 2018-2020,2021 Thomas E. Dickey # # Copyright 2009-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,6 +44,7 @@ PANEL_NAME=@PANEL_NAME@ MENU_NAME=@MENU_NAME@ FORM_NAME=@FORM_NAME@ CXX_NAME=@CXX_NAME@ + DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@ TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@ CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@ @@ -64,9 +65,11 @@ show_libdir='@libdir@' MAIN_LIBRARY="${LIB_NAME}@USE_ARG_SUFFIX@" SUB_LIBRARY="${TINFO_ARG_SUFFIX}" -PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@" -MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@" + +CXX_LIBRARY="${CXX_NAME}@USE_ARG_SUFFIX@" FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@" +MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@" +PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@" CFLAGS="@PKG_CFLAGS@" if [ "$includedir" != "/usr/include" ]; then @@ -80,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then fi lib_flags= -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ +for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@ do case $opt in -l*) # LIBS is handled specially below @@ -93,10 +96,43 @@ do continue ;; -L*) - [ -d ${opt##-L} ] || continue - case ${opt##-L} in + lib_check=${opt##-L} + [ -d "$lib_check" ] || continue + case "$lib_check" in @LD_SEARCHPATH@) # skip standard libdir - continue + if [ "$lib_check" = "$libdir" ] + then + lib_first=yes + IFS_save="$IFS" + IFS='|' + LIBDIRS="@LD_SEARCHPATH@" + for lib_check in $LIBDIRS + do + if [ -d "$lib_check" ] + then + if [ "$lib_check" != "$libdir" ] + then + lib_first=no + fi + break + fi + done + IFS="$IFS_save" + [ $lib_first = yes ] && continue + found=no + for check in $lib_flags + do + if [ "x$check" = "x$opt" ] + then + found=yes + break + fi + done + [ $found = yes ] && continue + : + else + continue + fi ;; *) found=no @@ -138,6 +174,12 @@ CFGVER=`pkg-config --version 2>/dev/null |head -n 1 | awk -F. '/0.[0-9][0-9]/{pr for name in @PC_MODULES_TO_MAKE@ do name="${name}" + case $name in + form*) name="$FORM_LIBRARY" ;; + menu*) name="$MENU_LIBRARY" ;; + panel*) name="$PANEL_LIBRARY" ;; + ncurses++*) name="$CXX_LIBRARY" ;; + esac LIBS="-l$name" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" |