From 2fd01b30f632bc1254cc6fc2b429625e36772d78 Mon Sep 17 00:00:00 2001
From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 25 Jun 2014 15:28:48 +0100
Subject: [PATCH] Similar += fixes for other modules

---
 src/modules/rlm_mschap/configure                       |  4 ++--
 src/modules/rlm_mschap/configure.ac                    |  6 +++---
 src/modules/rlm_sql/drivers/rlm_sql_oracle/configure   |  2 +-
 .../rlm_sql/drivers/rlm_sql_oracle/configure.ac        | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/rlm_mschap/configure b/src/modules/rlm_mschap/configure
index 3fdc885..2e11566 100755
--- a/src/modules/rlm_mschap/configure
+++ b/src/modules/rlm_mschap/configure
@@ -2930,8 +2930,8 @@ smart_prefix=
 
 $as_echo "#define HAVE_MEMBERSHIP_H 1" >>confdefs.h
 
-		mschap_sources+="opendir.c"
-		mod_ldflags+=" -framework DirectoryService"
+		mschap_sources="opendir.c"
+		mod_ldflags="-framework DirectoryService"
 	fi
 	targetname=rlm_mschap
 else
diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac
index a133f86..c001c4e 100644
--- a/src/modules/rlm_mschap/configure.ac
+++ b/src/modules/rlm_mschap/configure.ac
@@ -10,8 +10,8 @@ if test x$with_[]modname != xno; then
 	FR_SMART_CHECK_INCLUDE(membership.h)
 	if test "x$ac_cv_header_membership_h" = "xyes"; then
 		AC_DEFINE([HAVE_MEMBERSHIP_H],[1],[Build with Apple Open Directory support])
-		mschap_sources+="opendir.c"
-		mod_ldflags+=" -framework DirectoryService" 
+		mschap_sources="opendir.c"
+		mod_ldflags="-framework DirectoryService"
 	fi
 	targetname=modname
 else
@@ -24,7 +24,7 @@ if test x"$fail" != x""; then
 		AC_MSG_ERROR([set --without-]modname[ to disable it explicitly.])
 	else
 		AC_MSG_WARN([silently not building ]modname[.])
-		AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]); 
+		AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]);
 		targetname=""
 	fi
 fi
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
index 2541f45..f875708 100755
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
@@ -1848,7 +1848,7 @@ fi
     smart_try_dir="$oracle_include_dir /usr/local/instaclient/include"
 
     if test "x$ORACLE_HOME" != "x"; then
-	smart_try_dir+="${ORACLE_HOME}/include"
+	smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include"
     fi
 
     ac_ext=c
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
index 0844a1e..a40aa2c 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac
@@ -64,11 +64,11 @@ if test x$with_[]modname != xno; then
     dnl ############################################################
 
     smart_try_dir="$oracle_include_dir /usr/local/instaclient/include"
-    
+
     if test "x$ORACLE_HOME" != "x"; then
-	smart_try_dir+="${ORACLE_HOME}/include"
+	smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include"
     fi
-    
+
     FR_SMART_CHECK_INCLUDE(oci.h)
     if test "x$ac_cv_header_oci_h" != "xyes"; then
 	AC_MSG_WARN([oracle headers not found. Use --with-oracle-include-dir=<path> or set ORACLE_HOME.])
@@ -80,7 +80,7 @@ if test x$with_[]modname != xno; then
     dnl ############################################################
 
     old_LIBS="$LIBS"
-    
+
     if test "x$oracle_lib_dir" != "x" ; then
 	lib_path="${oracle_lib_dir} "
     elif test "x$ORACLE_HOME" != "x" ; then
@@ -94,7 +94,7 @@ if test x$with_[]modname != xno; then
 	    else
 		AC_MSG_CHECKING([for OCIInitialize in nnz${oracle_version}])
 	    fi
-	    
+
 	    LIBS="$old_LIBS -L$path -lclntsh -lnnz${oracle_version}"
 	    AC_TRY_LINK([#include <oci.h>
 
@@ -111,12 +111,12 @@ if test x$with_[]modname != xno; then
 		int             rc;
 		char            errbuf[100];
 		int             errcode;
-	    
+
 		rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
 				   (dvoid * (*)(dvoid *, size_t)) 0,
 				   (dvoid * (*)(dvoid *, dvoid *, size_t))0,
 				   (void (*)(dvoid *, dvoid *)) 0 );
-    
+
 		],
 		[mod_ldflags="$LIBS"],
 	    )
@@ -126,7 +126,7 @@ if test x$with_[]modname != xno; then
 	    fi
 	    AC_MSG_RESULT(no)
 	done
-	
+
 	if test "x$mod_ldflags" != "x"; then
 		break
 	fi
@@ -138,7 +138,7 @@ if test x$with_[]modname != xno; then
 	AC_MSG_WARN([oracle libraries not found.  Use --with-oracle-lib-dir=<path> or set ORACLE_HOME.])
 	fail=["$fail libclntsh libnnz[9-11]"]
     fi
-    
+
     targetname=modname
 else
     targetname=
-- 
2.1.4