diff options
author | Jim Blandy <jimb@red-bean.com> | 1997-03-16 10:20:45 +0000 |
---|---|---|
committer | Jim Blandy <jimb@red-bean.com> | 1997-03-16 10:20:45 +0000 |
commit | e500ef7019accfbb64335672139b288da97ef212 (patch) | |
tree | bcb1c2332cd1d535efa82dc86aaf8316226263a3 | |
parent | 81e2a2357c5fea762cf73e2c6f179257f3c7203f (diff) | |
download | guile-e500ef7019accfbb64335672139b288da97ef212.tar.gz |
break up if if if
-rw-r--r-- | libguile/ChangeLog | 5 | ||||
-rwxr-xr-x | libguile/configure | 52 | ||||
-rw-r--r-- | libguile/configure.in | 4 |
3 files changed, 35 insertions, 26 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 035267c0e..4fe2a2347 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 16 05:09:55 1997 Jim Blandy <jimb@totoro.cyclic.com> + + * Fix shell syntax error; some shells won't tolerate + multiple "fi" statements on a single line. (Thanks to Fred Fish.) + Sat Mar 15 01:11:40 1997 Gary Houston <ghouston@actrix.gen.nz> * posix.c (scm_uname): throw an error if uname fails instead diff --git a/libguile/configure b/libguile/configure index fffdf1ecf..aa56622e0 100755 --- a/libguile/configure +++ b/libguile/configure @@ -2697,7 +2697,9 @@ if test "$ac_cv_func_shl_load" = "yes"; then #define DYNAMIC_LINKING 1 EOF -fi fi fi +fi +fi +fi fi @@ -2711,13 +2713,13 @@ if test "$cross_compiling" = yes; then echo "configure: warning: Guessing that stack grows down -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 2715 "configure" +#line 2717 "configure" #include "confdefs.h" aux (l) unsigned long l; { int x; exit (l >= ((unsigned long)&x)); } main () { int q; aux((unsigned long)&q); } EOF -if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_STACK_GROWS_UP 1 @@ -2740,11 +2742,11 @@ EOF echo "configure: warning: Guessing that sizeof(long) == sizeof(float) -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 2744 "configure" +#line 2746 "configure" #include "confdefs.h" main () { exit (sizeof(float) != sizeof(long)); } EOF -if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_SINGLES 1 @@ -2759,12 +2761,12 @@ fi echo $ac_n "checking for struct linger""... $ac_c" 1>&6 -echo "configure:2763: checking for struct linger" >&5 +echo "configure:2765: checking for struct linger" >&5 if eval "test \"`echo '$''{'scm_cv_struct_linger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2768 "configure" +#line 2770 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2773,7 +2775,7 @@ int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else @@ -2803,7 +2805,7 @@ FD_SETTER="" if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext <<EOF -#line 2807 "configure" +#line 2809 "configure" #include "confdefs.h" #include <stdio.h> @@ -2811,7 +2813,7 @@ int main() { stdout->_file = 1 ; return 0; } EOF -if { (eval echo configure:2815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_file = (D))" else @@ -2823,7 +2825,7 @@ fi if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext <<EOF -#line 2827 "configure" +#line 2829 "configure" #include "confdefs.h" #include <stdio.h> @@ -2831,7 +2833,7 @@ int main() { stdout->_fileno ; return 0; } EOF -if { (eval echo configure:2835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_fileno = (D))" else @@ -2860,19 +2862,19 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6 -echo "configure:2864: checking how to get buffer char count from FILE structure" >&5 +echo "configure:2866: checking how to get buffer char count from FILE structure" >&5 if eval "test \"`echo '$''{'scm_cv_struct_file_count'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2869 "configure" +#line 2871 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_cnt = 0 ; return 0; } EOF -if { (eval echo configure:2876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_cnt" else @@ -2880,14 +2882,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 2884 "configure" +#line 2886 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_r = 0 ; return 0; } EOF -if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_r" else @@ -2895,14 +2897,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 2899 "configure" +#line 2901 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->readCount = 0 ; return 0; } EOF -if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="readCount" else @@ -2929,14 +2931,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_gptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2933 "configure" +#line 2935 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_gptr = f->egptr; ; return 0; } EOF -if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_gptr=1 else @@ -2959,14 +2961,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_readptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2963 "configure" +#line 2965 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end; ; return 0; } EOF -if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_readptr=1 else @@ -3037,7 +3039,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3041: checking for $ac_word" >&5 +echo "configure:3043: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3066,7 +3068,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether errno codes can be extracted from errno.h""... $ac_c" 1>&6 -echo "configure:3070: checking whether errno codes can be extracted from errno.h" >&5 +echo "configure:3072: checking whether errno codes can be extracted from errno.h" >&5 if test "$GCC" = yes ; then echo "$ac_t""yes" 1>&6 ERRNO_EXTRACT="${CC-cc} -undef -dM -E $srcdir/errnos_get.c | egrep ' E.+' | cut -f2 -d' ' > errnos.list" diff --git a/libguile/configure.in b/libguile/configure.in index 9f023bb99..8e8a20d57 100644 --- a/libguile/configure.in +++ b/libguile/configure.in @@ -82,7 +82,9 @@ else AC_CHECK_FUNCS(shl_load) if test "$ac_cv_func_shl_load" = "yes"; then AC_DEFINE(DYNAMIC_LINKING) -fi fi fi +fi +fi +fi fi |