[git] ADNS-g10 - branch, master, updated. adns-1.4-g10-6-4-ge317a09

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ADNS migrated to autotools/libtool".

The branch, master has been updated
       via  e317a09c6f855e806efa035ecb97f27f6b6942fd (commit)
      from  56eef0afa4c01d2352f8b671a9b22405dc8119db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e317a09c6f855e806efa035ecb97f27f6b6942fd
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 20 18:39:57 2015 +0200

    Add lost config script.
    
    * src/adns-config.in: New.  Content was lost.
    * configure.ac (ADNS_CONFIG_HOST): New.
    (adns-conf): New ac_config_command.

diff --git a/configure.ac b/configure.ac
index 4059627..45ab374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,9 +246,11 @@ fi
 #
 ADNS_CONFIG_LIBS="-ladns"
 ADNS_CONFIG_CFLAGS=""
-AC_SUBST(ADNS_CONFIG_LIBS)
-AC_SUBST(ADNS_CONFIG_CFLAGS)
+ADNS_CONFIG_HOST="$host"
 AC_SUBST(ADNS_CONFIG_API_VERSION)
+AC_SUBST(ADNS_CONFIG_CFLAGS)
+AC_SUBST(ADNS_CONFIG_LIBS)
+AC_SUBST(ADNS_CONFIG_HOST)
 
 # The Makefiles need to know about cross compiling
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
@@ -349,6 +351,9 @@ src/versioninfo.rc
 client/Makefile
 regress/Makefile
 ])
+AC_CONFIG_COMMANDS([adns-conf],[[
+chmod +x src/adns-config
+]])
 AC_OUTPUT
 
 
diff --git a/src/adns-config.in b/src/adns-config.in
index e69de29..823cd43 100644
--- a/src/adns-config.in
+++ b/src/adns-config.in
@@ -0,0 +1,169 @@
+#!/bin/sh
+# Copyright (C) 2015 g10 code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# File: @configure_input@
+
+# General.
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+version="@VERSION@"
+includedir="@includedir@"
+libdir="@libdir@"
+
+# libgcrypt values.
+libs="@ADNS_CONFIG_LIBS@"
+cflags="@ADNS_CONFIG_CFLAGS@"
+
+# API info
+api_version="@ADNS_CONFIG_API_VERSION@"
+
+# Configured for host
+my_host="@ADNS_CONFIG_HOST@"
+
+# Misc information.
+
+# State variables.
+echo_libs=no
+echo_cflags=no
+echo_prefix=no
+echo_exec_prefix=no
+echo_version=no
+echo_api_version=no
+echo_host=no
+
+# Prints usage information.
+usage()
+{
+    cat <<EOF
+Usage: $0 [OPTIONS]
+Options:
+	[--prefix]
+	[--exec-prefix]
+	[--version]
+        [--api-version]
+	[--libs]
+	[--cflags]
+        [--host]
+EOF
+    exit $1
+}
+
+if test $# -eq 0; then
+    # Nothing to do.
+    usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+	# Set up `optarg'.
+	--*=*)
+	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+	    ;;
+	*)
+	    optarg=""
+	    ;;
+    esac
+
+    case $1 in
+        --prefix=*)
+            # For compatibility reasons with old M4 macros, we ignore
+            # setting of prefix.
+            ;;
+	--prefix)
+	    echo_prefix=yes
+	    ;;
+        --exec-prefix=*)
+            ;;
+	--exec-prefix)
+	    echo_exec_prefix=yes
+	    ;;
+	--version)
+	    echo_version=yes
+	    ;;
+        --api-version)
+            echo_api_version=yes
+            ;;
+	--cflags)
+	    echo_cflags=yes
+	    ;;
+	--libs)
+	    echo_libs=yes
+	    ;;
+        --host)
+            echo_host=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 "$echo_cflags" = "yes"; then
+    includes=""
+    cflags_final="$cflags"
+
+    # Set up `includes'.
+    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+	includes="-I$includedir"
+    fi
+    # Set up `cflags_final'.
+    cflags_final="$cflags_final $gpg_error_cflags"
+
+    tmp=""
+    for i in $includes $cflags_final; do
+       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
+           tmp="$tmp $i"
+       fi
+    done
+    echo $tmp
+fi
+
+if test "$echo_libs" = "yes"; then
+    libdirs=""
+    libs_final="$libs"
+
+    # Set up `libdirs'.
+    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+	libdirs="-L$libdir"
+    fi
+
+    # Set up `libs_final'.
+    libs_final="$libs_final $gpg_error_libs"
+
+    tmp=""
+    for i in $libdirs $libs_final; do
+       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
+           tmp="$tmp $i"
+       fi
+    done
+    echo $tmp
+fi
+
+if test "$echo_version" = "yes"; then
+    echo "$version"
+fi
+
+if test "$echo_api_version" = "yes"; then
+    echo "$api_version"
+fi
+
+if test "$echo_host" = "yes"; then
+    echo "$my_host"
+fi

-----------------------------------------------------------------------

Summary of changes:
 configure.ac       |   9 ++-
 src/adns-config.in | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
ADNS migrated to autotools/libtool
http://git.gnupg.org