[devel] Changed new configure option "zprefix=string" to "zlib-prefix=string"

This commit is contained in:
Glenn Randers-Pehrson
2011-01-04 09:07:45 -06:00
parent 8f8061adba
commit 977f6eba3d
4 changed files with 45 additions and 39 deletions

44
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for libpng-1.5.0rc05
# Generated by GNU Autoconf 2.68 for libpng 1.5.0rc06
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.5.0rc05'
PACKAGE_STRING='1.5.0rc05'
PACKAGE_VERSION='1.5.0rc06'
PACKAGE_STRING='libpng 1.5.0rc06'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -750,7 +750,7 @@ with_pic
enable_fast_install
with_sysroot
enable_libtool_lock
with_zprefix
with_zlib_prefix
with_pkgconfigdir
with_binconfigs
'
@@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libpng 1.5.0rc05 to adapt to many kinds of systems.
\`configure' configures libpng 1.5.0rc06 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1376,7 +1376,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.0rc05:";;
short | recursive ) echo "Configuration of libpng 1.5.0rc06:";;
esac
cat <<\_ACEOF
@@ -1402,7 +1402,7 @@ Optional Packages:
both]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
--with-zprefix prefix that may have been used in installed zlib
--with-zlib-prefix prefix that may have been used in installed zlib
--with-pkgconfigdir Use the specified pkgconfig dir (default is
libdir/pkgconfig)
--with-binconfigs Generate shell libpng-config scripts as well as
@@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.5.0rc05
libpng configure 1.5.0rc06
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1907,7 +1907,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.5.0rc05, which was
It was created by libpng $as_me 1.5.0rc06, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2722,7 +2722,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.5.0rc05'
VERSION='1.5.0rc06'
cat >>confdefs.h <<_ACEOF
@@ -2786,7 +2786,7 @@ fi
PNGLIB_VERSION=1.5.0rc05
PNGLIB_VERSION=1.5.0rc06
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=0
@@ -12251,11 +12251,11 @@ fi
done
# Check whether --with-zprefix was given.
if test "${with_zprefix+set}" = set; then :
withval=$with_zprefix; zprefix=${withval}
# Check whether --with-zlib-prefix was given.
if test "${with_zlib_prefix+set}" = set; then :
withval=$with_zlib_prefix; ZPREFIX=${withval}
else
zprefix='z_'
ZPREFIX='z_'
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
@@ -12302,9 +12302,9 @@ _ACEOF
LIBS="-lz $LIBS"
else
as_ac_Lib=`$as_echo "ac_cv_lib_z_${zprefix}zlibVersion" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${zprefix}zlibVersion in -lz" >&5
$as_echo_n "checking for ${zprefix}zlibVersion in -lz... " >&6; }
as_ac_Lib=`$as_echo "ac_cv_lib_z_${ZPREFIX}zlibVersion" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ZPREFIX}zlibVersion in -lz" >&5
$as_echo_n "checking for ${ZPREFIX}zlibVersion in -lz... " >&6; }
if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -12319,11 +12319,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char ${zprefix}zlibVersion ();
char ${ZPREFIX}zlibVersion ();
int
main ()
{
return ${zprefix}zlibVersion ();
return ${ZPREFIX}zlibVersion ();
;
return 0;
}
@@ -12993,7 +12993,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.5.0rc05, which was
This file was extended by libpng $as_me 1.5.0rc06, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13059,7 +13059,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libpng config.status 1.5.0rc05
libpng config.status 1.5.0rc06
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"