r23314: For some systems it's needed to inject replace.h into

the iniparser source code, I do it in a way we can still have
a unmodified copy of iniparser in source/iniparser/
and have the wrapper stuff in source/iniparser_build/.

If the build-farm is happy with this I'll merge it to 3_0_26
tomorrow...

metze

diff --git a/source/Makefile.in b/source/Makefile.in
index 0479b85e1acc791efa79a56a65e60cca3494988c..db62d436ebaf8cc689131fbd677c5aec620aa0eb 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -902,8 +902,8 @@ SMB_KRB5_LOCATOR_OBJ = $(SMB_KRB5_LOCATOR_OBJ1) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ)
 POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
 
 POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
 

-INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \
-               iniparser/src/strlib.o
+INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \
+               iniparser_build/strlib.o

 
 TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
        $(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ)
 
 TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
        $(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ)

diff --git a/source/iniparser_build/dictionary.c b/source/iniparser_build/dictionary.c
new file mode 100644 (file)
index 0000000..de98a45
--- /dev/null
+++ b/source/iniparser_build/dictionary.c
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/dictionary.c"

diff --git a/source/iniparser_build/iniparser.c b/source/iniparser_build/iniparser.c
new file mode 100644 (file)
index 0000000..4974f37
--- /dev/null
+++ b/source/iniparser_build/iniparser.c
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/iniparser.c"

diff --git a/source/iniparser_build/strlib.c b/source/iniparser_build/strlib.c
new file mode 100644 (file)
index 0000000..685ec8e
--- /dev/null
+++ b/source/iniparser_build/strlib.c
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/strlib.c"