cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Attempt to fix problem with autogen.sh

Browse Source 
Renamed internal configure variable from prefix_TRUE to DO_PNG_PREFIX_TRUE
This commit is contained in:
John Bowler 2012-02-01 07:14:24 -06:00 committed by Glenn Randers-Pehrson
parent 0d4d0b4d32
commit 516c9c97a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -121,7 +121,7 @@ libpng.vers: scripts/vers.out
rm -f $@ rm -f $@
cp $? $@ cp $? $@
if prefix if DO_PNG_PREFIX
# Rename functions in scripts/prefix.out with a PNG_PREFIX prefix. # Rename functions in scripts/prefix.out with a PNG_PREFIX prefix.
# Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual # Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual
# implementation of the macro). # implementation of the macro).
@ -167,7 +167,7 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\ -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
-DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
if prefix if DO_PNG_PREFIX
SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@' SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
endif endif

2
configure.ac
View File

@ -231,7 +231,7 @@ AC_ARG_WITH(libpng-prefix,
[if test "${withval:-no}" != "no"; then [if test "${withval:-no}" != "no"; then
AC_SUBST([PNG_PREFIX], [${withval}]) AC_SUBST([PNG_PREFIX], [${withval}])
fi]) fi])
AM_CONDITIONAL([prefix], [test "${with_libpng_prefix:-no}" != "no"]) AM_CONDITIONAL([DO_PNG_PREFIX], [test "${with_libpng_prefix:-no}" != "no"])
# Because GCC by default assembles code with an executable stack, even though it # Because GCC by default assembles code with an executable stack, even though it
# compiles C code with a non-executable stack, it is necessary to do a fixup # compiles C code with a non-executable stack, it is necessary to do a fixup