| 1 |
ssuominen 13/03/05 10:10:31 |
| 2 |
|
| 3 |
Added: qingy-1.0.0-tinfo.patch |
| 4 |
Log: |
| 5 |
Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650 by Diego Elio Pettenò |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/qingy/files/qingy-1.0.0-tinfo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch?rev=1.1&view=markup |
| 13 |
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 |
| 14 |
|
| 15 |
Index: qingy-1.0.0-tinfo.patch |
| 16 |
=================================================================== |
| 17 |
Use ncurses.pc to get Libs: instead of using AC_CHECK_LIB because ncurses can be configured |
| 18 |
to have separate termcap library called libtinfo; and we need both -ltinfo and -lncurses for |
| 19 |
linking since symbols are used from both |
| 20 |
|
| 21 |
http://bugs.gentoo.org/459650 |
| 22 |
|
| 23 |
--- configure.in |
| 24 |
+++ configure.in |
| 25 |
@@ -125,12 +125,7 @@ |
| 26 |
# End compile emacs stuff |
| 27 |
|
| 28 |
# Check for ncurses |
| 29 |
- HEADERS="curses.h term.h" |
| 30 |
- NCURSESLIB="" |
| 31 |
- AC_CHECK_HEADERS([$HEADERS],,[AC_MSG_ERROR([$HEADERS_ERROR_MESSAGE])],) |
| 32 |
- AC_CHECK_LIB(ncurses, setupterm, [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , ) |
| 33 |
- AC_CHECK_LIB(ncurses, tputs, [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , ) |
| 34 |
- AC_SUBST(NCURSESLIB) |
| 35 |
+ PKG_CHECK_MODULES(NCURSES, ncurses, [], [AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])]) |
| 36 |
# End check for ncurses |
| 37 |
|
| 38 |
# Check for PAM support |
| 39 |
--- src/libraries/Makefile.am |
| 40 |
+++ src/libraries/Makefile.am |
| 41 |
@@ -4,7 +4,7 @@ |
| 42 |
INCLUDES = -I../.. -I../ |
| 43 |
BUILT_SOURCES = parse_settings.h |
| 44 |
|
| 45 |
-AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" |
| 46 |
+AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" $(NCURSES_CFLAGS) |
| 47 |
|
| 48 |
if !WANT_STATIC |
| 49 |
pkglib_LTLIBRARIES = libqingy.la |
| 50 |
@@ -35,7 +35,7 @@ |
| 51 |
EXTRA_libqingy_la_SOURCES = \ |
| 52 |
crypto_openssl.c crypto_libgcrypt.c crypto.h |
| 53 |
|
| 54 |
-libqingy_la_LIBADD = @PASSWDLIB@ @CRYPTOLIB@ @NCURSESLIB@ @XLIBS@ |
| 55 |
+libqingy_la_LIBADD = @PASSWDLIB@ @CRYPTOLIB@ @XLIBS@ $(NCURSES_LIBS) |
| 56 |
libqingy_la_LDFLAGS = -release @VERSION@ |
| 57 |
|
| 58 |
libqingy_static_la_SOURCES = $(libqingy_la_SOURCES) |
Archives