From 4c5f4270d4baaa7642a1f94161826edf9136e3c4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 18 Apr 2013 06:17:38 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/Makefile.in | 2 +- autogen/configure | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 5f213903e9b..912aefe095a 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -663,7 +663,7 @@ LIB_MATH = @LIB_MATH@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LN_S = @LN_S@ +LN_S_FILEONLY = @LN_S_FILEONLY@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ diff --git a/autogen/configure b/autogen/configure index cc0e18b7d8f..8e69c9ceffc 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1363,7 +1363,7 @@ HAVE_MAKEINFO PAXCTL GZIP_PROG INSTALL_INFO -LN_S +LN_S_FILEONLY GNULIB_WARN_CFLAGS WARN_CFLAGS WERROR_CFLAGS @@ -8115,18 +8115,36 @@ 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 "$as_me:${as_lineno-$LINENO}: checking whether ln -s works for files in the same directory" >&5 +$as_echo_n "checking whether ln -s works for files in the same directory... " >&6; } +rm -f conf$$ conf$$.file + +LN_S_FILEONLY='cp -p' + +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY='ln -s' + elif ln conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY=ln + fi +fi + +rm -f conf$$ conf$$.file + +if test "$LN_S_FILEONLY" = "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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S_FILEONLY" >&5 +$as_echo "no, using $LN_S_FILEONLY" >&6; } fi + + # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -- 2.11.4.GIT