FAQ Update

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

diff --git a/gtk-config.in b/gtk-config.in
index 7fbddd841f24fdfaff9558344ed7e846b17ca039..846f82678050bbaac779059bf20662474f8efb3f 100644 (file)
--- a/gtk-config.in
+++ b/gtk-config.in
@@ -1,20 +1,37 @@
 #!/bin/sh
 
-glib_libs=@glib_libs@
-glib_cflags=@glib_cflags@
+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="\
-Usage: gtk-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+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
-      echo "${usage}" 1>&2
-      exit 1
+       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]*=//'` ;;
@@ -29,19 +46,51 @@ while test $# -gt 0; do
       fi
       ;;
     --prefix)
-      echo $prefix
+      echo_prefix=yes
       ;;
     --exec-prefix=*)
       exec_prefix=$optarg
       exec_prefix_set=yes
       ;;
     --exec-prefix)
-      echo $exec_prefix
+      echo_exec_prefix=yes
       ;;
     --version)
       echo @GTK_VERSION@
       ;;
     --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    gtk)
+      lib_gtk=yes
+      ;;
+    gthread)
+      lib_gthread=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+       echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+       echo $exec_prefix
+fi
+
+if test "$lib_gthread" = "yes"; then
+      glib_cflags="$glib_thread_cflags"
+      glib_libs="$glib_thread_libs"
+fi
+
+if test "$echo_cflags" = "yes"; then
       if test @includedir@ != /usr/include ; then
         includes=-I@includedir@
         for i in $glib_cflags ; do
@@ -50,22 +99,22 @@ while test $# -gt 0; do
           fi
         done
       fi
-      echo -I@libdir@/glib/include $includes @x_cflags@ $glib_cflags
-      ;;
-    --libs)
+      echo -I@libdir@/gtk+/include $includes @x_cflags@ $glib_cflags
+fi
+
+if test "$echo_libs" = "yes"; then
+      my_glib_libs=
       libdirs=-L@libdir@
       for i in $glib_libs ; do
-        if test $i = -I@libdir@ ; then
-          libdirs=""
+        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-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $glib_libs @x_libs@ -lm
-      ;;
-    *)
-      echo "${usage}" 1>&2
-      exit 1
-      ;;
-  esac
-  shift
-done
+
+      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ @MATH_LIB@
+fi