ggz client libs: remove bogus m4 magic that keeps adding -I ${prefix}/include

3 files changed, 53 insertions, 2 deletions

diff --git a/packages/ggz/files/.mtn2git_empty b/packages/ggz/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ggz/files/.mtn2git_empty
diff --git a/packages/ggz/files/ggz-unbreak-m4.patch b/packages/ggz/files/ggz-unbreak-m4.patch
new file mode 100644
index 0000000000..5e98535bd4
--- /dev/null
+++ b/packages/ggz/files/ggz-unbreak-m4.patch
@@ -0,0 +1,46 @@
+--- /tmp/ggz.m4	2008-09-27 09:57:44.000000000 +0200
++++ ggz-client-libs-0.0.14.1/m4/ggz/ggz.m4	2008-09-27 10:06:02.000000000 +0200
+@@ -139,8 +139,8 @@
+     ])
+ 
+ if test "x${prefix}" = "xNONE"; then
+-   ac_ggz_prefix_incdir="${ac_default_prefix}/include"
+-   ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
++   ac_ggz_prefix_incdir=""
++   ac_ggz_prefix_libdir=""
+    ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
+    ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
+ else
+@@ -163,26 +163,22 @@
+    ac_ggz_prefix_bindir="${unq_bindir}"
+    ac_ggz_prefix_etcdir="${unq_sysconfdir}"
+ fi
+-ac_ggz_stdinc="$ac_ggz_prefix_incdir"
+-ac_ggz_stdlib="$ac_ggz_prefix_libdir"
++ac_ggz_stdinc=""
++ac_ggz_stdlib=""
+ ac_ggz_stdbin="$ac_ggz_prefix_bindir"
+ ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
+ if test "x$ac_ggz_prefix" != "x"; then
+-  ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
+-  ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
++  ac_ggz_stdinc=" "
++  ac_ggz_stdlib=" "
+   ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
+   ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
+ fi
+ if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then
+-  ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
+-  ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
++  ac_ggz_stdinc=" "
++  ac_ggz_stdlib=" "
+   ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
+   ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
+ fi
+-if test "x$1" = "xexport" || test "x$2" = "xexport"; then
+-  CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
+-  LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
+-fi
+ 
+ save_cflags=$CFLAGS
+ save_cxxflags=$CXXFLAGS
diff --git a/packages/ggz/ggz-client-libs_0.0.14.1.bb b/packages/ggz/ggz-client-libs_0.0.14.1.bb
index df691dc7de..6b956ba2df 100644
--- a/packages/ggz/ggz-client-libs_0.0.14.1.bb
+++ b/packages/ggz/ggz-client-libs_0.0.14.1.bb
@@ -2,11 +2,16 @@ DESCRIPTION = " Client libraries for GamingZone"
 LICENSE = "LGPLv2"
 DEPENDS = "libggz" 
 
-SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz"
+PR = "r1"
+
+SRC_URI = "http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${PN}-${PV}.tar.gz \
+           file://ggz-unbreak-m4.patch;patch=1 \
+          "
 
 inherit autotools
 
-EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
+EXTRA_OECONF = "--with-ggz-dir=${STAGING_INCDIR}/../ \
+                --with-libggz-includes=${STAGING_INCDIR} \
                 --with-libggz-libraries=${STAGING_LIBDIR} \
                "