2003-09-03 Marcus Brinkmann <marcus@g10code.de>

	* src/gpg-error-config.in: Rewritten.

1 files changed, 42 insertions, 85 deletions

diff --git a/src/gpg-error-config.in b/src/gpg-error-config.in
index f4f9115..22ae7cf 100644
--- a/src/gpg-error-config.in
+++ b/src/gpg-error-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#    Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,107 +9,64 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-PGM=gpg-error-config
-libs="@GPG_ERROR_CONFIG_LIBS@"
-cflags="@GPG_ERROR_CONFIG_CFLAGS@"
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-includes=""
-libdirs=""
-exec_prefix_set=no
-echo_libs=no
-echo_cflags=no
-echo_prefix=no
-echo_exec_prefix=no
+includedir=@includedir@
+libdir=@libdir@
 
+output=""
 
 usage()
 {
-	cat <<EOF
-Usage: $PGM [OPTIONS]
+    cat <<EOF
+Usage: gpg-error-config [OPTIONS]
 Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
+	[--prefix]
+	[--exec-prefix]
 	[--version]
 	[--libs]
 	[--cflags]
 EOF
-	exit $1
+    exit $1
 }
 
 if test $# -eq 0; then
-	usage 1 1>&2
+    usage 1 1>&2
 fi
 
 while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
+    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 "@VERSION@"
-      exit 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
+    case $1 in
+        --prefix)
+	    output="$output $prefix"
+	    ;;
+        --exec-prefix)
+	    output="$output $exec_prefix"
+	    ;;
+        --version)
+            echo "@VERSION@"
+	    exit 0
+	    ;;
+        --cflags)
+            output="$output -I$includedir"
+	    ;;
+	--libs)
+            output="$output -L$libdir -lgpg-error"
+	    ;;
+	*)
+            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 "$echo_cflags" = "yes"; then
-    if test "@includedir@" != "/usr/include" ; then
-      includes="-I@includedir@"
-      for i in $cflags ; do
-	if test "$i" = "-I@includedir@" ; then
-	  includes=""
-	fi
-      done
-    fi
-    echo $includes $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
-    if test "@libdir@" != "/usr/lib" ; then
-      libdirs="-L@libdir@"
-      for i in $libs ; do
-	if test "$i" = "-L@libdir@" ; then
-	  libdirs=""
-	fi
-      done
-    fi
-    echo $libdirs $libs
-fi
-
+echo $output