Fix linking issue with libipkg >= 0.99.146, at least until I can come up with a better way to do it...

2 files changed, 6 insertions, 6 deletions

diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 127204d..7bc2040 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -35,12 +35,17 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
+extern "C" {
+#include <libipkg.h>
+};
+args_t m_ipkgArgs; // libipkg configuration arguments
+
 const QString IPKG_CONF        = "/etc/ipkg.conf";      // Fully-qualified name of Ipkg primary configuration file
 const QString IPKG_CONF_DIR    = "/etc/ipkg";           // Directory of secondary Ipkg configuration files
 const QString IPKG_PKG_PATH    = "/usr/lib/ipkg/lists"; // Directory containing server package lists
 const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location
 const QString IPKG_INFO_PATH   = "usr/lib/ipkg/info";   // Package file lists location
 
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index 0263f50..4e390fa 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -36,16 +36,12 @@ _;:,   .>  :=|.         This program is free software; you can
 #include "opackage.h"
 
 #include <qpe/config.h>
 
 #include <qobject.h>
 
-extern "C" {
-#include <libipkg.h>
-};
-
 // Ipkg execution options (m_ipkgExecOptions)
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
 #define FORCE_REINSTALL                         0x0004
 #define FORCE_OVERWRITE                         0x0008
 
@@ -76,13 +72,13 @@ public:
     OPackageList *availablePackages( const QString &server = QString::null );
     OPackageList *installedPackages( const QString &destName = QString::null,
                                      const QString &destPath = QString::null );
 
     OConfItem    *findConfItem( OConfItem::Type type = OConfItem::NotDefined,
                                 const QString &name = QString::null );
-    
+
     bool executeCommand( OPackage::Command command = OPackage::NotDefined,
                          const QStringList &parameters = QStringList(),
                          const QString &destination = QString::null,
                          const QObject *receiver = 0l,
                          const char *slotOutput = 0l,
                          bool rawOutput = true );
@@ -91,13 +87,12 @@ public:
     void ipkgMessage( char *msg );
     void ipkgStatus( char *status );
     void ipkgList( char *filelist );
 
 private:
     Config        *m_config;            // Pointer to application configuration file
-    args_t         m_ipkgArgs;          // libipkg configuration arguments
     OConfItemList *m_confInfo;          // Contains info from all Ipkg configuration files
     int            m_ipkgExecOptions;   // Bit-mapped flags for Ipkg execution options
     int            m_ipkgExecVerbosity; // Ipkg execution verbosity level
     QString        m_rootPath;          // Directory path where the 'root' destination is located
 
     void           loadConfiguration();