From 9ff8764d6b01129fea3764f64ee81f13cb15dffa Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Tue, 9 Jan 2018 18:59:19 -0500
Subject: [PATCH] From Mark Hessling: "Ensure -DPDC_WIDE is promulgated through
 to xcurses-config so that projects using XCurses get the correct keyboard
 values."

---
 x11/configure.ac      |  5 ++++-
 x11/xcurses-config.in | 15 +++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/x11/configure.ac b/x11/configure.ac
index 19c46000..9566546d 100644
--- a/x11/configure.ac
+++ b/x11/configure.ac
@@ -119,9 +119,12 @@ AC_ARG_ENABLE(widec,
 	[with_widec=$enableval],
 	[with_widec=no],
 )
+PDC_WIDE=""
 if test "$with_widec" = yes; then
-	SYS_DEFS="$SYS_DEFS -DPDC_WIDE"
+	PDC_WIDE="-DPDC_WIDE"
+	SYS_DEFS="$SYS_DEFS $PDC_WIDE"
 fi
+AC_SUBST(PDC_WIDE)
 
 dnl -------------------- check for XIM support -----------------------
 dnl allow --enable-xim to include XIM support
diff --git a/x11/xcurses-config.in b/x11/xcurses-config.in
index d58dbbba..8888f44b 100644
--- a/x11/xcurses-config.in
+++ b/x11/xcurses-config.in
@@ -8,6 +8,7 @@ verdot=3.4
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libdir=@libdir@
 includedir=@includedir@/xcurses
 
 usage()
@@ -18,9 +19,11 @@ usage()
     echo ""
     echo "  --help         display this help and exit"
     echo "  --cflags       pre-processor and compiler flags"
-    echo "                 [-I$includedir]"
+    echo "                 [-I$includedir @PDC_WIDE@]"
     echo "  --libs         library linking information"
-    echo "                 [-L$prefix/lib -lXCurses @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@"
+    echo "                 [-L$libdir -lXCurses @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@"
+    echo "  --libs-static  static library linking information (libXCurses only)"
+    echo "                 [$libdir/libXCurses.a @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@"
     echo "  --prefix       PDCurses install prefix"
     echo "                 [$prefix]"
     echo "  --version      output version information"
@@ -56,11 +59,15 @@ while test $# -gt 0; do
        ;;
 
     --cflags)
-       echo -I$includedir
+       echo -I$includedir @PDC_WIDE@
        ;;
 
     --libs)
-       echo -L$prefix/lib -lXCurses @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
+       echo -L$libdir -lXCurses @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
+       ;;
+
+    --libs-static)
+       echo $libdir/libXCurses.a @LDFLAGS@ @MH_XLIBS@ @MH_EXTRA_LIBS@
        ;;
 
     *)