#!@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"), #
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
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
;;
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}"