bind/runidn.diff

35 lines
1.0 KiB
Diff

From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-10-01 19:52:10.339340849 +0200
We do not normally ship the .la files in openSUSE;
make runidn work without it.
And do it portably (\$LIB), too, which the original runidn can't.
---
contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in | 6 ++++++
1 file changed, 6 insertions(+)
Index: bind-9.9.5-P1/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in
===================================================================
--- bind-9.9.5-P1.orig/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in
+++ bind-9.9.5-P1/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in
@@ -79,6 +79,7 @@ if test "$iconv_file" != none; then
preload="$iconv_file@PRELOAD_SEP@"
fi
+if false; then
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=`echo @libdir@`
@@ -96,6 +97,11 @@ EOF
exit 1
fi
preload=$preload$libdir/$dlname
+else
+prefix=$(echo "@prefix@")
+exec_prefix=$(echo "@exec_prefix@")
+preload="$exec_prefix/\$LIB/libidnkitres.so.1"
+fi
# Set @PRELOAD_VAR@.
if [ X$@PRELOAD_VAR@ = X ]; then