build: use pkg-config for i18n

As a side effect: this enables pkg-config support for all
SUPPORT_* items of the EDITME/Makefile.

diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile
index 74f8dda47af9f16b9357e1a17620291a95bd15c6..3ba9005cfb480fbbb07792fa547749d88776190c 100755 (executable)
--- a/src/scripts/Configure-Makefile
+++ b/src/scripts/Configure-Makefile
@@ -159,7 +159,7 @@ rm -f ./$mftepcp ./$mftepcp2
 
 # handle pkg-config
 # beware portability of extended regexps with sed.
 
 # handle pkg-config
 # beware portability of extended regexps with sed.

-$egrep "^[$st]*(AUTH|LOOKUP)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \
+$egrep "^[$st]*(AUTH|LOOKUP|SUPPORT)_[A-Z0-9_]*[$st]*=[$st]*" $mft | \

   sed "s/[$st]*=/='/" | \
   sed "s/\$/'/" > $mftt
 $egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE2?_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \
   sed "s/[$st]*=/='/" | \
   sed "s/\$/'/" > $mftt
 $egrep "^[$st]*((USE_(OPENSSL|GNUTLS)_PC)|SUPPORT_TLS|USE_GNUTLS|PCRE2?_CONFIG|AVOID_GNUTLS_PKCS11)[$st]*=[$st]*" $mft | \


@@ -236,6 +236,9 @@ then
           elif [ "$var" != "${var#AUTH_}" ]; then
             echo "CFLAGS += $cflags"
             echo "AUTH_LIBS += $libs"
           elif [ "$var" != "${var#AUTH_}" ]; then
             echo "CFLAGS += $cflags"
             echo "AUTH_LIBS += $libs"

+         elif [ "$var" != "${var#SUPPORT_}" ]; then
+           echo "CFLAGS += $cflags"
+           echo "LIBS += $libs"

           else
             echo >&2 "Don't know how to handle pkg-config for $var"
           fi
           else
             echo >&2 "Don't know how to handle pkg-config for $var"
           fi

diff --git a/src/src/EDITME b/src/src/EDITME
index 2cf0b3da9ba76db6f612fd58829b4a41d8d8a969..6295d72d620d48de425fdf138b0c32ee19a76842 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -1149,11 +1149,15 @@ ZCAT_COMMAND=/usr/bin/zcat
 # You need to have the IDN library installed.
 # If you want IDNA2008 mappings per RFCs 5890, 6530 and 6533, you additionally
 # need libidn2 and SUPPORT_I18N_2008.
 # You need to have the IDN library installed.
 # If you want IDNA2008 mappings per RFCs 5890, 6530 and 6533, you additionally
 # need libidn2 and SUPPORT_I18N_2008.

+# If you're using pkg-config, enable the _PC lines, otherwise the LDFLAGS ones.

 
 # SUPPORT_I18N=yes
 
 # SUPPORT_I18N=yes

+# SUPPORT_I18N_PC=libidn

 # LDFLAGS += -lidn
 # LDFLAGS += -lidn

+#

 # SUPPORT_I18N_2008=yes
 # SUPPORT_I18N_2008=yes

-# LDFLAGS += -lidn -lidn2
+# SUPPORT_I18N_2008_PC=libidn2
+# LDFLAGS += -lidn2

 
 
 #------------------------------------------------------------------------------
 
 
 #------------------------------------------------------------------------------