On Wednesday 2008-11-26 22:28, Jan Engelhardt wrote:
>
>rpm's configure script cannot find nss/nspr even though these are
>installed. As it turns out, configure.ac does not use nss/nspr's
>pkg-config files nor the nspr-config utility nor offers a way to
>pinpoint to the location.
>
>This kinda makes it impossible to compile rpm on openSUSE right now as
>the headers are in /usr/include/nss3 and /usr/include/nspr4,
>respectively.
commit c736d5be553174d12990cc193b72c4c3cadb6a0c
Author: Jan Engelhardt <[EMAIL PROTECTED]>
Date: Wed Nov 26 22:46:58 2008 +0100
build: use pkg-config for nss/nspr
Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
---
Makefile.am | 8 ++++----
build/Makefile.am | 2 +-
lib/Makefile.am | 4 ++--
python/Makefile.am | 4 ++--
rpmio/Makefile.am | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4b26751..4adda03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-I$(top_builddir)/include/
AM_CPPFLAGS += -I$(top_srcdir)/build
AM_CPPFLAGS += -I$(top_srcdir)/lib
AM_CPPFLAGS += -I$(top_srcdir)/rpmio
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
+AM_CPPFLAGS += ${libnspr_CFLAGS} ${libnss_CFLAGS}
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
@@ -89,16 +89,16 @@ DISTCLEANFILES += find-requires
rpm_SOURCES = rpmqv.c debug.h system.h
rpm_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK
-DIAM_RPMQV
rpm_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpm_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@
@WITH_ZLIB_LIB@
+rpm_LDADD += @WITH_LIBELF_LIB@ ${libnspr_LIBS} ${libnss_LIBS}
@WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpmbuild_SOURCES = build.c rpmqv.c build.h debug.h system.h
rpmbuild_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMBT
rpmbuild_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpmbuild_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@
@WITH_ZLIB_LIB@
+rpmbuild_LDADD += @WITH_LIBELF_LIB@ ${libnspr_LIBS} ${libnss_LIBS}
@WITH_POPT_LIB@ @WITH_ZLIB_LIB@
rpm2cpio_SOURCES = rpm2cpio.c debug.h system.h
rpm2cpio_LDADD = lib/librpm.la rpmio/librpmio.la
-rpm2cpio_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@
@WITH_ZLIB_LIB@
+rpm2cpio_LDADD += @WITH_LIBELF_LIB@ ${libnspr_LIBS} ${libnss_LIBS}
@WITH_POPT_LIB@ @WITH_ZLIB_LIB@
if LIBELF
diff --git a/build/Makefile.am b/build/Makefile.am
index d03afef..61923fa 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,7 +1,7 @@
# Makefile for rpmbuild library.
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
+AM_CPPFLAGS += ${libnspr_CFLAGS} ${libnss_CFLAGS}
AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 982fa73..f799b4c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
+AM_CPPFLAGS += ${libnspr_CFLAGS} ${libnss_CFLAGS}
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += @WITH_SQLITE3_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
@@ -42,7 +42,7 @@ librpm_la_LDFLAGS = -release 4.6
librpm_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
- @WITH_NSS_LIB@ \
+ ${libnspr_LIBS} ${libnss_LIBS} \
@WITH_POPT_LIB@ \
@WITH_SELINUX_LIB@ \
@WITH_SQLITE3_LIB@ \
diff --git a/python/Makefile.am b/python/Makefile.am
index 7765051..aa3a42c 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -6,7 +6,7 @@ if PYTHON
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += -I$(top_srcdir)/python
AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
+AM_CPPFLAGS += ${libnspr_CFLAGS} ${libnss_CFLAGS}
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += [EMAIL PROTECTED]@
@@ -19,7 +19,7 @@ _rpmmodule_la_LIBADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \
- @WITH_NSS_LIB@ \
+ ${libnspr_LIBS} ${libnss_LIBS} \
@WITH_POPT_LIB@ \
@WITH_LIBELF_LIB@ \
@WITH_PYTHON_LIB@
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 5edb68b..df48a25 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -1,7 +1,7 @@
# Makefile for rpm library.
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
+AM_CPPFLAGS += ${libnspr_CFLAGS} ${libnss_CFLAGS}
AM_CPPFLAGS += @WITH_LUA_INCLUDE@
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
AM_CPPFLAGS += -I$(top_srcdir)/misc
@@ -22,7 +22,7 @@ librpmio_la_SOURCES = \
librpmio_la_LDFLAGS = -release 4.6
librpmio_la_LIBADD = \
../misc/libmisc.la \
- @WITH_NSS_LIB@ \
+ ${libnspr_LIBS} ${libnss_LIBS} \
@WITH_LUA_LIB@ \
@WITH_MAGIC_LIB@ \
@WITH_BZ2_LIB@ \
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
