Unset CATOBJEXT so that the macros and Makefiles correctly handle

[~andy/gtk] / gtk-config.in

diff --git a/gtk-config.in b/gtk-config.in
index 251f6275d5e9af5875d80122580896175deb3670..f20dd7154231a99997e8b9a3acc9eb434ecb0fe7 100644 (file)
--- a/gtk-config.in
+++ b/gtk-config.in
@@ -1,29 +1,76 @@
 #!/bin/sh
 
+glib_libs="@glib_libs@"
+glib_cflags="@glib_cflags@"
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+exec_prefix_set=no
 
 usage="\
-Usage: gtk-config [--version] [--libs] [--cflags]"
+Usage: gtk-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
 
-if test $# -ne 1 ; then
-   echo "${usage}" 1>&2
-   exit 1
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
 fi
 
-case $1 in 
-  --version)
-    echo @GTK_VERSION@
-    ;;
-  --cflags)
-    echo -I$libdir/glib/include -I@includedir@ @x_cflags@
-    ;;
-  --libs)
-    echo -L@libdir@ @x_ldflags@ -lgtk -lgdk -lglib @x_libs@ -lm
-    ;;
-  *)
-    echo "${usage}" 1>&2
-    exit 1
-    ;;
-esac
\ No newline at end of file
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo $prefix
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo $exec_prefix
+      ;;
+    --version)
+      echo @GTK_VERSION@
+      ;;
+    --cflags)
+      if test @includedir@ != /usr/include ; then
+        includes=-I@includedir@
+        for i in $glib_cflags ; do
+          if test $i = -I@includedir@ ; then
+            includes=""
+          fi
+        done
+      fi
+      echo $includes @x_cflags@ $glib_cflags
+      ;;
+    --libs)
+      my_glib_libs=
+      libdirs=-L@libdir@
+      for i in $glib_libs ; do
+        if test $i != -L@libdir@ ; then
+          if test -z "$my_glib_libs" ; then
+            my_glib_libs="$i"
+          else
+            my_glib_libs="$my_glib_libs $i"
+          fi
+        fi
+      done
+      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
+      ;;
+    *)
+      echo "${usage}" 1>&2
+      exit 1
+      ;;
+  esac
+  shift
+done
+