diff options
Diffstat (limited to 'Build/source/libs/gd')
-rw-r--r-- | Build/source/libs/gd/Makefile.in | 2 | ||||
-rwxr-xr-x | Build/source/libs/gd/configure | 57 | ||||
-rw-r--r-- | Build/source/libs/gd/configure.ac | 15 |
3 files changed, 59 insertions, 15 deletions
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index ab31787ee42..c56eb6fac7d 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -52,7 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = gd.h LIBRARIES = $(noinst_LIBRARIES) AR = ar ARFLAGS = cru diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index bb0f2473159..0c1d5a4950e 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -4839,12 +4839,13 @@ fi # don't run any tests for '--disable-build', there may be no zlib. if test "x$enable_build" != xno; then -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES" LIBS="$ZLIB_LIBS $LIBS" + { $as_echo "$as_me:$LINENO: checking for deflate" >&5 $as_echo_n "checking for deflate... " >&6; } if test "${ac_cv_func_deflate+set}" = set; then @@ -5102,6 +5103,7 @@ _ACEOF CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" LIBS="$LIBPNG_LIBS $LIBS" + { $as_echo "$as_me:$LINENO: checking for png_create_read_struct" >&5 $as_echo_n "checking for png_create_read_struct... " >&6; } if test "${ac_cv_func_png_create_read_struct+set}" = set; then @@ -5356,14 +5358,18 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + fi GD_TREE=gd-2.0.35 +ac_config_links="$ac_config_links gd.h:$GD_TREE/gd.h" + + ac_config_files="$ac_config_files Makefile" @@ -5841,6 +5847,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" +config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -5869,6 +5876,9 @@ $config_files Configuration headers: $config_headers +Configuration links: +$config_links + Configuration commands: $config_commands @@ -6002,6 +6012,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; + "gd.h") CONFIG_LINKS="$CONFIG_LINKS gd.h:$GD_TREE/gd.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -6018,6 +6029,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -6315,7 +6327,7 @@ $as_echo "$as_me: error: could not setup config headers machinery" >&2;} fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -6649,7 +6661,42 @@ $as_echo X"$_am_arg" | } s/.*/./; q'`/stamp-h$_am_stamp_count ;; + :L) + # + # CONFIG_LINK + # + if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then + : + else + # Prefer the file from the source tree if names are identical. + if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then + ac_source=$srcdir/$ac_source + fi + + { $as_echo "$as_me:$LINENO: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + { { $as_echo "$as_me:$LINENO: error: $ac_source: file not found" >&5 +$as_echo "$as_me: error: $ac_source: file not found" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f "$ac_file" + + # Try a relative symlink, then a hard link, then a copy. + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || + { { $as_echo "$as_me:$LINENO: error: cannot link or copy $ac_source to $ac_file" >&5 +$as_echo "$as_me: error: cannot link or copy $ac_source to $ac_file" >&2;} + { (exit 1); exit 1; }; } + fi + ;; :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac index 4f43433fe22..2bd49f51610 100644 --- a/Build/source/libs/gd/configure.ac +++ b/Build/source/libs/gd/configure.ac @@ -53,31 +53,28 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno]) # don't run any tests for '--disable-build', there may be no zlib. if test "x$enable_build" != xno; then -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS - -CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $LIBS" +KPSE_ADD_FLAGS([zlib]) AC_CHECK_FUNC([deflate], , [AC_ERROR([zlib not found])]) AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])]) AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.]) -CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" -LIBS="$LIBPNG_LIBS $LIBS" +KPSE_ADD_FLAGS([libpng]) AC_CHECK_FUNC([png_create_read_struct], , [AC_ERROR([libpng not found])]) AC_CHECK_HEADERS([png.h], , [AC_ERROR([libpng not found])]) AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.]) -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS +KPSE_RESTORE_FLAGS fi GD_TREE=gd-[]gd_version AC_SUBST([GD_TREE]) +dnl Use $GD_TREE to exclude $GD_TREE/gd.h from DIST_COMMON +AC_CONFIG_LINKS([gd.h:$GD_TREE/gd.h]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT |