ncurses 6.1 - patch 20191123

[ncurses.git] / misc / gen-pkgconfig.in

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index ab38238a6510abb112beaf2650b50a68a57ef308..51a1a649533e740e3ddd61d5780c70ccfafe448f 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: gen-pkgconfig.in,v 1.21 2015/02/21 21:36:31 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.40 2019/10/12 22:27:10 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2009-2014,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -46,6 +46,8 @@ CXX_NAME=@CXX_NAME@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@

+RPATH_LIST=@RPATH_LIST@
+PRIVATE_LIBS="@PRIVATE_LIBS@"

 
 suffix=@PC_MODULE_SUFFIX@
 prefix="@prefix@"
 
 suffix=@PC_MODULE_SUFFIX@
 prefix="@prefix@"


@@ -58,39 +60,80 @@ show_exec_prefix='@exec_prefix@'
 show_includedir='@includedir@@includesubdir@'
 show_libdir='@libdir@'
 
 show_includedir='@includedir@@includesubdir@'
 show_libdir='@libdir@'
 

-MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
+MAIN_LIBRARY="${LIB_NAME}@USE_ARG_SUFFIX@"

 SUB_LIBRARY="${TINFO_ARG_SUFFIX}"
 SUB_LIBRARY="${TINFO_ARG_SUFFIX}"

-PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
-MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
-FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
+PANEL_LIBRARY="${PANEL_NAME}@USE_ARG_SUFFIX@"
+MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
+FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"

 
 CFLAGS="@PKG_CFLAGS@"
 
 CFLAGS="@PKG_CFLAGS@"

-if test "$includedir" != "/usr/include" ; then
-       includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include/,'`
-       test "$includetop" = "/usr/include" && includetop="$includedir"
-       if test "x$includetop" != "$includedir"
+if [ "$includedir" != "/usr/include" ]; then
+       includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
+       [ "$includetop" = "/usr/include" ] && includetop="$includedir"
+       CFLAGS="$CFLAGS -I\${includedir}"
+       if [ "x$includetop" != "x$includedir" ]

        then
                CFLAGS="$CFLAGS -I${includetop}"
        fi
        then
                CFLAGS="$CFLAGS -I${includetop}"
        fi

-       CFLAGS="$CFLAGS -I\${includedir}"

 fi
 
 fi
 

-if test "$libdir" = "/usr/lib" ; then
-       LDFLAGS=
-else
-       LDFLAGS="-L\${libdir}"
+lib_flags=
+for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
+do
+       case $opt in
+       -l*) # LIBS is handled specially below
+               continue
+               ;;
+       -Wl,-z,*) # ignore flags used to manipulate shared image
+               continue
+               ;;
+       -L*)
+               [ -d ${opt##-L} ] || continue
+               case ${opt##-L} in
+               @LD_SEARCHPATH@) # skip standard libdir
+                       continue
+                       ;;
+               *)
+                       found=no
+                       for check in $lib_flags
+                       do
+                               if [ "x$check" = "x$opt" ]
+                               then
+                                       found=yes
+                                       break
+                               fi
+                       done
+                       [ $found = yes ] && continue
+                       ;;
+               esac
+               ;;
+       esac
+       lib_flags="$lib_flags $opt"
+done
+
+# Check if we should specify the tinfo library explicitly so that terminfo
+# functions or curses variables (which also reside in tinfo) can be linked
+# using the -lncurses option.
+NEED_TINFO=no
+if [ "x@TINFO_LIBS@" != "x" ] && \
+   [ "x$TINFO_ARG_SUFFIX" != "x$MAIN_LIBRARY" ]
+then
+       NEED_TINFO=yes

 fi
 
 for name in @PC_MODULES_TO_MAKE@
 do
        name="${name}"
 fi
 
 for name in @PC_MODULES_TO_MAKE@
 do
        name="${name}"

+       LIBS="-l$name"

 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        reqs=
 
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        reqs=
 

-       if test $name = $MAIN_LIBRARY ; then
+       if [ $name = $MAIN_LIBRARY ]; then

                desc="$desc library"
                desc="$desc library"

-       elif test $name = $SUB_LIBRARY ; then
+               [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
+               [ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@"
+       elif [ $name = $SUB_LIBRARY ]; then

                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
                reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
                reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"


@@ -100,32 +143,43 @@ do
                desc="$desc add-on library"
        fi
 
                desc="$desc add-on library"
        fi
 

-       if test $name != $SUB_LIBRARY && test $SUB_LIBRARY != $MAIN_LIBRARY ; then
-               if test $name != $TINFO_NAME ; then
-                       test -n "$reqs" && reqs="$reqs, "
-                       reqs="${reqs}${SUB_LIBRARY}${suffix}"
-               fi
+       if [ $name != $SUB_LIBRARY ] && \
+          [ $SUB_LIBRARY != $MAIN_LIBRARY ] && \
+          [ $name != $TINFO_NAME ] && \
+          [ $NEED_TINFO != yes ] ; then
+               [ -n "$reqs" ] && reqs="$reqs, "
+               reqs="${reqs}${SUB_LIBRARY}${suffix}"

        fi
 
        fi
 

-       echo "** creating ${name}.pc"
+       if [ $name = $MAIN_LIBRARY ]
+       then
+               main_libs="$PRIVATE_LIBS"
+       else
+               main_libs=
+       fi
+
+       echo "** creating ${name}${suffix}.pc"

        cat >${name}${suffix}.pc <<EOF
        cat >${name}${suffix}.pc <<EOF

+# pkg-config file generated by `basename $0`
+# vile:makemode
+

 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir
 includedir=$show_includedir
 prefix=$show_prefix
 exec_prefix=$show_exec_prefix
 libdir=$show_libdir
 includedir=$show_includedir

+abi_version=@cf_cv_abi_version@

 major_version=@NCURSES_MAJOR@
 version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 
 Name: ${name}${suffix}
 Description: $desc
 Version: \${version}
 major_version=@NCURSES_MAJOR@
 version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 
 Name: ${name}${suffix}
 Description: $desc
 Version: \${version}

-URL: http://invisible-island.net/ncurses
+URL: https://invisible-island.net/ncurses

 Requires.private: $reqs
 Requires.private: $reqs

-Libs: $LDFLAGS -l$name
-Libs.private: @LIBS@
+Libs: $lib_flags $LIBS
+Libs.private: @LIBS@ $main_libs

 Cflags: $CFLAGS
 EOF
 
 Cflags: $CFLAGS
 EOF
 

-       #pr -f ${name}.pc

 done
 done

-# vile:shmode
+# vile:shmode ts=4 sw=4