New upstream version 2.0-0.9

default-configure

@@ -23,7 +23,7 @@ if [ ! -f $CONF_FILE ]; then
 fi
 
 CONF=`cat $CONF_FILE`
-CONF=`printf "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
+CONF=`echo -n "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
 
 SUFFIX=""
 while [ "$#" != "0" ]; do
@@ -60,12 +60,6 @@ while [ "$1" != "" ]; do
     asan)
       if [ "$2" = "on" ]; then STRING="$STRING --enable-asan"; fi
       ;;
-    lsan)
-      if [ "$2" = "on" ]; then STRING="$STRING --enable-lsan"; fi
-      ;;
-    tsan)
-      if [ "$2" = "on" ]; then STRING="$STRING --enable-tsan"; fi
-      ;;
     ubsan)
       if [ "$2" = "on" ]; then STRING="$STRING --enable-ubsan"; fi
       ;;
@@ -135,29 +129,13 @@ while [ "$1" != "" ]; do
   shift; shift;
 done
 
-[ -f "$srcdir"/install-sh ] || "$srcdir"/autogen.sh || exit $?
-if [ -z "$MAKE" ]; then
-  if [ `uname -s` = "FreeBSD" ]; then
-    MAKE=gmake
-  else
-    MAKE=make
-  fi
-fi
-if [ `uname -s` = "FreeBSD" ]; then
-  export CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-  export LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-fi
-${MAKE} "$srcdir"/configure
+[ -f "$srcdir"/configure ] || "$srcdir"/autogen.sh || exit $?
+make "$srcdir"/configure
 
 STRING="$STRING --enable-plugins=$PLUGIN,$EXTRA_PLUGINS"
 if [ -n "$FDPP_STR" ]; then
   FDPP_STR=`echo $FDPP_STR | sed 's/^ *//'`
   STRING="$STRING --with-plugin-options=fdpp,\"$FDPP_STR\""
 fi
-
-if [ -z "$CC" ] && which ccache; then
-    echo "Enabling ccache use"
-    export CC="ccache cc"
-fi
 echo exec "$srcdir"/configure $STRING $SUFFIX
 eval exec "$srcdir"/configure $STRING $SUFFIX