RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 07-Apr-2009 12:02:49
Branch: HEAD Handle: 2009040710024900
Modified files:
rpm/rpmio poptIO.c rpmio.c rpmtcl.c
Log:
usual conditionals, for --without-tcl
Summary:
Revision Changes Path
1.38 +2 -0 rpm/rpmio/poptIO.c
1.180 +2 -0 rpm/rpmio/rpmio.c
2.3 +2 -0 rpm/rpmio/rpmtcl.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.37 -r1.38 poptIO.c
--- rpm/rpmio/poptIO.c 6 Apr 2009 20:34:10 -0000 1.37
+++ rpm/rpmio/poptIO.c 7 Apr 2009 10:02:49 -0000 1.38
@@ -411,8 +411,10 @@
N_("Debug rpmmg magic"), NULL},
{ "rpmsqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsq_debug,
-1,
N_("Debug rpmsq Signal Queue"), NULL},
+#ifdef WITH_TCL
{ "rpmtcldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmtcl_debug, -1,
N_("Debug rpmtcl TCL interpreter"), NULL},
+#endif
{ "rpmzqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmzq_debug,
-1,
N_("Debug rpmzq Job Queuing"), NULL},
{ "xardebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_xar_debug, -1,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.179 -r1.180 rpmio.c
--- rpm/rpmio/rpmio.c 6 Apr 2009 20:34:10 -0000 1.179
+++ rpm/rpmio/rpmio.c 7 Apr 2009 10:02:49 -0000 1.180
@@ -3144,7 +3144,9 @@
#endif
urlFreeCache();
+#if defined(WITH_TCL)
_rpmtclPool = rpmioFreePool(_rpmtclPool);
+#endif
_mirePool = rpmioFreePool(_mirePool);
_rpmmgPool = rpmioFreePool(_rpmmgPool);
_htPool = rpmioFreePool(_htPool);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtcl.c
============================================================================
$ cvs diff -u -r2.2 -r2.3 rpmtcl.c
--- rpm/rpmio/rpmtcl.c 6 Apr 2009 21:41:16 -0000 2.2
+++ rpm/rpmio/rpmtcl.c 7 Apr 2009 10:02:49 -0000 2.3
@@ -1,5 +1,6 @@
#include "system.h"
+#ifdef WITH_TCL
#define _RPMTCL_INTERNAL
#include "rpmtcl.h"
@@ -82,3 +83,4 @@
}
return rc;
}
+#endif /* WITH_TCL */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
