summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-20 09:15:29 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-20 09:15:29 +0000
commitac005f402389542b123fd41fd9fc54322f3becf1 (patch)
tree6234c1b385dd10b6716c676108ecf68856ea7480 /Build/source/libs/zlib/configure
parent9301a1dd22ac8cedf4f7f980c96ef9e4f2bd37c2 (diff)
somewhat reorganize libs build system
git-svn-id: svn://tug.org/texlive/trunk@16091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zlib/configure')
-rwxr-xr-xBuild/source/libs/zlib/configure57
1 files changed, 15 insertions, 42 deletions
diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure
index bced34ac458..c6bbcef508c 100755
--- a/Build/source/libs/zlib/configure
+++ b/Build/source/libs/zlib/configure
@@ -603,6 +603,7 @@ GREP
CPP
build_FALSE
build_TRUE
+LN_S
RANLIB
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -3578,6 +3579,17 @@ else
RANLIB="$ac_cv_prog_RANLIB"
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
ac_config_headers="$ac_config_headers config.h"
@@ -4052,10 +4064,7 @@ if test -f $srcdir/$ZLIB_TREE/zconf.h; then
as_fn_error "Sorry, you must remove the file $ZLIB_TREE/zconf.h" "$LINENO" 5
fi
-ac_config_links="$ac_config_links zlib.h:$ZLIB_TREE/zlib.h"
-
-
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile include/Makefile"
cat >confcache <<\_ACEOF
@@ -4614,7 +4623,6 @@ 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
@@ -4644,9 +4652,6 @@ $config_files
Configuration headers:
$config_headers
-Configuration links:
-$config_links
-
Configuration commands:
$config_commands
@@ -4778,8 +4783,8 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "zlib.h") CONFIG_LINKS="$CONFIG_LINKS zlib.h:$ZLIB_TREE/zlib.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -4793,7 +4798,6 @@ 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
@@ -5081,7 +5085,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_HEADERS"
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
shift
for ac_tag
do
@@ -5357,38 +5361,7 @@ $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:${as_lineno-$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_fn_error "$ac_source: file not found" "$LINENO" 5
- 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_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
- fi
- ;;
:C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;