merged net-update fixes from apt--mvo

[apt.git] / apt-pkg / init.h

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index ecfe702d41e2a890bdb4f2c096292fa2d81e2ac5..6d8693be9879eaf2c929c2a8be9f8ae2d7c36d36 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: init.h,v 1.2 1998/07/12 23:58:27 jgg Exp $
+// $Id: init.h,v 1.9.2.2 2004/01/02 18:51:00 mdz Exp $

 /* ######################################################################
 
    Init - Initialize the package library
 /* ######################################################################
 
    Init - Initialize the package library


@@ -10,12 +10,32 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_INIT_H
 #define PKGLIB_INIT_H
 
 #include <apt-pkg/configuration.h>
 #ifndef PKGLIB_INIT_H
 #define PKGLIB_INIT_H
 
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/pkgsystem.h>

 
 

-bool pkglibInitialize(Configuration &Cnf);
+// See the makefile
+#define APT_PKG_MAJOR 4
+#define APT_PKG_MINOR 6
+#define APT_PKG_RELEASE 0
+    
+extern const char *pkgVersion;
+extern const char *pkgLibVersion;
+
+bool pkgInitConfig(Configuration &Cnf);
+bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
+
+#ifdef APT_COMPATIBILITY
+#if APT_COMPATIBILITY != 986
+#warning "Using APT_COMPATIBILITY"
+#endif
+
+inline bool pkgInitialize(Configuration &Cnf) 
+{
+   return pkgInitConfig(Cnf) && pkgInitSystem(Cnf,_system);
+};
+#endif

 
 #endif
 
 #endif