Author: gs Date: Wed Jun 9 11:20:55 2010 New Revision: 62100 URL: http://svn.opensuse.org/viewcvs/yast?rev=62100&view=rev Log: Use ncursesw6-config to get includes for ncurses6 library 2.19.3 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/configure.in.in trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes trunk/ncurses-pkg/src/Makefile.am trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=62100&r1=62099&r2=62100&view=diff ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Wed Jun 9 11:20:55 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/ncurses-pkg/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/configure.in.in?rev=62100&r1=62099&r2=62100&view=diff ============================================================================== --- trunk/ncurses-pkg/configure.in.in (original) +++ trunk/ncurses-pkg/configure.in.in Wed Jun 9 11:20:55 2010 @@ -8,10 +8,19 @@ @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-PROGRAM@ +## in case of switching back to ncurses5 remember to adjust +## configure.in.in from package yast2-ncurses as well +AC_PATH_PROGS(NCURSES_CONFIG,ncursesw6-config ncursesw5-config,none) + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" + +fi + ## SUSE ncurses do not need the wide include ## but other distros do, #201705 -AC_CHECK_HEADER([ncursesw/curses.h], - [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) +AC_CHECK_HEADER([ncursesw/curses.h]) PKG_CHECK_MODULES([ZYPP], [libzypp]) Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes?rev=62100&r1=62099&r2=62100&view=diff ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Jun 9 11:20:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 9 09:59:56 CEST 2010 - gs@suse.de + +- Use ncursesw6-config to get includes for ncurses6 library +- 2.19.3 + +------------------------------------------------------------------- Wed May 26 13:43:53 CEST 2010 - gs@suse.de - Use ncurses6 library (adjust INCLUDES in Makefile.am, require Modified: trunk/ncurses-pkg/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/Makefile.am?rev=62100&r1=62099&r2=62100&view=diff ============================================================================== --- trunk/ncurses-pkg/src/Makefile.am (original) +++ trunk/ncurses-pkg/src/Makefile.am Wed Jun 9 11:20:55 2010 @@ -75,5 +75,5 @@ NCPkgStrings.cc -INCLUDES = -I/usr/include/ncurses6/ncursesw -I/usr/include/ncurses6 -I$(includedir) -I$(includedir)/yui -I$(includedir)/ncurses ${ZYPP_CFLAGS} +INCLUDES = $(CPPFLAGS) -I$(includedir) -I$(includedir)/yui -I$(includedir)/ncurses ${ZYPP_CFLAGS} Modified: trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in?rev=62100&r1=62099&r2=62100&view=diff ============================================================================== --- trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in (original) +++ trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Wed Jun 9 11:20:55 2010 @@ -15,7 +15,7 @@ BuildRequires: yast2-libyui-devel >= 2.17.14 BuildRequires: libzypp-devel >= 7.4.0 Requires: yast2-core >= 2.16.33 -#addItem(item, true) +#ncurses6 library Requires: yast2-ncurses >= 2.19.5 Requires: libzypp >= 7.4.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org