*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 244103342eb200ffe971c398eb33c0bec25c5dcd..cee9caa96ed44df85548db7af4e6829e712f1ac5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Aug 14 09:30:47 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * ltmain.sh.in: Accept `--quiet' and `--silent' flags to turn off
+       command echoing.  From Juergen A. Erhard.
+
+       (compile): Recognize the Objective C `.m' extension.  From Juergen
+       A. Erhard.
+
+       (compile): Suppress error output from the second compilation (if
+       any) so that we don't get those frustrating duplicate error
+       messages.
+
 Tue Aug 12 09:36:59 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * ltconfig.in: Added messages to config.log to describe what sort

diff --git a/NEWS b/NEWS
index ff36ae9f6b124797d5b315835dd3bfb8c7621d86..8311382ae104ec94903c753218d29455bb7e9f16 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ New in 1.0b:
   modules.
 * Allow configure.in to change the defaults for AM_PROG_LIBTOOL's
   `--enable-{shared,static}' by setting `enable_{shared,static}=no'.
+* Suppress duplicate compiler output during `compile' mode.
 \f
 New in 1.0:
 * Bug fixes.

diff --git a/ltconfig.in b/ltconfig.in
index b84364ebe890de2952a75297fe28220fbab06f76..92762626026378973e2c71442722a1ef1b6e34f0 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -474,13 +474,16 @@ alpha | rs6000 | powerpc | powerpcle)
 esac
 
 if test -n "$pic_flag"; then
+  echo $ac_t "$pic_flag" 1>&6
+
   # Check to make sure the pic_flag actually works.
+  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
   $rm conftest*
   echo > conftest.c
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pic_flag -DPIC"
   # LINENO
-  echo "$progname:483:checking whether $compiler PIC flag $pic_flag works" >&5
+  echo "$progname:483: checking if $compiler PIC flag $pic_flag works" >&5
   if { (eval echo $progname:484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
     # Append any errors to the config.log.
     cat conftest.err 1>&5
@@ -488,10 +491,11 @@ if test -n "$pic_flag"; then
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
     # reports no error.  So, we need to grep stderr for (Bundled).
     if grep '(Bundled)' conftest.err >/dev/null; then
-      echo $ac_t none 1>&6
+      echo $ac_t no 1>&6
+      can_build_shared=no
       pic_flag=
     else
-      echo $ac_t "$pic_flag" 1>&6
+      echo $ac_t yes 1>&6
       pic_flag=" $pic_flag"
     fi
   else
@@ -499,7 +503,7 @@ if test -n "$pic_flag"; then
     cat conftest.err 1>&5
     can_build_shared=no
     pic_flag=
-    echo $ac_t none 1>&6
+    echo $ac_t no 1>&6
   fi
   CFLAGS="$save_CFLAGS"
   $rm conftest*
@@ -517,13 +521,13 @@ if test -n "$special_shlib_compile_flags"; then
   fi
 fi
 
-echo $ac_n "checking for $compiler option to statically link programs... $ac_c" 1>&6
+echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
 $rm conftest*
 echo 'main(){return(0);}' > conftest.c
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $link_static_flag"
 # LINENO
-echo "$progname:526:checking if $compiler static flag $link_static_flag works" >&5
+echo "$progname:526: checking if $compiler static flag $link_static_flag works" >&5
 if { (eval echo $progname:527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   echo $ac_t "$link_static_flag" 1>&6
 else
@@ -808,7 +812,7 @@ main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
 # LINENO
-echo "$progname:811:checking if global_symbol_pipe works" >&5
+echo "$progname:811: checking if global_symbol_pipe works" >&5
 if { (eval echo $progname:812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
   # Now try to grab the symbols. LINENO
   nlist=conftest.nm

diff --git a/ltmain.sh.in b/ltmain.sh.in
index 2b695ad4c8c365d271f2a7c549565244530ac177..257cf84a6962faea5489bc8543d3f9f793593b62 100644 (file)
--- a/ltmain.sh.in
+++ b/ltmain.sh.in
@@ -121,6 +121,10 @@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --quiet | --silent)
+    show=:
+    ;;
+
   -*)
     echo "$progname: unrecognized option \`$arg'" 1>&2
     echo "$help" 1>&2
@@ -191,6 +195,7 @@ if test -z "$show_help"; then
     base_compile="$nonopt"
     lastarg=
     srcfile=
+    suppress_output=
 
     for arg
     do
@@ -210,14 +215,14 @@ if test -z "$show_help"; then
     libobj=`echo "$srcfile" | sed -e 's%^.*/%%'`
 
     # Recognize several different file suffixes.
-    xform='[cCFSf]'
+    xform='[cCFSfm]'
     case "$libobj" in
-    *.c++) xform='c++' ;;
+    *.c++) xform=c++ ;;
     *.cc) xform=cc ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
     *.f90) xform=f90 ;;
-    *.for) xform='for' ;;
+    *.for) xform=for ;;
     esac
 
     libobj=`echo "$libobj" | sed -e "s/\.$xform$/.lo/"`
@@ -265,12 +270,16 @@ if test -z "$show_help"; then
       # Just move the object, then go on to compile the next one
       $show "$mv $obj $libobj"
       $run $mv $obj $libobj || exit 1
+
+      # Allow error messages only from the first compilation.
+      suppress_output=' >/dev/null 2>&1'
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
-      $show "$base_compile $srcfile"
-      if $run eval "$base_compile $srcfile"; then :
+      # Suppress compiler output if we already did a PIC compilation.
+      $show "$base_compile $srcfile$suppress_output"
+      if $run eval "$base_compile $srcfile$suppress_output"; then :
       else
         $run $rm $obj $libobj
         exit 1
@@ -1808,6 +1817,8 @@ Provide generalized library-building support services.
     --finish          same as \`--mode=finish'
     --help            display this help message and exit
     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
     --version         print version information
 
 MODE must be one of the following:

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 90b5e8c0f8f491fa609e2dcaa6ae0c83f30ec359..147a5a0cb14e08478c39a9b4f1e1cbbaf6d579a8 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 14 09:30:29 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
+
+       * suffix.test (extensions): Added Objective C extension, `.m'.
+
 Thu Jul 24 11:04:22 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * demo-exec.test (status): Use status variables so that we try to

diff --git a/tests/suffix.test b/tests/suffix.test
index 2e249ed80e3a9a90fd4423b2aa76662dff01dfa8..e577128a135c77c8cc223626ad826a32ab3c28be 100755 (executable)
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -1,8 +1,8 @@
 #! /bin/sh
 # suffix.test - check that libtool knows how to transform source suffices.
 
-# Extensions taken from the ones that Automake recognizes.
-extensions="C F S c c++ cc cpp cxx f f90 for"
+# Extensions taken from the ones that Automake recognizes, plus Objective C.
+extensions="C F S c c++ cc cpp cxx f f90 for m"
 bad_names="foo."
 
 # Test script header.