[build] Fix GNUism in find and m4 to allow clean compile under openso…

…laris/gcc
djn3m0 · Jan 8, 2008 · 8efb986 · 8efb986
1 parent b763426
commit 8efb986
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -119,7 +119,7 @@ profile-std: $(DEBIT)
 .PHONY: doc deb srpm
 
 # doxygen documentation generation
-DOCSOURCES=$(shell find ./ -name '*.c' -or -name '*.h')
+DOCSOURCES=$(shell find ./ -name '*.c' -o -name '*.h')
 DOXYCONFIG=doc/doxygen.cfg
 DOXYDIR=doc
 

diff --git a/data/dbtoini.m4 b/data/dbtoini.m4
@@ -1,6 +1,8 @@
+dnl Compatibility macro for non-GNU m4
+define(`argn', `ifelse(`$1', 1, ``$2'', `argn(decr(`$1'), shift(shift($@)))')')dnl
 define(`_WIRE_ENDS',`translit(`$@', `,',`;')')dnl
 dnl We dismiss the length argument for the ini file
-define(_WIRE_ENTRY,
+define(`_WIRE_ENTRY',
 [$1]
 ID=$2
 DX=$3
@@ -9,4 +11,4 @@ EP=$5
 FUT=$7
 TYPE=$8
 DIR=$9
-SIT=$10)dnl
+SIT=`argn(`10',$@)')dnl