ncurses 6.1 - patch 20190928

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

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 9db12572aaee3ba385a24ae9e840be1f099232c5..aacd681a743d8aaad93972eb44aa7fed612dda90 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.15 2013/03/16 23:33:34 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
 ##############################################################################
-# Copyright (c) 2009-2012,2013 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"), #
@@ -46,82 +46,113 @@ CXX_NAME=@CXX_NAME@
 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@"
 exec_prefix="@exec_prefix@"
-includedir="@includedir@"
+includedir="@includedir@@includesubdir@"
 libdir="@libdir@"
 
 show_prefix='@prefix@'
 show_exec_prefix='@exec_prefix@'
-show_includedir='@includedir@'
+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}"
-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@"
 
-if test "$includedir" = "/usr/include" ; then
-       CFLAGS=
-else
-       CFLAGS="-I\${includedir}"
+CFLAGS="@PKG_CFLAGS@"
+if [ "$includedir" != "/usr/include" ]; then
+       includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
+       [ "$includetop" = "/usr/include" ] && includetop="$includedir"
+       if [ "x$includetop" != "x$includedir" ]
+       then
+               CFLAGS="$CFLAGS -I${includetop}"
+       fi
+       CFLAGS="$CFLAGS -I\${includedir}"
+fi
+
+LDFLAGS=
+if [ "$libdir" != "/usr/lib" ]; then
+       LDFLAGS="$LDFLAGS -L\${libdir}"
+fi
+if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
+       LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@"
 fi
 
-if test "$libdir" = "/usr/lib" ; then
-       LDFLAGS=
-else
-       LDFLAGS="-L\${libdir}"
+# 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}"
+       LIBS="-l$name"
 
        desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
        reqs=
 
-       if test $name = $MAIN_LIBRARY ; then
+       if [ $name = $MAIN_LIBRARY ]; then
                desc="$desc library"
-       elif test $name = $SUB_LIBRARY ; then
+               [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
+       elif [ $name = $SUB_LIBRARY ]; then
                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
-               reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY"
+               reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
                desc="$desc add-on library"
        else
-               reqs="$MAIN_LIBRARY"
+               reqs="$MAIN_LIBRARY${suffix}"
                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}"
-               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
+
+       if [ $name = $MAIN_LIBRARY ]
+       then
+               main_libs="$PRIVATE_LIBS"
+       else
+               main_libs=
        fi
 
-       echo "** creating ${name}.pc"
-       cat >${name}.pc <<EOF
+       echo "** creating ${name}${suffix}.pc"
+       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
+abi_version=@cf_cv_abi_version@
 major_version=@NCURSES_MAJOR@
 version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
 
-Name: $name
+Name: ${name}${suffix}
 Description: $desc
 Version: \${version}
-URL: http://invisible-island.net/ncurses
+URL: https://invisible-island.net/ncurses
 Requires.private: $reqs
-Libs: $LDFLAGS -l$name
-Libs.private: @LIBS@
+Libs: $LDFLAGS $LIBS
+Libs.private: @LIBS@ $main_libs
 Cflags: $CFLAGS
 EOF
 
-       #pr -f ${name}.pc
 done
-# vile:shmode
+# vile:shmode ts=4 sw=4