From 38de06e334f26f744cccccea3a06c0c743edfaa0 Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <thomas.preudhomme@celest.fr>
Date: Tue, 5 Jul 2011 10:47:32 +0200
Subject: [PATCH] Fix commit 31ca000d

* CONFIG_TCC_*LDDIR should not be exported if no --*lddir option is used.
* Don't write a : at the beginning of extralddir
---
 configure | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 57317be..766bbfa 100755
--- a/configure
+++ b/configure
@@ -112,7 +112,7 @@ for opt do
   ;;
   --lddir=*) lddir=`echo $opt | cut -d '=' -f 2`
   ;;
-  --extralddir=*) extralddir="$extralddir:`echo $opt | cut -d '=' -f 2`"
+  --extralddir=*) extralddir="${extralddir:+:}`echo $opt | cut -d '=' -f 2`"
   ;;
   --includedir=*) includedir=`echo $opt | cut -d '=' -f 2`
   ;;
@@ -366,9 +366,13 @@ echo "docdir=\$(DESTDIR)$docdir" >> config.mak
 echo "#define CONFIG_SYSROOT \"$sysroot\"" >> $TMPH
 echo "#ifndef CONFIG_TCCDIR" >> $TMPH
 echo "#define CONFIG_TCCDIR \"$tccdir\"" >> $TMPH
-echo "#define CONFIG_TCC_LDDIR \"$lddir\"" >> $TMPH
-echo "#define CONFIG_TCC_EXTRA_LDDIR \"$extralddir\"" >> $TMPH
 echo "#endif" >> $TMPH
+if test -n "$lddir" ; then
+  echo "#define CONFIG_TCC_LDDIR \"$lddir\"" >> $TMPH
+fi
+if test -n "$extralddir" ; then
+  echo "#define CONFIG_TCC_EXTRA_LDDIR \"$extralddir\"" >> $TMPH
+fi
 echo "CC=$cc" >> config.mak
 echo "GCC_MAJOR=$gcc_major" >> config.mak
 echo "#define GCC_MAJOR $gcc_major" >> $TMPH