Attachment #90802 for bug #139052

View | Details | Raw Unified | Return to bug 139052
Collapse All | Expand All




  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
if test "$LIBPNG_DEFINES"; then
    AC_MSG_RESULT(no)
    LIBPNG_NO_ASSEMBLER=true
else
    AC_MSG_RESULT(yes)
    LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
    LIBPNG_NO_ASSEMBLER=
fi
AC_SUBST(LIBPNG_DEFINES)
AC_SUBST(LIBPNG_NO_ASSEMBLER)

AC_MSG_CHECKING([if libraries can be versioned])
GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`





CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym

pngconf.h.in:
	cat pngconf.h > pngconf.h.in

pngconf.h: pngconf.h.in
	sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
	@if test -n "@LIBPNG_NO_ASSEMBLER@"; then \
	echo "#define PNG_NO_ASSEMBLER_CODE" >> pngconf.h; \
	fi
	sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h

$(PNGLIB_BASENAME).pc: libpng.pc
	cp libpng.pc $@


Lines 19-24 Link Here

(-)libpng-1.2.10-orig/pngconf.h (+7 lines)
19		19
20	#define PNG_1_2_X	20	#define PNG_1_2_X
21		21
		22	/* Backported no-assembler fix from libpng-1.4.0beta8 */
		23
		24	/* Makefile-supplied defines go here: */
		25	/* End of Makefile-supplied defines. */
		26
		27	/* End of backported no-assembler fix */
		28
22	/*	29	/*
23	* PNG_USER_CONFIG has to be defined on the compiler command line. This	30	* PNG_USER_CONFIG has to be defined on the compiler command line. This
24	* includes the resource compiler for Windows DLL configurations.	31	* includes the resource compiler for Windows DLL configurations.

Return to bug 139052

Lines 66-76 Link Here

(-)libpng-1.2.10-orig/configure.ac (+3 lines)
66	LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)	66	LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
67	if test "$LIBPNG_DEFINES"; then	67	if test "$LIBPNG_DEFINES"; then
68	AC_MSG_RESULT(no)	68	AC_MSG_RESULT(no)
		69	LIBPNG_NO_ASSEMBLER=true
69	else	70	else
70	AC_MSG_RESULT(yes)	71	AC_MSG_RESULT(yes)
71	LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG	72	LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
		73	LIBPNG_NO_ASSEMBLER=
72	fi	74	fi
73	AC_SUBST(LIBPNG_DEFINES)	75	AC_SUBST(LIBPNG_DEFINES)
		76	AC_SUBST(LIBPNG_NO_ASSEMBLER)
74		77
75	AC_MSG_CHECKING([if libraries can be versioned])	78	AC_MSG_CHECKING([if libraries can be versioned])
76	GLD=`$LD --help < /dev/null 2>/dev/null \| grep version-script`	79	GLD=`$LD --help < /dev/null 2>/dev/null \| grep version-script`

Lines 87-92 Link Here

(-)libpng-1.2.10-orig/Makefile.am (+10 lines)
87		87
88	CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym	88	CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
89		89
		90	pngconf.h.in:
		91	cat pngconf.h > pngconf.h.in
		92
		93	pngconf.h: pngconf.h.in
		94	sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h
		95	@if test -n "@LIBPNG_NO_ASSEMBLER@"; then \
		96	echo "#define PNG_NO_ASSEMBLER_CODE" >> pngconf.h; \
		97	fi
		98	sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h
		99
90	$(PNGLIB_BASENAME).pc: libpng.pc	100	$(PNGLIB_BASENAME).pc: libpng.pc
91	cp libpng.pc $@	101	cp libpng.pc $@
92		102