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

build: Add an explicit declaration of the AWK variable to configure.ac

Browse Source 
Declare AWK explicitly via the AC_ARG_VAR directive, in order to make
it "precious", and to include it in the list of influential variables
at the end of the configure help text.

Rephrase a few comments and config traces.

Finally, regenerate the configure script.
This commit is contained in:
Cosmin Truta 2024-02-20 15:10:12 +02:00
parent d165a20ae4
commit 29e31f622f
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -867,6 +867,7 @@ CCAS
CCASFLAGS CCASFLAGS
CPP CPP
LT_SYS_LIBRARY_PATH LT_SYS_LIBRARY_PATH
AWK
PNG_COPTS' PNG_COPTS'
@ -1613,7 +1614,8 @@ Some influential environment variables:
CPP C preprocessor CPP C preprocessor
LT_SYS_LIBRARY_PATH LT_SYS_LIBRARY_PATH
User-defined run-time library search path. User-defined run-time library search path.
PNG_COPTS additional flags for the C compiler, use this for options that AWK AWK language processor
PNG_COPTS additional flags for the C compiler, to be used for options that
would cause configure itself to fail would cause configure itself to fail
Use these variables to override the choices made by 'configure' or to help Use these variables to override the choices made by 'configure' or to help
@ -3389,7 +3391,7 @@ PNGLIB_RELEASE=43
ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers config.h"
# Checks for programs. # Check for basic programs.
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -13659,20 +13661,22 @@ CC=$lt_save_CC
# Some awks crash when confronted with pnglibconf.dfa, do a test run now
# to make sure this doesn't happen
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that AWK works" >&5 # Some awk implementations crash when confronted with pnglibconf.dfa.
printf %s "checking that AWK works... " >&6; } # Run a test now, to make sure this doesn't happen.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if awk ($AWK) works" >&5
printf %s "checking if awk ($AWK) works... " >&6; }
if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\ if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\ ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
${srcdir}/pngusr.dfa 1>&2 ${srcdir}/pngusr.dfa 1>&2
then then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "ok" >&6; } printf "%s\n" "yes" >&6; }
else else
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
as_fn_error 1 "failed as_fn_error 1 "no
See 'config.log' for more details" "$LINENO" 5; } See 'config.log' for more details" "$LINENO" 5; }
fi fi

17
configure.ac
View File

@ -56,7 +56,7 @@ dnl End of version number stuff
AC_CONFIG_SRCDIR([pngget.c]) AC_CONFIG_SRCDIR([pngget.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
# Checks for programs. # Check for basic programs.
AC_LANG([C]) AC_LANG([C])
AC_PROG_CC AC_PROG_CC
AM_PROG_AS AM_PROG_AS
@ -72,16 +72,19 @@ dnl compatible later version may be used
LT_INIT([win32-dll]) LT_INIT([win32-dll])
LT_PREREQ([2.4.2]) LT_PREREQ([2.4.2])
# Some awks crash when confronted with pnglibconf.dfa, do a test run now dnl Declare the AWK variable.
# to make sure this doesn't happen AC_ARG_VAR(AWK, [AWK language processor])
AC_MSG_CHECKING([that AWK works])
# Some awk implementations crash when confronted with pnglibconf.dfa.
# Run a test now, to make sure this doesn't happen.
AC_MSG_CHECKING([if awk ($AWK) works])
if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\ if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\ ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
${srcdir}/pngusr.dfa 1>&2 ${srcdir}/pngusr.dfa 1>&2
then then
AC_MSG_RESULT([ok]) AC_MSG_RESULT([yes])
else else
AC_MSG_FAILURE([failed], 1) AC_MSG_FAILURE([no], 1)
fi fi
# This is a remnant of the old cc -E validation, where it may have been # This is a remnant of the old cc -E validation, where it may have been
@ -111,7 +114,7 @@ AM_CONDITIONAL([ENABLE_TOOLS],
# (it checks the compiler with a program that generates a warning). # (it checks the compiler with a program that generates a warning).
# Add the following option to deal with this: # Add the following option to deal with this:
AC_ARG_VAR(PNG_COPTS, AC_ARG_VAR(PNG_COPTS,
[additional flags for the C compiler, use this for options that would] [additional flags for the C compiler, to be used for options that would]
[cause configure itself to fail]) [cause configure itself to fail])
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
AS_HELP_STRING([[[--enable-werror[=OPT]]]], AS_HELP_STRING([[[--enable-werror[=OPT]]]],