RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Mar-2010 21:03:30
Branch: HEAD Handle: 2010031920033000
Modified files:
rpm configure.ac
Log:
- autofu: expand auto/* files during configure.
- autofu: add --with-nix to build with Nix libraries.
Summary:
Revision Changes Path
2.431 +18 -2 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.430 -r2.431 configure.ac
--- rpm/configure.ac 3 Mar 2010 15:43:07 -0000 2.430
+++ rpm/configure.ac 19 Mar 2010 20:03:30 -0000 2.431
@@ -1486,6 +1486,17 @@
fi
], [])
+dnl # Nix
+dnl # XXX the tests are mostly pointless, all bow to the AutoFu!
+AC_LANG_PUSH(C++)
+RPM_CHECK_LIB(
+ [Nix expressions], [nix],
+ [format], [_init], [globals.hh],
+ [no,external:none], [],
+ [
+ ], [])
+AC_LANG_POP(C++)
+
dnl # JavaScript
WITH_JS_SUBDIR=""
WITH_SPIDERMONKEY_SUBDIR=""
@@ -2146,13 +2157,18 @@
dnl # explicit list of files to generate
AC_CONFIG_FILES([ po/Makefile.in
Doxyfile Makefile rpmpopt rpm.spec
- rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+ misc/Makefile
+ rpmio/Makefile rpmio/auto/Makefile rpmio/auto/desc rpmio/auto/types
+ rpmdb/Makefile rpmdb/auto/Makefile rpmdb/auto/desc rpmdb/auto/types
+ lib/Makefile lib/auto/Makefile lib/auto/desc lib/auto/types
+ build/Makefile build/auto/Makefile build/auto/desc build/auto/types
+ tools/Makefile
scripts/Makefile
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
macros/java macros/libtool macros/mono macros/perl
macros/pkgconfig macros/php macros/python macros/selinux
- tools/Makefile misc/Makefile doc/Makefile
+ doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
js/Makefile js/src/Makefile python/Makefile
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
