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 <gniibe@fsij.org>

3 files changed, 19 insertions, 24 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d568d73..6df2d6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,8 +84,7 @@ lock_obj_pub = \
 
 lib_LTLIBRARIES = libgpg-error.la
 nodist_include_HEADERS = gpg-error.h gpgrt.h
-bin_SCRIPTS = gpg-error-config
-nodist_bin_SCRIPTS = gpgrt-config
+bin_SCRIPTS = gpgrt-config gpg-error-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpg-error.m4 gpgrt.m4
 
@@ -99,18 +98,18 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
 	err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \
 	gpg-error.vers gpg-error.def.in \
         versioninfo.rc.in gpg-error.w32-manifest.in \
-	gpg-error-config-new.in gpg-error-config-test.sh gpg-error.pc.in \
+	gpgrt-config.in gpg-error-config-test.sh gpg-error.pc.in \
 	$(lock_obj_pub)
 
 BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
 	code-to-errno.h code-from-errno.h \
 	err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h gpgrt.h \
-	gpgrt-config gpg-error.def mkw32errmap.map.c
+	gpg-error.def mkw32errmap.map.c
 
 tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
 
 CLEANFILES = code-to-errno.h code-from-errno.h \
-	gpg-error.h gpgrt.h gpgrt-config \
+	gpg-error.h gpgrt.h \
         mkerrcodes$(EXEEXT_FOR_BUILD) mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
 	mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
 	gpg-extra/errno.h mkheader$(EXEEXT_FOR_BUILD) \
@@ -335,19 +334,15 @@ gpg-error.h: Makefile mkheader$(EXEEXT_FOR_BUILD) $(parts_of_gpg_error_h) \
 gpgrt.h: gpg-error.h
 	cp gpg-error.h gpgrt.h
 
-gpgrt-config: gpg-error-config
-	cp gpg-error-config gpgrt-config
-
-gpg-error-config: gpg-error-config-new gpg-error-config-old
+gpg-error-config: gpgrt-config gpg-error-config-old
 	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
 	@if $(srcdir)/gpg-error-config-test.sh --old-new; then \
 	  echo "good";                                         \
-	  cp gpg-error-config-new $@;                          \
 	else                                                   \
 	  echo "no";                                           \
 	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
-	  cp gpg-error-config-old $@;                          \
 	fi
+	cp gpg-error-config-old $@
 
 install-data-local:
 if HAVE_W32CE_SYSTEM
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
diff --git a/src/gpg-error-config-new.in b/src/gpgrt-config.in
index d0b9a32..d0b9a32 100644
--- a/src/gpg-error-config-new.in
+++ b/src/gpgrt-config.in