Merge pull request #149 from puleglot/master

m4: use portable shell

2 files changed, 33 insertions, 42 deletions

diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4
index 408df48..f9b91b0 100755
--- a/m4/compiler-flags.m4
+++ b/m4/compiler-flags.m4
@@ -21,36 +21,36 @@ dnl Regis Merlino <regis.merlino@intel.com>
 dnl
 
 AC_DEFUN_ONCE([DLEYNA_SERVER_COMPILER_FLAGS], [
-	if (test x"${CFLAGS}" = x""); then
+	if test x"${CFLAGS}" = x""; then
 		CFLAGS="-Wall"
-		CFLAGS+=" -O2"
-		CFLAGS+=" -D_FORTIFY_SOURCE=2"
+		AS_VAR_APPEND([CFLAGS], [" -O2"])
+		AS_VAR_APPEND([CFLAGS], [" -D_FORTIFY_SOURCE=2"])
 	fi
 
-	if (test x"$USE_MAINTAINER_MODE" = x"yes"); then
-		CFLAGS+=" -Wextra"
-		CFLAGS+=" -Wno-unused-parameter"
-		CFLAGS+=" -Wno-missing-field-initializers"
-		CFLAGS+=" -Wdeclaration-after-statement"
-		CFLAGS+=" -Wmissing-declarations"
-		CFLAGS+=" -Wredundant-decls"
-		CFLAGS+=" -Wcast-align"
+	if test x"$USE_MAINTAINER_MODE" = x"yes"; then
+		AS_VAR_APPEND([CFLAGS], [" -Wextra"])
+		AS_VAR_APPEND([CFLAGS], [" -Wno-unused-parameter"])
+		AS_VAR_APPEND([CFLAGS], [" -Wno-missing-field-initializers"])
+		AS_VAR_APPEND([CFLAGS], [" -Wdeclaration-after-statement"])
+		AS_VAR_APPEND([CFLAGS], [" -Wmissing-declarations"])
+		AS_VAR_APPEND([CFLAGS], [" -Wredundant-decls"])
+		AS_VAR_APPEND([CFLAGS], [" -Wcast-align"])
 
-		CFLAGS+=" -Wstrict-prototypes"
-		CFLAGS+=" -Wmissing-prototypes"
-		CFLAGS+=" -Wnested-externs"
-		CFLAGS+=" -Wshadow"
-		CFLAGS+=" -Wformat=2"
-		CFLAGS+=" -Winit-self"
+		AS_VAR_APPEND([CFLAGS], [" -Wstrict-prototypes"])
+		AS_VAR_APPEND([CFLAGS], [" -Wmissing-prototypes"])
+		AS_VAR_APPEND([CFLAGS], [" -Wnested-externs"])
+		AS_VAR_APPEND([CFLAGS], [" -Wshadow"])
+		AS_VAR_APPEND([CFLAGS], [" -Wformat=2"])
+		AS_VAR_APPEND([CFLAGS], [" -Winit-self"])
 
-		CFLAGS+=" -std=gnu99"
-		CFLAGS+=" -pedantic"
-		CFLAGS+=" -Wno-overlength-strings"
+		AS_VAR_APPEND([CFLAGS], [" -std=gnu99"])
+		AS_VAR_APPEND([CFLAGS], [" -pedantic"])
+		AS_VAR_APPEND([CFLAGS], [" -Wno-overlength-strings"])
 
-		CFLAGS+=" -DG_DISABLE_DEPRECATED"
-		CFLAGS+=" -DGLIB_DISABLE_DEPRECATION_WARNINGS"
+		AS_VAR_APPEND([CFLAGS], [" -DG_DISABLE_DEPRECATED"])
+		AS_VAR_APPEND([CFLAGS], [" -DGLIB_DISABLE_DEPRECATION_WARNINGS"])
 	fi
 
-	CFLAGS+=" -Wno-format-extra-args"
-	CFLAGS+=" -Wl,--no-undefined"
+	AS_VAR_APPEND([CFLAGS], [" -Wno-format-extra-args"])
+	AS_VAR_APPEND([CFLAGS], [" -Wl,--no-undefined"])
 ])
diff --git a/m4/log.m4 b/m4/log.m4
index b3e007d..e54147a 100755
--- a/m4/log.m4
+++ b/m4/log.m4
@@ -23,29 +23,21 @@ dnl
 AC_DEFUN([_DLEYNA_LOG_LEVEL_CHECK_VALUE],
 [
 	AS_CASE($1,
-		[[[1-6]]], [AS_IF([test ${log_array[[${log_level}]]} -ne 0],
+		[[[1-6]]], [AS_IF([test "x${log_unique}" = xyes],
 				[
-					AC_MSG_ERROR(["$1 should be set once"], 1)
-				],
-				[test "x${log_single}" = xyes],
-				[
-					AC_MSG_ERROR(["Unique value element already set"], 1)
+					AC_MSG_ERROR(["Log levels 0, 7 and 8 cannot be combined with other values"], 1)
 				])
+				: $((log_level_count++))
 			],
 
 		[0|7|8], [AS_IF([test ${log_level_count} -ne 0],
 				[
-					AC_MSG_ERROR(["$1 should be a unique value element"], 1)
+					AC_MSG_ERROR(["Log level $1 cannot be combined with other values"], 1)
 				])
-			  log_single=yes
+				log_unique=yes
 			],
-
 		[AC_MSG_ERROR(["$1 is not a valid value"], 1)]
 	)
-
-	log_name=LOG_LEVEL_${log_level}
-	eval log_value=\$${log_name}
-	let "LOG_LEVEL |= ${log_value}"
 ]
 )
 
@@ -57,19 +49,18 @@ AC_DEFUN([DLEYNA_LOG_LEVEL_CHECK],
 	IFS=","
 
 	log_ok=yes
-	log_single=no
+	log_unique=no
 	log_level_count=0
 	LOG_LEVEL=0
-	log_array=(0 0 0 0 0 0 0 0 0)
 
 	for log_level in $1
 	do
 		IFS=${old_IFS}
 		_DLEYNA_LOG_LEVEL_CHECK_VALUE([$log_level])
 		IFS=","
-
-		let log_level_count++
-		let log_array[[${log_level}]]++
+		log_name=LOG_LEVEL_${log_level}
+		eval log_value=\$${log_name}
+		: $((LOG_LEVEL |= ${log_value}))
 	done
 
 	IFS=${old_IFS}