link against rpmio, disable Fopen

CVS patchset: 3842
CVS date: 2000/06/13 20:15:35

diff --git a/python/Makefile.am b/python/Makefile.am
index 978def0..d322e42 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -18,6 +18,7 @@ python_PROGRAMS = rpmmodule.so
 rpmmodule_so_SOURCES =
 # XXX rpmmodule_so_LDFLAGS = -L../lib/.libs -lrpm -L../popt/.libs -lpopt $(LIBS) -shared -Wl,-soname,rpmmodule.so
 rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la \
+       $(top_builddir)/rpmio/librpmio.la            \
        $(LIBS) -shared -Wl,-soname,rpmmodule.so
 
 noinst_LTLIBRARIES = librpmmodule.la

diff --git a/python/Makefile.in b/python/Makefile.in
index 7ed26b7..b618b25 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -177,7 +177,7 @@ pythondir = $(prefix)/lib/python1.5/site-packages
 python_PROGRAMS = rpmmodule.so
 rpmmodule_so_SOURCES = 
 # XXX rpmmodule_so_LDFLAGS = -L../lib/.libs -lrpm -L../popt/.libs -lpopt $(LIBS) -shared -Wl,-soname,rpmmodule.so
-rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la   $(LIBS) -shared -Wl,-soname,rpmmodule.so
+rpmmodule_so_LDFLAGS = $(top_builddir)/lib/librpm.la   $(top_builddir)/rpmio/librpmio.la               $(LIBS) -shared -Wl,-soname,rpmmodule.so
 
 
 noinst_LTLIBRARIES = librpmmodule.la

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index d7238f6..3d7b6cd 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -74,7 +74,7 @@ static PyObject * errorString (PyObject * self, PyObject * args);
 static PyObject * versionCompare (PyObject * self, PyObject * args);
 static PyObject * labelCompare (PyObject * self, PyObject * args);
 static PyObject * rebuildDB (PyObject * self, PyObject * args);
-static PyObject * doFopen(PyObject * self, PyObject * args);
+/*  static PyObject * doFopen(PyObject * self, PyObject * args); */
 
 /* transaction set functions */
 static PyObject * rpmtransCreate(PyObject * self, PyObject * args);
@@ -144,7 +144,7 @@ static PyMethodDef rpmModuleMethods[] = {
     { "errorString", (PyCFunction) errorString, METH_VARARGS, NULL },
     { "versionCompare", (PyCFunction) versionCompare, METH_VARARGS, NULL },
     { "labelCompare", (PyCFunction) labelCompare, METH_VARARGS, NULL },
-    { "Fopen", (PyCFunction) doFopen, METH_VARARGS, NULL },
+/*      { "Fopen", (PyCFunction) doFopen, METH_VARARGS, NULL }, */
     { NULL }
 } ;
 
@@ -1819,7 +1819,7 @@ static int closeCallback(FILE * f) {
     }
     return 0; 
 }
-
+/* disable 
 static PyObject * doFopen(PyObject * self, PyObject * args) {
     char * path, * mode;
     FDlist *node;
@@ -1867,4 +1867,5 @@ static PyObject * doFopen(PyObject * self, PyObject * args) {
     
     return PyFile_FromFile (node->f, path, mode, closeCallback);
 }
+*/