ncurses 6.1 - patch 20190831
[ncurses.git] / misc / ncurses-config.in
index a616bb648dd9de18e2dbd6138a0cb248d50607eb..7a6180f83158431f5f6ca47e7c043e7c4929bb66 100644 (file)
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.32 2015/02/21 21:36:16 tom Exp $
+# $Id: ncurses-config.in,v 1.37 2018/06/09 22:29:01 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2012,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2017,2018 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"), #
@@ -45,10 +45,12 @@ datarootdir="@datarootdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
-THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
+THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
+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.
@@ -78,7 +80,7 @@ fi
 #      <ncurses@LIB_SUFFIX@/curses.h>
 if test x@WITH_OVERWRITE@ = xno ; then
        case $includedir in
-       $prefix/include/ncurses@LIB_SUFFIX@)
+       $prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
                includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
                ;;
        esac
@@ -99,7 +101,7 @@ while test $# -gt 0; do
        --cflags)
                INCS="@PKG_CFLAGS@"
                if test "x@WITH_OVERWRITE@" = xno ; then
-                       INCS="$INCS -I${includedir}/${THIS}"
+                       INCS="$INCS -I${includesubdir}"
                fi
                if test "${includedir}" != /usr/include ; then
                        INCS="$INCS -I${includedir}"
@@ -115,13 +117,14 @@ ENDECHO
                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@
+                       $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@
+                       $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} $LIBS
 ENDECHO
                fi
                ;;
@@ -143,7 +146,13 @@ ENDECHO
                echo "${datadir}"
                ;;
        --includedir)
-               echo "${includedir}"
+               INCS=
+               if test "x@WITH_OVERWRITE@" = xno ; then
+                       INCS="${includesubdir}"
+               elif test "${includedir}" != /usr/include ; then
+                       INCS="${includedir}"
+               fi
+               echo $INCS
                ;;
        --libdir)
                echo "${libdir}"
@@ -163,7 +172,7 @@ ENDECHO
        # general info
        --help)
                cat <<ENDHELP
-Usage: ${THIS}-config [options]
+Usage: `basename $0` [options]
 
 Options:
   --prefix           echos the package-prefix of ${THIS}