Author: metze Date: 2007-06-04 08:25:03 +0000 (Mon, 04 Jun 2007) New Revision: 23332
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23332 Log: merge from SAMBA_3_0: 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/. metze Added: branches/SAMBA_3_0_26/source/iniparser_build/ branches/SAMBA_3_0_26/source/iniparser_build/dictionary.c branches/SAMBA_3_0_26/source/iniparser_build/iniparser.c branches/SAMBA_3_0_26/source/iniparser_build/strlib.c Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in =================================================================== --- branches/SAMBA_3_0_26/source/Makefile.in 2007-06-04 08:04:15 UTC (rev 23331) +++ branches/SAMBA_3_0_26/source/Makefile.in 2007-06-04 08:25:03 UTC (rev 23332) @@ -876,8 +876,8 @@ 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) Added: branches/SAMBA_3_0_26/source/iniparser_build/dictionary.c =================================================================== --- branches/SAMBA_3_0_26/source/iniparser_build/dictionary.c 2007-06-04 08:04:15 UTC (rev 23331) +++ branches/SAMBA_3_0_26/source/iniparser_build/dictionary.c 2007-06-04 08:25:03 UTC (rev 23332) @@ -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" Added: branches/SAMBA_3_0_26/source/iniparser_build/iniparser.c =================================================================== --- branches/SAMBA_3_0_26/source/iniparser_build/iniparser.c 2007-06-04 08:04:15 UTC (rev 23331) +++ branches/SAMBA_3_0_26/source/iniparser_build/iniparser.c 2007-06-04 08:25:03 UTC (rev 23332) @@ -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" Added: branches/SAMBA_3_0_26/source/iniparser_build/strlib.c =================================================================== --- branches/SAMBA_3_0_26/source/iniparser_build/strlib.c 2007-06-04 08:04:15 UTC (rev 23331) +++ branches/SAMBA_3_0_26/source/iniparser_build/strlib.c 2007-06-04 08:25:03 UTC (rev 23332) @@ -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"
