diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 11:59:27 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-09 11:59:27 +0000 |
| commit | aaa34aa07d4dbae1bcef69f50f410acdaf2d70da (patch) | |
| tree | 3f169aa6ec76c4f324396d4d56f580f7e34f7749 /libobjc | |
| parent | 62fa43578f5acfc6f90720338a65b0847153ca1c (diff) | |
| download | gcc-aaa34aa07d4dbae1bcef69f50f410acdaf2d70da.tar.gz | |
* configure.in: Improve comments on gthread_cflags. Improve m4
quotation, and replace 'if test' with 'case', for --enable-objc-gc.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80548 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 4 | ||||
| -rwxr-xr-x | libobjc/configure | 15 | ||||
| -rw-r--r-- | libobjc/configure.in | 15 |
3 files changed, 18 insertions, 16 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 341852b6cfa..eb706920ec4 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,5 +1,9 @@ 2004-04-09 Nathanael Nerode <neroden@gcc.gnu.org> + * configure.in: Improve comments on gthread_cflags. Improve m4 + quotation, and replace 'if test' with 'case', for --enable-objc-gc. + * configure: Regenerate. + * configure.in: Move PACKAGE and VERSION settings up top. Remove unused call to AC_PROG_LN_S. Default RANLIB to ':'. Remove redundant checks for values of RANLIB, AR, INSTALL. diff --git a/libobjc/configure b/libobjc/configure index 0de56e03960..ec35252927e 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -2790,9 +2790,10 @@ done # Determine CFLAGS for gthread. - +# FIXME: the current implementation is dependent on the 'r' variable +# passed down from the top level echo $ac_n "checking for gthread cflags""... $ac_c" 1>&6 -echo "configure:2796: checking for gthread cflags" >&5 +echo "configure:2797: checking for gthread cflags" >&5 if eval "test \"`echo '$''{'objc_cv_gthread_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2811,18 +2812,16 @@ GTHREAD_FLAGS=$objc_cv_gthread_flags # Check whether --enable-objc-gc or --disable-objc-gc was given. if test "${enable_objc_gc+set}" = set; then enableval="$enable_objc_gc" - if [ x$enable_objc_gc = xno ]; then - OBJC_BOEHM_GC='' -else - OBJC_BOEHM_GC=libobjc_gc.la -fi + case $enable_objc_gc in + no) OBJC_BOEHM_GC='' ;; + *) OBJC_BOEHM_GC=libobjc_gc.la ;; +esac else OBJC_BOEHM_GC='' fi - # We need multilib support, but only if configuring for the target. trap '' 1 2 15 cat > confcache <<\EOF diff --git a/libobjc/configure.in b/libobjc/configure.in index ccc0cc8e98b..040976d2290 100644 --- a/libobjc/configure.in +++ b/libobjc/configure.in @@ -223,7 +223,8 @@ AC_HEADER_STDC AC_CHECK_HEADERS(sched.h) # Determine CFLAGS for gthread. - +# FIXME: the current implementation is dependent on the 'r' variable +# passed down from the top level AC_CACHE_CHECK([for gthread cflags],objc_cv_gthread_flags, [if test -f "$r"/gcc/Makefile then @@ -237,15 +238,13 @@ AC_SUBST(GTHREAD_FLAGS) AC_ARG_ENABLE(objc-gc, [ --enable-objc-gc enable the use of Boehm's garbage collector with the GNU Objective-C runtime.], -if [[[ x$enable_objc_gc = xno ]]]; then - OBJC_BOEHM_GC='' -else - OBJC_BOEHM_GC=libobjc_gc.la -fi, -OBJC_BOEHM_GC='') +[case $enable_objc_gc in + no) OBJC_BOEHM_GC='' ;; + *) OBJC_BOEHM_GC=libobjc_gc.la ;; +esac], +[OBJC_BOEHM_GC='']) AC_SUBST(OBJC_BOEHM_GC) - # We need multilib support, but only if configuring for the target. AC_OUTPUT(Makefile, [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h |