ChangeLogTag:Sat Nov 6 19:07:18 1999 Ossama Othman <othman@cs.wustl.edu>

1 files changed, 13 insertions, 7 deletions

diff --git a/TAO/tao-config.in b/TAO/tao-config.in
index 53c654e8565..19535df11c0 100644
--- a/TAO/tao-config.in
+++ b/TAO/tao-config.in
@@ -26,20 +26,20 @@ pkgincludedir=${includedir}/@PACKAGE@
 usage()
 {
     cat <<EOF
-Usage: tao-config [OPTIONS]... [LIBRARY]...
+Usage: tao-config OPTION [OPTIONS...] [LIBRARY]
 
-Generic options
+Generic options:
   --version	output TAO version information
   --help	display this help and exit
 
-Compilation support options
+Compilation support options:
   --cxx         print C++ compiler used for compiling
   --cxxflags	print C++ pre-processor and compiler flags
   --libs	print library linking information
   --libs-only-L	only print the -L/-R part of --libs
   --libs-only-l only print the -l part of --libs
 
-Install directories ace-libs was configured to
+Install directories TAO was configured with:
   --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
   --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
   --mandir  --includedir
@@ -69,6 +69,11 @@ cxxflags=false
 libs_L=false
 libs_l=false
 
+# These values are only valid for TAO.
+the_compiler="@CXX@"
+the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
+the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
+
 while test $# -gt 0; do
     case "$1" in
     -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -124,9 +129,10 @@ while test $# -gt 0; do
         the_flags="$the_flags `ace-config --cxxflags ace`"
 	;;
     tao)
-        the_compiler="@CXX@"
-       	the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
-  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
+# These are set before this option parsing loop begins.
+#       the_compiler="@CXX@"
+#       the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
+#       the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
 	;;
     orbsvcs)
         echo "Currently unsupported."