From Mark Hessling: "Ensure -DPDC_WIDE is promulgated through to

xcurses-config so that projects using XCurses get the correct keyboard
values."
This commit is contained in:
William McBrine
2018-01-09 18:59:19 -05:00
parent 549aca1ffc
commit 9ff8764d6b
2 changed files with 15 additions and 5 deletions

View File

@@ -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

View File

@@ -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@
;;
*)