Adapt cast macros to standard.

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

diff --git a/gtk-config.in b/gtk-config.in
index 805d65410991c16b6e9c053e2720a350281f8fbf..5fffdf6b94b6aa050a1e9fccedf6afd50e9b88c6 100644 (file)
--- a/gtk-config.in
+++ b/gtk-config.in
@@ -1,28 +1,120 @@
 #!/bin/sh
 
+glib_libs="@glib_libs@"
+glib_cflags="@glib_cflags@"
+glib_thread_libs="@glib_thread_libs@"
+glib_thread_cflags="@glib_thread_cflags@"
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+exec_prefix_set=no
+
+usage()
+{
+       cat <<EOF
+Usage: gtk-config [OPTIONS] [LIBRARIES]
+Options:
+       [--prefix[=DIR]]
+       [--exec-prefix[=DIR]]
+       [--version]
+       [--libs]
+       [--cflags]
+Libraries:
+       gtk
+       gthread
+EOF
+       exit $1
+}
+
+if test $# -eq 0; then
+       usage 1 1>&2
+fi
+
+lib_gtk=yes
+
+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=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      echo @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    gtk)
+      lib_gtk=yes
+      ;;
+    gthread)
+      lib_gthread=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
 
-usage="\
-Usage: gtk-config [--version] [--libs] [--cflags]"
+if test "$echo_prefix" = "yes"; then
+       echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+       echo $exec_prefix
+fi
 
-if test $# -ne 1 ; then
-   echo "${usage}" 1>&2
-   exit 1
+if test "$lib_gthread" = "yes"; then
+      glib_cflags="$glib_thread_cflags"
+      glib_libs="$glib_thread_libs"
 fi
 
-case $1 in 
-  --version)
-    echo @GTK_VERSION@
-    ;;
-  --cflags)
-    echo -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
+if test "$echo_cflags" = "yes"; then
+      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 -I@libdir@/gtk+/include $includes $glib_cflags @x_cflags@ 
+fi
+
+if test "$echo_libs" = "yes"; then
+      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@ @MATH_LIB@
+fi      
+