ncurses 6.1 - patch 20191005

[ncurses.git] / misc / ncurses-config.in

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 7a6180f83158431f5f6ca47e7c043e7c4929bb66..e95227e3f3dc2d343723cbc990fa16ad7a061314 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: ncurses-config.in,v 1.37 2018/06/09 22:29:01 tom Exp $
+# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $

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

-# Copyright (c) 2006-2017,2018 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-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"), #


@@ -54,7 +54,7 @@ includesubdir="@includedir@/${THIS}"
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
 # in some special cases of installation using a relative path.
 # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
 # We cannot filter it out within the build-process since the variable is used
 # in some special cases of installation using a relative path.

-if test -n "$RPATH_LIST"
+if [ -n "$RPATH_LIST" ]

 then
        save_IFS="$IFS"
        IFS='@PATH_SEPARATOR@'
 then
        save_IFS="$IFS"
        IFS='@PATH_SEPARATOR@'


@@ -65,7 +65,7 @@ then
                ./*|../*|*/..|*/../*)
                        ;;
                *)
                ./*|../*|*/..|*/../*)
                        ;;
                *)

-                       test -n "$filtered" && filtered="${filtered}@PATH_SEPARATOR@"
+                       [ -n "$filtered" ] && filtered="${filtered}@PATH_SEPARATOR@"

                        filtered="${filtered}${item}"
                        ;;
                esac
                        filtered="${filtered}${item}"
                        ;;
                esac


@@ -78,7 +78,7 @@ fi
 # with --disable-overwrite, we installed into a subdirectory, but transformed
 # the headers to include like this:
 #      <ncurses@LIB_SUFFIX@/curses.h>
 # with --disable-overwrite, we installed into a subdirectory, but transformed
 # the headers to include like this:
 #      <ncurses@LIB_SUFFIX@/curses.h>

-if test x@WITH_OVERWRITE@ = xno ; then
+if [ x@WITH_OVERWRITE@ = xno ]; then

        case $includedir in
        $prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
                includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
        case $includedir in
        $prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
                includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`


@@ -86,9 +86,50 @@ if test x@WITH_OVERWRITE@ = xno ; then
        esac
 fi
 
        esac
 fi
 

-test $# = 0 && exec @SHELL@ $0 --error
+LIBS="@LIBS@"
+if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
+       LIBS="-l${THIS} $LIBS"
+else
+       LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
+fi
+
+# Ignore -L options which do not correspond to an actual directory, or which
+# are standard library directories (i.e., the linker is supposed to search
+# those directories).
+#
+# There is no portable way to find the list of standard library directories. 
+# Require a POSIX shell anyway, to keep this simple.
+lib_flags=
+for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
+do
+       case $opt in
+       -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
+
+[ $# = 0 ] && exec @SHELL@ $0 --error

 
 

-while test $# -gt 0; do
+while [ $# -gt 0 ]; do

        case "$1" in
        # basic configuration
        --prefix)
        case "$1" in
        # basic configuration
        --prefix)


@@ -100,10 +141,10 @@ while test $# -gt 0; do
        # compile/link
        --cflags)
                INCS="@PKG_CFLAGS@"
        # compile/link
        --cflags)
                INCS="@PKG_CFLAGS@"

-               if test "x@WITH_OVERWRITE@" = xno ; then
+               if [ "x@WITH_OVERWRITE@" = xno ]; then

                        INCS="$INCS -I${includesubdir}"
                fi
                        INCS="$INCS -I${includesubdir}"
                fi

-               if test "${includedir}" != /usr/include ; then
+               if [ "${includedir}" != /usr/include ]; then

                        INCS="$INCS -I${includedir}"
                fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
                        INCS="$INCS -I${includedir}"
                fi
                sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO


@@ -111,22 +152,54 @@ while test $# -gt 0; do
 ENDECHO
                ;;
        --libs)
 ENDECHO
                ;;
        --libs)

-               if test "$libdir" = /usr/lib
-               then
-                       LIBDIR=
-               else
-                       LIBDIR=-L$libdir
-               fi
-               LIBS="@LIBS@ @PRIVATE_LIBS@"
-               if test @TINFO_NAME@ = @LIB_NAME@ ; then
-               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-                       $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} $LIBS
-ENDECHO
-               else
-               sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-                       $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} $LIBS
-ENDECHO
-               fi
+               OPTS=
+               for opt in $lib_flags
+               do
+                       [ -n "$OPTS" ] && OPTS="$OPTS "
+                       OPTS="${OPTS}${opt}"
+               done
+               printf "%s\n" "$OPTS"
+               ;;
+       --libs-only-L)
+               OPTS=
+               for opt in $lib_flags
+               do
+                       case "x$opt" in
+                       x-L*)
+                               [ -n "$OPTS" ] && OPTS="$OPTS "
+                               OPTS="${OPTS}${opt}"
+                               ;;
+                       esac
+               done
+               printf "%s\n" "$OPTS"
+               ;;
+       --libs-only-l)
+               OPTS=
+               for opt in $lib_flags
+               do
+                       case "x$opt" in
+                       x-l*)
+                               [ -n "$OPTS" ] && OPTS="$OPTS "
+                               OPTS="${OPTS}${opt}"
+                               ;;
+                       esac
+               done
+               printf "%s\n" "$OPTS"
+               ;;
+       --libs-only-other)
+               OPTS=
+               for opt in $lib_flags
+               do
+                       case "x$opt" in
+                       x-[lL]*)
+                               ;;
+                       *)
+                               [ -n "$OPTS" ] && OPTS="$OPTS "
+                               OPTS="${OPTS}${opt}"
+                               ;;
+                       esac
+               done
+               printf "%s\n" "$OPTS"

                ;;
        # identification
        --version)
                ;;
        # identification
        --version)


@@ -147,9 +220,9 @@ ENDECHO
                ;;
        --includedir)
                INCS=
                ;;
        --includedir)
                INCS=

-               if test "x@WITH_OVERWRITE@" = xno ; then
+               if [ "x@WITH_OVERWRITE@" = xno ]; then

                        INCS="${includesubdir}"
                        INCS="${includesubdir}"

-               elif test "${includedir}" != /usr/include ; then
+               elif [ "${includedir}" != /usr/include ]; then

                        INCS="${includedir}"
                fi
                echo $INCS
                        INCS="${includedir}"
                fi
                echo $INCS


@@ -181,6 +254,10 @@ Options:
   --cflags           echos the C compiler flags needed to compile with ${THIS}
   --libs             echos the libraries needed to link with ${THIS}
 
   --cflags           echos the C compiler flags needed to compile with ${THIS}
   --libs             echos the libraries needed to link with ${THIS}
 

+  --libs-only-L      echos -L linker options (search path) for ${THIS}
+  --libs-only-l      echos -l linker options (libraries) for ${THIS}
+  --libs-only-other  echos linker options other than -L/-l
+

   --version          echos the release+patchdate version of ${THIS}
   --abi-version      echos the ABI version of ${THIS}
   --mouse-version    echos the mouse-interface version of ${THIS}
   --version          echos the release+patchdate version of ${THIS}
   --abi-version      echos the ABI version of ${THIS}
   --mouse-version    echos the mouse-interface version of ${THIS}