Commit 0d922856 authored by Martin Baulig's avatar Martin Baulig Committed by Martin Baulig

Check for -lrpm and its dependency libs. On success, define HAVE_RPM and

2000-04-23  Martin Baulig  <martin@home-of-linux.org>

	* configure.in: Check for -lrpm and its dependency libs.
	On success, define HAVE_RPM and AC_SUBST(RPM_LIBS).
	Added BUILD_RPMVIEW_COMPONENT automake conditional.
	* acconfig.h (HAVE_RPM): Added.

	* components/Makefile.am: Conditionally compile rpmview.

	* components/rpmview/Makefile.am: Use $(RPM_LIBS) rather than
	-lrpm so we get the correct dependency libs such as -lgz2.
parent 7346b783
2000-04-23 Martin Baulig <martin@home-of-linux.org>
* configure.in: Check for -lrpm and its dependency libs.
On success, define HAVE_RPM and AC_SUBST(RPM_LIBS).
Added BUILD_RPMVIEW_COMPONENT automake conditional.
* acconfig.h (HAVE_RPM): Added.
* components/Makefile.am: Conditionally compile rpmview.
* components/rpmview/Makefile.am: Use $(RPM_LIBS) rather than
-lrpm so we get the correct dependency libs such as -lgz2.
2000-04-22 J. Shane Culpepper <pepper@eazel.com>
*libnautilus-extensions/libnautilus-extensions.h
Fixing build bustage in components/help. The header was pointing to
......
......@@ -5,3 +5,5 @@
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef HAVE_STPCPY
#undef HAVE_RPM
......@@ -8,13 +8,17 @@ if BUILD_MOZILLA_COMPONENT
MOZILLA_COMPONENT_SUBDIRS = mozilla
endif
if BUILD_RPMVIEW_COMPONENT
RPMVIEW_COMPONENT_SUBDIRS = rpmview
endif
SUBDIRS = \
help \
history \
html \
music \
notes \
rpmview \
$(RPMVIEW_COMPONENT_SUBDIRS) \
sample \
websearch \
$(SERVICE_SUBDIRS) \
......
......@@ -32,7 +32,7 @@ nautilus_rpm_view_LDFLAGS = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(GCONF_LIBS) \
-lrpm \
$(RPM_LIBS) \
$(VFS_LIBS) \
$(OAF_LIBS)
......
......@@ -122,6 +122,27 @@ dnl ====================================
dnl = end mozilla hacks
dnl ====================================
dnl ====================================
dnl = rpmview component support
dnl ====================================
rpm_libs=
AC_CHECK_LIB(bz2, bzread, [rpm_libs=-lbz2])
AC_CHECK_LIB(popt, poptParseArgvString, [rpm_libs="$rpm_libs -lpopt"])
AC_CHECK_LIB(rpm, rpmRunTransactions,[build_rpmview=true],
[build_rpmview=false],-lz $rpm_libs -ldb)
LDFLAGS="$save_LDFLAGS"
if test "x$build_rpmview" = "xtrue" ; then
AC_DEFINE(HAVE_RPM)
RPM_LIBS="-lrpm -lz $rpm_libs -ldb"
fi
AC_SUBST(RPM_LIBS)
AM_CONDITIONAL(BUILD_RPMVIEW_COMPONENT, test "x$build_rpmview" = "xtrue")
dnl ====================================
dnl = end rpmview checks
dnl ====================================
dnl Checks for libraries.
AM_PATH_GLIB(1.2.0,,
AC_MSG_ERROR([
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment