mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Moved libpng-config.in and libpng.pc-configure.in out of the scripts

Browse Source 
directory, to libpng-config.in and libpng-pc.in, respectively, and
    modified Makefile.am and configure.ac accordingly.  Now "configure"
    needs nothing from the "scripts" directory.
  Also, avoid redefining PNG_CONST in pngconf.h
This commit is contained in:
Glenn Randers-Pehrson 2009-11-13 16:29:45 -06:00
parent 11313ba8e7
commit 28d4aae5b9
7 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -664,6 +664,10 @@ version 1.4.0beta97 [November 13, 2009]
Revised Makefile.in Revised Makefile.in
version 1.4.0beta98 [November 13, 2009] version 1.4.0beta98 [November 13, 2009]
Moved libpng-config.in and libpng.pc-configure.in out of the scripts
directory, to libpng-config.in and libpng-pc.in, respectively, and
modified Makefile.am and configure.ac accordingly. Now "configure"
needs nothing from the "scripts" directory.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

5
CHANGES
View File

@ -2350,6 +2350,11 @@ version 1.4.0beta97 [November 13, 2009]
Revised Makefile.in Revised Makefile.in
version 1.4.0beta98 [November 13, 2009] version 1.4.0beta98 [November 13, 2009]
Moved libpng-config.in and libpng.pc-configure.in out of the scripts
directory, to libpng-config.in and libpng-pc.in, respectively, and
modified Makefile.am and configure.ac accordingly. Now "configure"
needs nothing from the "scripts" directory.
Avoid redefining PNG_CONST in pngconf.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

1
Makefile.am
View File

@ -73,7 +73,6 @@ EXTRA_DIST= \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \ ${srcdir}/projects/visualc71/* \
${srcdir}/projects/xcode/* \ ${srcdir}/projects/xcode/* \
${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \ ${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminim/* \ ${srcdir}/contrib/pngminim/* \
${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngminus/* \

12
Makefile.in
View File

@ -53,10 +53,9 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure $(top_srcdir)/scripts/libpng-config.in \ $(srcdir)/libpng-config.in $(srcdir)/libpng-pc.in \
$(top_srcdir)/scripts/libpng.pc-configure.in INSTALL TODO \ $(top_srcdir)/configure INSTALL TODO config.guess config.sub \
config.guess config.sub depcomp install-sh ltmain.sh missing \ depcomp install-sh ltmain.sh missing mkinstalldirs
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -323,7 +322,6 @@ EXTRA_DIST = \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \ ${srcdir}/projects/visualc71/* \
${srcdir}/projects/xcode/* \ ${srcdir}/projects/xcode/* \
${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \ ${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminim/* \ ${srcdir}/contrib/pngminim/* \
${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngminus/* \
@ -394,9 +392,9 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr: distclean-hdr:
-rm -f config.h stamp-h1 -rm -f config.h stamp-h1
libpng.pc: $(top_builddir)/config.status $(top_srcdir)/scripts/libpng.pc-configure.in libpng.pc: $(top_builddir)/config.status $(srcdir)/libpng-pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
libpng-config: $(top_builddir)/config.status $(top_srcdir)/scripts/libpng-config.in libpng-config: $(top_builddir)/config.status $(srcdir)/libpng-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES) install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)

8
configure vendored
View File

@ -11488,9 +11488,9 @@ fi
# Config files, substituting as above # Config files, substituting as above
ac_config_files="$ac_config_files Makefile libpng.pc:scripts/libpng.pc-configure.in" ac_config_files="$ac_config_files Makefile libpng.pc:libpng-pc.in"
ac_config_files="$ac_config_files libpng-config:scripts/libpng-config.in" ac_config_files="$ac_config_files libpng-config:libpng-config.in"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
@ -12467,8 +12467,8 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:scripts/libpng.pc-configure.in" ;; "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng-pc.in" ;;
"libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:scripts/libpng-config.in" ;; "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac

4
configure.ac
View File

@ -117,8 +117,8 @@ AC_ARG_WITH(binconfigs,
AC_SUBST([binconfigs]) AC_SUBST([binconfigs])
# Config files, substituting as above # Config files, substituting as above
AC_CONFIG_FILES([Makefile libpng.pc:scripts/libpng.pc-configure.in]) AC_CONFIG_FILES([Makefile libpng.pc:libpng-pc.in])
AC_CONFIG_FILES([libpng-config:scripts/libpng-config.in], AC_CONFIG_FILES([libpng-config:libpng-config.in],
[chmod +x libpng-config]) [chmod +x libpng-config])
AC_OUTPUT AC_OUTPUT

10
pngconf.h
View File

@ -419,10 +419,12 @@
* If you do not want to use const, define PNG_NO_CONST here. * If you do not want to use const, define PNG_NO_CONST here.
*/ */
#ifndef PNG_NO_CONST #ifndef PNG_CONST
# define PNG_CONST const # ifndef PNG_NO_CONST
#else # define PNG_CONST const
# define PNG_CONST # else
# define PNG_CONST
# endif
#endif #endif
/* The following defines give you the ability to remove code from the /* The following defines give you the ability to remove code from the