[devel] 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.
  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

8
configure vendored
View File

@@ -11488,9 +11488,9 @@ fi
# 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
@@ -12467,8 +12467,8 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:scripts/libpng.pc-configure.in" ;;
"libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:scripts/libpng-config.in" ;;
"libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng-pc.in" ;;
"libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac