merged libpng 1.5.7 to trunk

[wxWidgets.git] / src / png / scripts / pnglibconf.mak

diff --git a/src/png/scripts/pnglibconf.mak b/src/png/scripts/pnglibconf.mak
index 1509ee242ec82434734d9b88d4eccc76fc408124..c04578f31d9e545b716cdb1e4ce33303766bf698 100755 (executable)
--- a/src/png/scripts/pnglibconf.mak
+++ b/src/png/scripts/pnglibconf.mak
@@ -35,18 +35,19 @@ pnglibconf.h: pnglibconf.dfn
        $(ECHO) '#include "pnglibconf.dfn"' >dfn.c
        $(CPP) $(DFNFLAGS) dfn.c >dfn1.out
        $(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
-       $(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
+       $(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
            dfn1.out >dfn2.out
-       $(SED) -e 's| *@@@ *||g' -e 's| *$$||' dfn2.out >dfn3.out
+       $(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
        $(COPY) dfn3.out $@
        $(DELETE) dfn.c dfn1.out dfn2.out dfn3.out
 
-pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
+pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h
        $(DELETE) $@ dfn1.out dfn2.out
        $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
        $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
-       $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
-           $(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+       $(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out version=search\
+               $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\
+               $(DFA_XTRA) 1>&2
        $(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2
        $(COPY) dfn2.out $@
        $(DELETE) dfn1.out dfn2.out