3 files changed, 20 insertions, 19 deletions

diff --git a/meta/packages/libetpan/files/cxx-is-here.patch b/meta/packages/libetpan/files/cxx-is-here.patch
new file mode 100644
index 0000000000..d910daab17
--- /dev/null
+++ b/meta/packages/libetpan/files/cxx-is-here.patch
@@ -0,0 +1,18 @@
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- libetpan-0.54.orig/configure.ac
++++ libetpan-0.54/configure.ac
+@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
+ fi
+ AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
+ 
+ # Check the C compiler.
+ AC_PROG_CC
++AC_PROG_CXX
+ 
+ # Compiler flags.
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
+ if test "x$GCC" = xyes; then
+   CFLAGS="$CFLAGS -O2 -g"
diff --git a/meta/packages/libetpan/files/honor-oe-lflags.patch b/meta/packages/libetpan/files/honor-oe-lflags.patch
deleted file mode 100644
index 15a1535bfa..0000000000
--- a/meta/packages/libetpan/files/honor-oe-lflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- libetpan-0.46/configure.in~honor-oe-lflags
-+++ libetpan-0.46/configure.in
-@@ -361,7 +361,7 @@
-       LDFLAGS="-$flag $LDFLAGS"
-       AC_TRY_LINK([], [pthread_create();], 
-                       [pthflag=yes; checkpthread=no], 
--                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
-+                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
-       AC_MSG_RESULT($pthflag)
-     fi
-   done
diff --git a/meta/packages/libetpan/libetpan_0.48.bb b/meta/packages/libetpan/libetpan_0.54.bb
index dfef3b19c6..0e2c5ab81a 100644
--- a/meta/packages/libetpan/libetpan_0.48.bb
+++ b/meta/packages/libetpan/libetpan_0.54.bb
@@ -2,12 +2,11 @@ DESCRIPTION = "libetpan is a library for communicating with mail and news server
 It supports the protocols SMTP, POP3, IMAP and NNTP."
 HOMEPAGE = "http://www.etpan.org"
 SECTION = "libs"
-DEPENDS = "gnutls"
+DEPENDS = "curl expat gnutls"
 LICENSE = "BSD"
-PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://honor-oe-lflags.patch;patch=1"
+           file://cxx-is-here.patch"
 
 inherit autotools pkgconfig gettext binconfig