address FIXME

This commit is contained in:
Christian Grothoff 2020-03-28 22:12:47 +01:00
parent 4abb38a36e
commit 17eafb869c
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 11 additions and 11 deletions

View File

@ -492,6 +492,5 @@ AC_CONFIG_FILES([Makefile
src/mhd/Makefile src/mhd/Makefile
src/pq/Makefile src/pq/Makefile
src/util/Makefile src/util/Makefile
src/util/taler-config
]) ])
AC_OUTPUT AC_OUTPUT

View File

@ -19,6 +19,16 @@ EXTRA_DIST = \
bin_SCRIPTS = \ bin_SCRIPTS = \
taler-config taler-config
edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL)
taler-config: taler-config.in
rm -f $@ $@.tmp && \
$(edit_script) $< >$@.tmp && \
chmod a-w+x $@.tmp && \
mv $@.tmp $@
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libtalerutil.la libtalerutil.la

View File

@ -7,15 +7,6 @@ if ! type gnunet-config >/dev/null; then
exit 1 exit 1
fi fi
# FIXME: not very portable ...
# FIXME: should use "libdir" instead of prefix/lib, but somehow
# the recursive expansion does not work ;-(.
GC=`which gnunet-config` GC=`which gnunet-config`
ASAN="" export LD_PRELOAD=${LD_PRELOAD:-}:%libdir%/libtalerutil.so
A=`ldd $GC | grep libasan` && ASAN=`echo $A | awk '{print $3 ":"}'`
if test -z $ASAN
then
A=`ldd @prefix@/lib/libtalerutil.so | grep libasan` && ASAN=`echo $A | awk '{print $3 ":"}'`
fi
export LD_PRELOAD=${ASAN}${LD_PRELOAD:-}:@prefix@/lib/libtalerutil.so
exec gnunet-config "$@" exec gnunet-config "$@"