org.handhelds.familiar/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config

   1 patch glib-config so it indirects to pkgconfig for cflags and libs
   2
   3 #
   4 # Patch managed by http://www.holgerschurig.de/patcher.html
   5 #
   6
   7 --- glib-1.2.10/glib-config.in~glib-config-use-pkg-config
   8 +++ glib-1.2.10/glib-config.in
   9 @@ -28,6 +28,8 @@
  10
  11  lib_glib=yes
  12
  13 +cmd="pkg-config "
  14 +
  15  while test $# -gt 0; do
  16    case "$1" in
  17    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
  18 @@ -55,20 +57,9 @@
  19        echo @GLIB_VERSION@
  20        exit 0
  21        ;;
  22 -    --cflags)
  23 -      echo_cflags=yes
  24 -      ;;
  25 -    --libs)
  26 -      echo_libs=yes
  27 -      ;;
  28 -    glib)
  29 -      lib_glib=yes
  30 -      ;;
  31 -    gmodule)
  32 -      lib_gmodule=yes
  33 -      ;;
  34 -    gthread)
  35 -      lib_gthread=yes
  36 +    --cflags | --libs | glib | gmodule | gthread)
  37 +      cmd="$cmd $1 "
  38 +      echo_pkgconfig="yes"
  39        ;;
  40      *)
  41        usage 1 1>&2
  42 @@ -83,26 +74,6 @@
  43  if test "$echo_exec_prefix" = "yes"; then
  44         echo $exec_prefix
  45  fi
  46 -if test "$echo_cflags" = "yes"; then
  47 -       cflags=""
  48 -       if test "$lib_gthread" = "yes"; then
  49 -               cflags="$cflags @G_THREAD_CFLAGS@"
  50 -       fi
  51 -       echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
  52 -fi
  53 -if test "$echo_libs" = "yes"; then
  54 -       libsp=""
  55 -       libsa=""
  56 -       if test "$lib_glib" = "yes"; then
  57 -               libsp="$libsp -lglib"
  58 -       fi
  59 -       if test "$lib_gthread" = "yes"; then
  60 -               libsp="-lgthread $libsp"
  61 -               libsa="$libsa @G_THREAD_LIBS@"
  62 -       fi
  63 -       if test "$lib_gmodule" = "yes"; then
  64 -               libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
  65 -               libsa="$libsa @G_MODULE_LIBS@"
  66 -       fi
  67 -       echo -L@libdir@ $libsp $libsa
  68 +if test "$echo_pkgconfig" = "yes"; then
  69 +       echo `$cmd`
  70  fi