Merge openembedded@openembedded.bkbits.net:packages-devel

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/19 20:17:11-06:00 ti.com!kergoth
Merge hyperion.kergoth.com:code/packages
into odin.sc.ti.com:/home/kergoth/code/packages

2004/11/19 20:16:25-06:00 ti.com!kergoth
Unbork the pkgconfig build with automake 1.9.x.

BKrev: 419ea928-ibLmZMN71gRetUTHTPYPA

diff --git a/pkgconfig/pkgconfig-0.15.0/configure.patch b/pkgconfig/pkgconfig-0.15.0/configure.patch
index 784a1e6..4218e91 100644 (file)
--- a/pkgconfig/pkgconfig-0.15.0/configure.patch
+++ b/pkgconfig/pkgconfig-0.15.0/configure.patch
@@ -1,10 +1,10 @@
 
 #
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+# Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- pkgconfig-0.15.0/glib-1.2.8/Makefile.am~configure  2003-01-16 16:09:14.000000000 -0500
-+++ pkgconfig-0.15.0/glib-1.2.8/Makefile.am    2004-05-22 03:21:11.000000000 -0400
+--- pkgconfig-0.15.0/glib-1.2.8/Makefile.am~configure.patch
++++ pkgconfig-0.15.0/glib-1.2.8/Makefile.am
 @@ -65,7 +65,7 @@
  
  CONFIGURE_DEPENDENCIES = acglib.m4            
@@ -14,8 +14,8 @@
  glibconfig.h: stamp-gc-h
        @:
  stamp-gc-h: config.status
---- pkgconfig-0.15.0/glib-1.2.8/configure.in~configure 2000-05-24 20:29:09.000000000 -0400
-+++ pkgconfig-0.15.0/glib-1.2.8/configure.in   2004-05-22 03:21:11.000000000 -0400
+--- pkgconfig-0.15.0/glib-1.2.8/configure.in~configure.patch
++++ pkgconfig-0.15.0/glib-1.2.8/configure.in
 @@ -1,10 +1,11 @@
  dnl ***********************************
  dnl *** include special GLib macros ***
@@ -452,8 +452,8 @@
  
  
        if cmp -s $outfile glibconfig.h; then
---- pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am~configure  2003-01-16 16:09:14.000000000 -0500
-+++ pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am    2004-05-22 03:21:11.000000000 -0400
+--- pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am~configure.patch
++++ pkgconfig-0.15.0/glib-1.2.8/gmodule/Makefile.am
 @@ -41,7 +41,7 @@
  libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
  
@@ -463,8 +463,8 @@
  testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
  
  .PHONY: files release
---- pkgconfig-0.15.0/pkg.m4~configure  2002-02-03 12:16:48.000000000 -0500
-+++ pkgconfig-0.15.0/pkg.m4    2004-05-22 13:30:23.000000000 -0400
+--- pkgconfig-0.15.0/pkg.m4~configure.patch
++++ pkgconfig-0.15.0/pkg.m4
 @@ -2,7 +2,7 @@
  dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
  dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
@@ -474,3 +474,22 @@
    succeeded=no
  
    if test -z "$PKG_CONFIG"; then
+--- pkgconfig-0.15.0/configure.in~configure.patch
++++ pkgconfig-0.15.0/configure.in
+@@ -1,6 +1,7 @@
+ 
+ AC_INIT(pkg-config.1)
+ 
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE(pkgconfig, 0.15.0)
+ AM_MAINTAINER_MODE
+ 
+@@ -37,8 +38,6 @@
+ 
+   AC_SUBST(GLIB_LIBS)
+   AC_SUBST(GLIB_CFLAGS)
+-
+-  AC_CONFIG_AUX_DIR(.)
+ else
+   AC_CONFIG_SUBDIRS(glib-1.2.8)
+ fi # !native_win32

diff --git a/pkgconfig/pkgconfig_0.15.0.oe b/pkgconfig/pkgconfig_0.15.0.oe
index 7e79607..ae99eb9 100644 (file)
--- a/pkgconfig/pkgconfig_0.15.0.oe
+++ b/pkgconfig/pkgconfig_0.15.0.oe
@@ -3,6 +3,7 @@ DESCRIPTION = "pkg-config is a system for managing library \
 compile/link flags that works with automake and autoconf. \
 It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
+PR = "r1"
 
 SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV}.tar.gz \
            file://configure.patch;patch=1 \