gpg-error-config: Keep old gpg-error-config implementation.

* configure.ac: Generate gpgrt-config from gpgrt-config.in.
* src/gpgrt-config.in: Rename from src/gpg-error-config-new.in.
* src/Makefile.am (bin_SCRIPTS): Add gpgrt-config.
(EXTRA_DIST): Add gpgrt-config.in removing gpg-error-config-new.in.
(BUILT_SOURCES, CLEANFILES): Remove gpgrt-config.
(gpg-error-config): Always copy from gpg-error-config-old.
* src/gpg-error-config-test.sh: Follow the rename.

--

The gpgrt-config script is new implementation supporting *.pc file,
while gpg-error-config keeps old single shell script.

Signed-off-by: NIIBE Yutaka <[email protected]>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/gpg-error-config-test.sh b/src/gpg-error-config-test.sh
index 527e118..2d8b94b 100755
--- a/src/gpg-error-config-test.sh
+++ b/src/gpg-error-config-test.sh
@@ -22,7 +22,7 @@ failure () {
 	echo "Test result: $*"
 	echo "====================: $PKG_CONFIG_CMD"
 	echo "$OUTPUT_OLD"
-	echo "====================: gpg-error-config-new"
+	echo "====================: gpgrt-config"
 	echo "$OUTPUT_NEW"
 	echo "===================="
     ) >> gpg-error-config-test.log
@@ -32,54 +32,54 @@ failure () {
 rm -f gpg-error-config-test.log
 
 OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --libs))
-OUTPUT_NEW=$(./gpg-error-config-new --libs)
+OUTPUT_NEW=$(./gpgrt-config --libs)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --libs
 
 OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags))
-OUTPUT_NEW=$(./gpg-error-config-new --cflags)
+OUTPUT_NEW=$(./gpgrt-config --cflags)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags
 
 OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags --libs))
-OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+OUTPUT_NEW=$(./gpgrt-config --cflags --libs)
 [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
 
 if [ "$PKG_CONFIG_CMD" = ./gpg-error-config-old ]; then
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --version))
-    OUTPUT_NEW=$(./gpg-error-config-new --version)
+    OUTPUT_NEW=$(./gpgrt-config --version)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --version
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --libs))
-    OUTPUT_NEW=$(./gpg-error-config-new --mt --libs)
+    OUTPUT_NEW=$(./gpgrt-config --mt --libs)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --libs
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --cflags))
-    OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags)
+    OUTPUT_NEW=$(./gpgrt-config --mt --cflags)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --cflags --libs))
-    OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+    OUTPUT_NEW=$(./gpgrt-config --cflags --libs)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --mt --cflags --libs))
-    OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags --libs)
+    OUTPUT_NEW=$(./gpgrt-config --mt --cflags --libs)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags --libs
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=mtcflags))
-    OUTPUT_NEW=$(./gpg-error-config-new --variable=mtcflags)
+    OUTPUT_NEW=$(./gpgrt-config --variable=mtcflags)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=mtcflags
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=mtlibs))
-    OUTPUT_NEW=$(./gpg-error-config-new --variable=mtlibs)
+    OUTPUT_NEW=$(./gpgrt-config --variable=mtlibs)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=mtlibs
 
     OUTPUT_OLD=$(echo $($PKG_CONFIG_CMD --variable=host))
-    OUTPUT_NEW=$(./gpg-error-config-new --variable=host)
+    OUTPUT_NEW=$(./gpgrt-config --variable=host)
     [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --variable=host
 fi
 
 if [ -n "$test_failed" ]; then
     OUTPUT_OLD=$($PKG_CONFIG_CMD --version)
-    OUTPUT_NEW=$(./gpg-error-config-new --version)
+    OUTPUT_NEW=$(./gpgrt-config --version)
     failure --version
 
     exit 99