diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-06-28 23:02:09 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-28 23:02:09 +0000 |
| commit | 7e91a61ba8b5b1e3510c7ec1505ac71a3a0ce6b4 (patch) | |
| tree | 826d8408d48dcc37052ecfe2067f830833df2a07 /packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config | |
| parent | f3ea435114c6d51e41ac7e9474e3e223277427a0 (diff) | |
| parent | 8ae098ac7348611935439c2ebc61c9165b046a9e (diff) | |
merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
and 451e0728f5380a834da5ad8ecd79994cf6f12315
Diffstat (limited to 'packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config')
| -rw-r--r-- | packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config b/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config index d12b4a9d55..aaa64f392c 100644 --- a/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config +++ b/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config @@ -1,11 +1,5 @@ -patch glib-config so it indirects to pkgconfig for cflags and libs - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- glib-1.2.10/glib-config.in~glib-config-use-pkg-config -+++ glib-1.2.10/glib-config.in +--- glib-1.2.10/glib-config.in.orig 2006-06-28 12:28:53.000000000 +0100 ++++ glib-1.2.10/glib-config.in 2006-06-28 12:31:33.000000000 +0100 @@ -28,6 +28,8 @@ lib_glib=yes @@ -15,7 +9,7 @@ patch glib-config so it indirects to pkgconfig for cflags and libs while test $# -gt 0; do case "$1" in -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -@@ -55,20 +57,9 @@ +@@ -55,20 +57,14 @@ echo @GLIB_VERSION@ exit 0 ;; @@ -33,13 +27,18 @@ patch glib-config so it indirects to pkgconfig for cflags and libs - ;; - gthread) - lib_gthread=yes -+ --cflags | --libs | glib | gmodule | gthread) ++ --cflags | --libs) + cmd="$cmd $1 " + echo_pkgconfig="yes" ++ ;; ++ glib | gmodule | gthread) ++ cmd="$cmd $1 " ++ echo_pkgconfig="yes" ++ module_provided="yes" ;; *) usage 1 1>&2 -@@ -83,26 +74,6 @@ +@@ -83,26 +79,9 @@ if test "$echo_exec_prefix" = "yes"; then echo $exec_prefix fi @@ -66,5 +65,8 @@ patch glib-config so it indirects to pkgconfig for cflags and libs - fi - echo -L@libdir@ $libsp $libsa +if test "$echo_pkgconfig" = "yes"; then ++ if test -z "$module_provided" ; then ++ cmd="$cmd glib" ++ fi + echo `$cmd` fi |