* [gentoo-commits] gentoo-x86 commit in sys-apps/qingy/files: qingy-1.0.0-tinfo.patch
@ 2013-03-05 10:10 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2013-03-05 10:10 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/05 10:10:31
Added: qingy-1.0.0-tinfo.patch
Log:
Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.1 sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch?rev=1.1&content-type=text/plain
Index: qingy-1.0.0-tinfo.patch
===================================================================
Use ncurses.pc to get Libs: instead of using AC_CHECK_LIB because ncurses can be configured
to have separate termcap library called libtinfo; and we need both -ltinfo and -lncurses for
linking since symbols are used from both
http://bugs.gentoo.org/459650
--- configure.in
+++ configure.in
@@ -125,12 +125,7 @@
# End compile emacs stuff
# Check for ncurses
- HEADERS="curses.h term.h"
- NCURSESLIB=""
- AC_CHECK_HEADERS([$HEADERS],,[AC_MSG_ERROR([$HEADERS_ERROR_MESSAGE])],)
- AC_CHECK_LIB(ncurses, setupterm, [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , )
- AC_CHECK_LIB(ncurses, tputs, [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , )
- AC_SUBST(NCURSESLIB)
+ PKG_CHECK_MODULES(NCURSES, ncurses, [], [AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])])
# End check for ncurses
# Check for PAM support
--- src/libraries/Makefile.am
+++ src/libraries/Makefile.am
@@ -4,7 +4,7 @@
INCLUDES = -I../.. -I../
BUILT_SOURCES = parse_settings.h
-AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\"
+AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" $(NCURSES_CFLAGS)
if !WANT_STATIC
pkglib_LTLIBRARIES = libqingy.la
@@ -35,7 +35,7 @@
EXTRA_libqingy_la_SOURCES = \
crypto_openssl.c crypto_libgcrypt.c crypto.h
-libqingy_la_LIBADD = @PASSWDLIB@ @CRYPTOLIB@ @NCURSESLIB@ @XLIBS@
+libqingy_la_LIBADD = @PASSWDLIB@ @CRYPTOLIB@ @XLIBS@ $(NCURSES_LIBS)
libqingy_la_LDFLAGS = -release @VERSION@
libqingy_static_la_SOURCES = $(libqingy_la_SOURCES)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-05 10:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 10:10 [gentoo-commits] gentoo-x86 commit in sys-apps/qingy/files: qingy-1.0.0-tinfo.patch Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox