ncurses 6.1 - patch 20190309

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

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index a68f17143334321d53d3ba769d5e2e294af3dd37..7a6180f83158431f5f6ca47e7c043e7c4929bb66 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.34 2015/04/18 17:25:07 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"), #
@@ -49,7 +49,7 @@ THIS="@LIB_NAME@@USE_LIB_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
-includesubdir="@includedir@/${THIS}@EXTRA_SUFFIX@"
+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
@@ -117,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
                ;;
@@ -145,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}"