Don't use prefix variable (used by AC)

diff --git a/acinclude.m4 b/acinclude.m4
index 01565ef..9e42ff2 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -225,13 +225,13 @@ _smart_try_dir=
 _smart_include_dir=
 
 dnl #  Add variants with the different prefixes and one with no prefix
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -263,14 +263,14 @@ dnl #
 dnl #  Try using the default includes (with prefixes).
 dnl #
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    AC_MSG_CHECKING([for ${prefix}/$1])
+  for _prefix in $smart_prefix; do
+    AC_MSG_CHECKING([for ${_prefix}/$1])
 
     AC_TRY_COMPILE([$2
                    #include <$1>],
                   [int a = 1;],
                   [
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     AC_MSG_RESULT(yes)
                     break
                   ],
@@ -307,7 +307,7 @@ dnl #
 if test "x$smart_include" = "x"; then
 
   for prefix in $smart_prefix; do
-    FR_LOCATE_DIR(_smart_include_dir,"${prefix}/${1}")
+    FR_LOCATE_DIR(_smart_include_dir,"${_prefix}/${1}")
   done
   FR_LOCATE_DIR(_smart_include_dir, $1)
 

diff --git a/configure b/configure
index b492ce7..dca3e3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -7009,13 +7009,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -7056,9 +7056,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/talloc.h" >&5
-$as_echo_n "checking for ${prefix}/talloc.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/talloc.h" >&5
+$as_echo_n "checking for ${_prefix}/talloc.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7074,7 +7074,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -7130,7 +7130,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -8074,13 +8074,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -8121,9 +8121,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/openssl/ssl.h" >&5
-$as_echo_n "checking for ${prefix}/openssl/ssl.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/openssl/ssl.h" >&5
+$as_echo_n "checking for ${_prefix}/openssl/ssl.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8139,7 +8139,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -8195,7 +8195,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -8433,13 +8433,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -8480,9 +8480,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/pcap.h" >&5
-$as_echo_n "checking for ${prefix}/pcap.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/pcap.h" >&5
+$as_echo_n "checking for ${_prefix}/pcap.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8498,7 +8498,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -8554,7 +8554,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -8676,13 +8676,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -8723,9 +8723,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/collectd/client.h" >&5
-$as_echo_n "checking for ${prefix}/collectd/client.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/collectd/client.h" >&5
+$as_echo_n "checking for ${_prefix}/collectd/client.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8741,7 +8741,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -8797,7 +8797,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -10198,13 +10198,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -10245,9 +10245,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/execinfo.h" >&5
-$as_echo_n "checking for ${prefix}/execinfo.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/execinfo.h" >&5
+$as_echo_n "checking for ${_prefix}/execinfo.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10263,7 +10263,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -10319,7 +10319,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -10683,13 +10683,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -10730,9 +10730,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/pcreposix.h" >&5
-$as_echo_n "checking for ${prefix}/pcreposix.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/pcreposix.h" >&5
+$as_echo_n "checking for ${_prefix}/pcreposix.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10748,7 +10748,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -10804,7 +10804,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -10923,13 +10923,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -10970,9 +10970,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/regex.h" >&5
-$as_echo_n "checking for ${prefix}/regex.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/regex.h" >&5
+$as_echo_n "checking for ${_prefix}/regex.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10988,7 +10988,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -11044,7 +11044,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`

diff --git a/src/modules/rlm_couchbase/configure b/src/modules/rlm_couchbase/configure
index 5ee4065..aec61c9 100755 (executable)
--- a/src/modules/rlm_couchbase/configure
+++ b/src/modules/rlm_couchbase/configure
@@ -2905,13 +2905,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -2952,9 +2952,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/json.h" >&5
-$as_echo_n "checking for ${prefix}/json.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/json.h" >&5
+$as_echo_n "checking for ${_prefix}/json.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -2970,7 +2970,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -3026,7 +3026,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -3119,7 +3119,6 @@ if test "x$smart_include" != "x"; then
   SMART_CPPFLAGS="$smart_include $SMART_CPPFLAGS"
 fi
 
-smart_try_dir=
 smart_prefix=
 
        if test "x$ac_cv_header_json_h" != "xyes"; then
@@ -3576,13 +3575,13 @@ smart_include_dir="/usr/local/include /opt/include"
 _smart_try_dir=
 _smart_include_dir=
 
-for prefix in $smart_prefix ""; do
-  for dir in $smart_try_dir; do
-    _smart_try_dir="${_smart_try_dir} ${dir}/${prefix}"
+for _prefix in $smart_prefix ""; do
+  for _dir in $smart_try_dir; do
+    _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}"
   done
 
-  for dir in $smart_include_dir; do
-    _smart_include_dir="${_smart_include_dir} ${dir}/${prefix}"
+  for _dir in $smart_include_dir; do
+    _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}"
   done
 done
 
@@ -3623,9 +3622,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "x$smart_include" = "x"; then
-  for prefix in $smart_prefix; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${prefix}/libcouchbase/couchbase.h" >&5
-$as_echo_n "checking for ${prefix}/libcouchbase/couchbase.h... " >&6; }
+  for _prefix in $smart_prefix; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/libcouchbase/couchbase.h" >&5
+$as_echo_n "checking for ${_prefix}/libcouchbase/couchbase.h... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3641,7 +3640,7 @@ int a = 1;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-                    smart_include="-isystem ${prefix}/"
+                    smart_include="-isystem ${_prefix}/"
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                     break
@@ -3697,7 +3696,7 @@ if test "x$smart_include" = "x"; then
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file="${prefix}/${1}"
+  file="${_prefix}/${1}"
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -3790,7 +3789,6 @@ if test "x$smart_include" != "x"; then
   SMART_CPPFLAGS="$smart_include $SMART_CPPFLAGS"
 fi
 
-smart_try_dir=
 smart_prefix=
 
        if test "x$ac_cv_header_libcouchbase_couchbase_h" != "xyes"; then