some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@127767 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 97 insertions, 101 deletions

diff --git a/configure b/configure
index 03181677c..fc85536af 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 126356 .
+# From configure.ac Revision: 127017 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -18343,7 +18343,7 @@ fi
          ALSA_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}"
 	 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
 echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
@@ -18605,7 +18605,7 @@ fi
          CURSES_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}"
 	 if test "${ac_cv_header_curses_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for curses.h" >&5
 echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
@@ -18868,7 +18868,7 @@ fi
          CAP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}"
 	 if test "${ac_cv_header_sys_capability_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sys/capability.h" >&5
 echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; }
@@ -19209,7 +19209,7 @@ fi
          EXP2L_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXP2L_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXP2L_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -19470,7 +19470,7 @@ fi
          LOG2L_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOG2L_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOG2L_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -19731,7 +19731,7 @@ fi
          EXP10L_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXP10L_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXP10L_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -19992,7 +19992,7 @@ fi
          LOG10L_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOG10L_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOG10L_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -20253,7 +20253,7 @@ fi
          SINL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SINL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SINL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -20514,7 +20514,7 @@ fi
          COSL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${COSL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${COSL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -20775,7 +20775,7 @@ fi
          TANL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TANL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TANL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -21036,7 +21036,7 @@ fi
          ASINL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ASINL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ASINL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -21297,7 +21297,7 @@ fi
          ACOSL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ACOSL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ACOSL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -21558,7 +21558,7 @@ fi
          ATANL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ATANL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ATANL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -21819,7 +21819,7 @@ fi
          ATAN2L_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ATAN2L_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ATAN2L_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -22080,7 +22080,7 @@ fi
          POWL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${POWL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${POWL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -22341,7 +22341,7 @@ fi
          SQRTL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SQRTL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SQRTL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -22602,7 +22602,7 @@ fi
          RINTL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${RINTL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${RINTL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -22863,7 +22863,7 @@ fi
          EXPL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXPL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXPL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -23124,7 +23124,7 @@ fi
          LOGL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOGL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOGL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -23385,7 +23385,7 @@ fi
          REMAINDERL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${REMAINDERL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${REMAINDERL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -23646,7 +23646,7 @@ fi
          FMODL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FMODL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FMODL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -23907,7 +23907,7 @@ fi
          ROUNDL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ROUNDL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ROUNDL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -24168,7 +24168,7 @@ fi
          TRUNCL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TRUNCL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TRUNCL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -24429,7 +24429,7 @@ fi
          STRTOLD_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${STRTOLD_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${STRTOLD_INCLUDE}"
 	 if test "${ac_cv_header_stdlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for stdlib.h" >&5
 echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
@@ -24690,7 +24690,7 @@ fi
          FLOORL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FLOORL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FLOORL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -24951,7 +24951,7 @@ fi
          CEILL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${CEILL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${CEILL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -25212,7 +25212,7 @@ fi
          EXP2_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXP2_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXP2_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -25473,7 +25473,7 @@ fi
          LOG2_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOG2_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOG2_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -25734,7 +25734,7 @@ fi
          EXP10_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXP10_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXP10_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -25995,7 +25995,7 @@ fi
          LOG10_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOG10_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOG10_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -26256,7 +26256,7 @@ fi
          SIN_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SIN_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SIN_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -26517,7 +26517,7 @@ fi
          COS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${COS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${COS_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -26778,7 +26778,7 @@ fi
          TAN_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TAN_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TAN_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -27039,7 +27039,7 @@ fi
          ASIN_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ASIN_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ASIN_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -27300,7 +27300,7 @@ fi
          ACOS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ACOS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ACOS_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -27561,7 +27561,7 @@ fi
          ATAN_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ATAN_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ATAN_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -27822,7 +27822,7 @@ fi
          ATAN2_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ATAN2_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ATAN2_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -28083,7 +28083,7 @@ fi
          POW_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${POW_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${POW_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -28344,7 +28344,7 @@ fi
          SQRT_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SQRT_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SQRT_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -28605,7 +28605,7 @@ fi
          RINT_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${RINT_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${RINT_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -28866,7 +28866,7 @@ fi
          EXP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${EXP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${EXP_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -29127,7 +29127,7 @@ fi
          LOG_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LOG_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LOG_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -29388,7 +29388,7 @@ fi
          REMAINDER_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${REMAINDER_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${REMAINDER_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -29649,7 +29649,7 @@ fi
          FMOD_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FMOD_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FMOD_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -29910,7 +29910,7 @@ fi
          ROUND_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ROUND_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ROUND_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -30171,7 +30171,7 @@ fi
          TRUNC_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TRUNC_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TRUNC_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -30432,7 +30432,7 @@ fi
          STRTOD_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${STRTOD_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${STRTOD_INCLUDE}"
 	 if test "${ac_cv_header_stdlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for stdlib.h" >&5
 echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
@@ -30693,7 +30693,7 @@ fi
          FLOOR_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FLOOR_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FLOOR_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -30954,7 +30954,7 @@ fi
          CEIL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${CEIL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${CEIL_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -31987,7 +31987,7 @@ fi
          ICONV_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
 	 if test "${ac_cv_header_iconv_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for iconv.h" >&5
 echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
@@ -32252,7 +32252,7 @@ fi
          IKSEMEL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}"
 	 if test "${ac_cv_header_iksemel_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for iksemel.h" >&5
 echo $ECHO_N "checking for iksemel.h... $ECHO_C" >&6; }
@@ -33346,7 +33346,7 @@ fi
          JACK_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}"
 	 if test "${ac_cv_header_jack_jack_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for jack/jack.h" >&5
 echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6; }
@@ -33609,7 +33609,7 @@ fi
          LTDL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}"
 	 if test "${ac_cv_header_ltdl_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ltdl.h" >&5
 echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
@@ -33871,7 +33871,7 @@ fi
          LDAP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}"
 	 if test "${ac_cv_header_ldap_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ldap.h" >&5
 echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
@@ -34133,7 +34133,7 @@ fi
          MISDN_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}"
 	 if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/mISDNlib.h" >&5
 echo $ECHO_N "checking for mISDNuser/mISDNlib.h... $ECHO_C" >&6; }
@@ -34396,7 +34396,7 @@ fi
          ISDNNET_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}"
 	 if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/isdn_net.h" >&5
 echo $ECHO_N "checking for mISDNuser/isdn_net.h... $ECHO_C" >&6; }
@@ -34657,7 +34657,7 @@ fi
          SUPPSERV_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}"
 	 if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/suppserv.h" >&5
 echo $ECHO_N "checking for mISDNuser/suppserv.h... $ECHO_C" >&6; }
@@ -35211,7 +35211,7 @@ fi
          NBS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}"
 	 if test "${ac_cv_header_nbs_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for nbs.h" >&5
 echo $ECHO_N "checking for nbs.h... $ECHO_C" >&6; }
@@ -35473,7 +35473,7 @@ fi
          NCURSES_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
 	 if test "${ac_cv_header_curses_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for curses.h" >&5
 echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
@@ -35918,7 +35918,7 @@ fi
          NEWT_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
 	 if test "${ac_cv_header_newt_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for newt.h" >&5
 echo $ECHO_N "checking for newt.h... $ECHO_C" >&6; }
@@ -36180,7 +36180,7 @@ fi
          UNIXODBC_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}"
 	 if test "${ac_cv_header_sql_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sql.h" >&5
 echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
@@ -36442,7 +36442,7 @@ fi
          OGG_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -36705,7 +36705,7 @@ fi
          BKTR_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
 	 if test "${ac_cv_header_execinfo_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for execinfo.h" >&5
 echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; }
@@ -36967,7 +36967,7 @@ fi
          BKTR_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
 	 if test "${ac_cv_header_execinfo_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for execinfo.h" >&5
 echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; }
@@ -37230,7 +37230,7 @@ fi
          OSS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
 	 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
 echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
@@ -37491,7 +37491,7 @@ fi
          OSS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
 	 if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
 echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; }
@@ -37752,7 +37752,7 @@ fi
          OSS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
 	 if test "${ac_cv_header_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for soundcard.h" >&5
 echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; }
@@ -38342,7 +38342,7 @@ fi
          POPT_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}"
 	 if test "${ac_cv_header_popt_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for popt.h" >&5
 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; }
@@ -38604,7 +38604,7 @@ fi
          PORTAUDIO_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}"
 	 if test "${ac_cv_header_portaudio_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for portaudio.h" >&5
 echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6; }
@@ -38866,7 +38866,7 @@ fi
          PRI_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}"
 	 if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
@@ -39215,7 +39215,7 @@ fi
          SPANDSP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
 	 if test "${ac_cv_header_spandsp_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for spandsp.h" >&5
 echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; }
@@ -39478,7 +39478,7 @@ fi
          SS7_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}"
 	 if test "${ac_cv_header_libss7_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libss7.h" >&5
 echo $ECHO_N "checking for libss7.h... $ECHO_C" >&6; }
@@ -41787,7 +41787,7 @@ fi
          LUA_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
 	 if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5
 echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; }
@@ -42049,7 +42049,7 @@ fi
          RADIUS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
 	 if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5
 echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; }
@@ -42320,7 +42320,7 @@ fi
          OPENAIS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE}"
 	 if test "${ac_cv_header_openais_saClm_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openais/saClm.h" >&5
 echo $ECHO_N "checking for openais/saClm.h... $ECHO_C" >&6; }
@@ -42597,7 +42597,7 @@ fi
          SPEEX_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}"
 	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
@@ -42860,7 +42860,7 @@ fi
          SPEEX_PREPROCESS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}"
 	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
@@ -43125,7 +43125,7 @@ fi
          SPEEXDSP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}"
 	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
@@ -43392,7 +43392,7 @@ fi
          SQLITE_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}"
 	 if test "${ac_cv_header_sqlite_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sqlite.h" >&5
 echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; }
@@ -43654,7 +43654,7 @@ fi
          SQLITE3_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}"
 	 if test "${ac_cv_header_sqlite3_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sqlite3.h" >&5
 echo $ECHO_N "checking for sqlite3.h... $ECHO_C" >&6; }
@@ -43916,7 +43916,7 @@ fi
          CRYPTO_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}"
 	 if test "${ac_cv_header_openssl_aes_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openssl/aes.h" >&5
 echo $ECHO_N "checking for openssl/aes.h... $ECHO_C" >&6; }
@@ -44180,7 +44180,7 @@ fi
          OPENSSL_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}"
 	 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
 echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
@@ -44445,7 +44445,7 @@ fi
          OSPTK_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${OSPTK_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${OSPTK_INCLUDE}"
 	 if test "${ac_cv_header_osp_osp_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for osp/osp.h" >&5
 echo $ECHO_N "checking for osp/osp.h... $ECHO_C" >&6; }
@@ -44887,7 +44887,7 @@ fi
          FREETDS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}"
 	 if test "${ac_cv_header_sybdb_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sybdb.h" >&5
 echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; }
@@ -45149,7 +45149,7 @@ fi
          TERMCAP_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -45411,7 +45411,7 @@ fi
          TINFO_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
 	 if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
@@ -45579,10 +45579,6 @@ if test "${host_os}" != "linux-gnu" ; then
   tonezone_extra="-lm"
 fi
 
-if test "x${DAHDI_DIR}" != "x"; then
-  tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
-fi
-
 
 if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then
    pbxlibdir=""
@@ -45605,7 +45601,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} $LIBS"
+LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} ${DAHDI_INCLUDE} $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45671,7 +45667,7 @@ fi
 
    # now check for the header.
    if test "${AST_TONEZONE_FOUND}" = "yes"; then
-      TONEZONE_LIB="${pbxlibdir} -ltonezone ${tonezone_extra}"
+      TONEZONE_LIB="${pbxlibdir} -ltonezone ${tonezone_extra} ${DAHDI_INCLUDE}"
       # if --with-TONEZONE=DIR has been specified, use it.
       if test "x${TONEZONE_DIR}" != "x"; then
 	 TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
@@ -45681,7 +45677,7 @@ fi
          TONEZONE_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}"
 	 if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for dahdi/tonezone.h" >&5
 echo $ECHO_N "checking for dahdi/tonezone.h... $ECHO_C" >&6; }
@@ -45943,7 +45939,7 @@ fi
          USB_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE}"
 	 if test "${ac_cv_header_usb_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for usb.h" >&5
 echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; }
@@ -46205,7 +46201,7 @@ fi
          VORBIS_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
 	 if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5
 echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; }
@@ -46565,7 +46561,7 @@ fi
          ZLIB_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}"
 	 if test "${ac_cv_header_zlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for zlib.h" >&5
 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
@@ -47358,7 +47354,7 @@ fi
          SDL_IMAGE_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE} ${SDL_INCLUDE}"
+         CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
 	 if test "${ac_cv_header_SDL_image_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for SDL_image.h" >&5
 echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; }
@@ -47619,7 +47615,7 @@ fi
          FFMPEG_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}"
 	 if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
 echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
@@ -48023,7 +48019,7 @@ fi
          X11_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE} "
+         CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
 	 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
@@ -48284,7 +48280,7 @@ fi
          X11_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE} -I/usr/X11R6/include"
+         CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
 	 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }