removed a missed dependancy on curl remove use of autogen, just run the one needed...

SVN-Revision: 11991

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index ab41ac09954f05c3746574172767749c74db292e..45010c7f3a1ebbfa922f35fae8aca7ef3bccff40 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/opkg
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libcurl
   TITLE:=opkg package management system
   URL:=http://wiki.openmoko.org/wiki/Opkg
 endef
@@ -46,7 +45,7 @@ CONFIGURE_ARGS += \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
-               ./autogen.sh \
+               autoreconf -v --install || exit 1 \
        );
        $(call Build/Configure/Default)
 endef

diff --git a/package/opkg/patches/001-use-wget b/package/opkg/patches/001-use-wget
index a8ec7c518ac7e28627f2a272fedc9c8eb769a97b..e6c7e9ca0e58c6630ea9bcd0bd4aa6273ba921d4 100644 (file)
--- a/package/opkg/patches/001-use-wget
+++ b/package/opkg/patches/001-use-wget
@@ -75,3 +75,34 @@ Index: opkg-4561/configure.ac
  
  
  dnl **********
+Index: opkg-4561/libopkg/opkg.c
+===================================================================
+--- opkg-4561/libopkg/opkg.c-orig      2008-07-28 16:27:53.000000000 -0500
++++ opkg-4561/libopkg/opkg.c   2008-07-29 07:46:42.000000000 -0500
+@@ -1013,8 +1013,9 @@
+ 
+   return package;
+ }
+-
++#ifdef HAVE_CURL
+ #include <curl/curl.h>
++#endif
+ /**
+  * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. 
+  * @param opkg The opkg_t
+@@ -1064,6 +1065,7 @@
+     repositories--;
+ 
+     err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
++    #ifdef HAVE_CURL
+     if (!(err == CURLE_OK || 
+               err == CURLE_HTTP_RETURNED_ERROR || 
+               err == CURLE_FILE_COULDNT_READ_FILE ||
+@@ -1072,6 +1074,7 @@
+               )) {
+           ret++;
+     }
++    #endif
+     str_list_elt_deinit(iter1);
+     free(iter1);
+   }

diff --git a/package/opkg/patches/002-fix-autogen b/package/opkg/patches/002-fix-autogen
deleted file mode 100644 (file)
index 0d39c42..0000000
--- a/package/opkg/patches/002-fix-autogen
+++ /dev/null
@@ -1,8 +0,0 @@
---- opkg-4561/autogen.sh-orig  2008-07-28 18:00:33.000000000 -0500
-+++ opkg-4561/autogen.sh       2008-07-28 18:00:45.000000000 -0500
-@@ -1,5 +1,3 @@
- #! /bin/sh
- autoreconf -v --install || exit 1
- glib-gettextize --force --copy || exit 1
--./configure --enable-maintainer-mode "$@"
--