diff options
author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-05 01:49:00 +0000 |
---|---|---|
committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-05 01:49:00 +0000 |
commit | 84f79fe061660d51043fa1cf96bdbbd286c306f0 (patch) | |
tree | 2dd380c734aff87bca38f70d190fba64ec977f9a /TAO | |
parent | c7c896964fb734406202e17df820b44effd51593 (diff) | |
download | ATCD-84f79fe061660d51043fa1cf96bdbbd286c306f0.tar.gz |
ChangeLogTag: Tue Jan 4 17:55:15 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/Makefile.am | 8 | ||||
-rw-r--r-- | TAO/Release | 2 | ||||
-rw-r--r-- | TAO/configure.ac | 2 | ||||
-rw-r--r-- | TAO/tao-config.1.in | 56 | ||||
-rw-r--r-- | TAO/tao-config.in | 215 |
5 files changed, 1 insertions, 282 deletions
diff --git a/TAO/Makefile.am b/TAO/Makefile.am index 31a4fdd65a9..c58de134d89 100644 --- a/TAO/Makefile.am +++ b/TAO/Makefile.am @@ -14,10 +14,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = -I ../m4 -bin_SCRIPTS = tao-config - -man_MANS = tao-config.1 - SUBDIRS = \ TAO_IDL \ tao \ @@ -30,9 +26,7 @@ EXTRA_DIST = \ VERSION \ COPYING.sun \ LICENSE.sun \ - README.sun \ - tao-config.in \ - tao-config.1.in + README.sun DISTCLEANFILES = tao-config tao-config.1 diff --git a/TAO/Release b/TAO/Release index 664d444102c..6bee75afd4b 100644 --- a/TAO/Release +++ b/TAO/Release @@ -31,8 +31,6 @@ CONTROLLED_FILES = \ TAO/release.pl \ TAO/rules.tao.GNU \ TAO/tao \ - TAO/tao-config.1.in \ - TAO/tao-config.in \ TAO/Makefile.am \ TAO/configure.ac \ TAO/tests \ diff --git a/TAO/configure.ac b/TAO/configure.ac index f4fd5660ab8..377ff930639 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -172,8 +172,6 @@ dnl created from Makefile.in, etc. Top-level Makefiles should be dnl created first. AC_CONFIG_FILES([ - tao-config - tao-config.1 Makefile TAO_IDL/Makefile tao/Makefile diff --git a/TAO/tao-config.1.in b/TAO/tao-config.1.in deleted file mode 100644 index ace12a91ac2..00000000000 --- a/TAO/tao-config.1.in +++ /dev/null @@ -1,56 +0,0 @@ -.\" Process this file with -.\" groff -man -Tascii tao-config.1 -.\" -.TH tao-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals" -.SH NAME -tao-config \- Display TAO Library Configuration -.SH SYNOPSIS -.B tao-config -.I OPTION -.B [ -.I OPTION -.B ... ] -.B [ -.I LIBRARY -.B ] -.SH DESCRIPTION -.B tao-config -is a script that is used to display what compiler flags and libraries were -used when TAO was built. -.SH OPTIONS -.IP --version -TAO version information -.IP --help -display help message and exit -.IP --cxx -C++ compiler used for compiling -.IP --cxxflags -C++ pre-processor and compiler flags -.IP --libs -library linking information -.IP --libs-only-L -the -L/-R part of -.I --libs -.IP --libs-only-l -the -l part of -.I --libs -.SH LIBRARY -.I LIBRARY -refers to the library for which the specified configuration is desired. Valid -libraries are: -.IP orbsvcs -the TAO ORB services library -.IP tao -the TAO library -.SH FILES -.I @libdir@/taoConf.sh -.RS -Additional TAO related library configuration information. -.RE -.SH BUGS -None. -exists. -.SH AUTHOR -Ossama Othman <othman@cs.wustl.edu> -.SH "SEE ALSO" -.BR ace-config (1) diff --git a/TAO/tao-config.in b/TAO/tao-config.in deleted file mode 100644 index 757c80eb15c..00000000000 --- a/TAO/tao-config.in +++ /dev/null @@ -1,215 +0,0 @@ -#!/bin/sh -# -# $Id$ - -set -e - -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ -sharedstatedir=@sharedstatedir@ -localstatedir=@localstatedir@ -libdir=@libdir@ -infodir=@infodir@ -mandir=@mandir@ -includedir=@includedir@ - -pkgdatadir=${datadir}/@PACKAGE@ -pkglibdir=${libdir}/@PACKAGE@ -pkgincludedir=${includedir}/@PACKAGE@ - -usage() -{ - cat <<EOF -Usage: tao-config OPTION [OPTIONS...] [LIBRARY] - -Generic options: - --version output TAO version information - --help display this help and exit - -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 TAO was configured with: - --prefix --exec-prefix --bindir --sbindir --libexecdir --datadir - --sysconfdir --sharedstatedir --localstatedir --libdir --infodir - --mandir --includedir - -Known values for LIBRARY are: - - ace (calls ace-config) - orbsvcs - tao - -If LIBRARY is none of these, - - ${libdir}/<LIBRARY>Conf.sh - -is looked in for the necessary information. -EOF - - exit $1 -} - -if test $# -eq 0; then - usage 1 -fi - -cxx=false -cxxflags=false -libs_L=false -libs_l=false - -# These values are only valid for TAO. -the_compiler="@CXX@" -the_libs="$the_libs @TAO_LIBDIR@ -lTAO @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]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --version) - echo @PACKAGE@ @VERSION@ - exit 0 - ;; - --exec-prefix) - echo $exec_prefix - exit 0 - ;; - --prefix) - echo $prefix - exit 0 - ;; - --*dir) - dirname=\$`echo $1 | sed -e 's,^--,,'` - dirname=`eval echo $dirname` - test -z "$dirname" && exit 1 - echo $dirname - exit 0 - ;; - --help) - usage 0 - ;; - --cxx) - cxx=true - ;; - --cxxflags) - cxxflags=true - ;; - --libs) - libs_L=true - libs_l=true - ;; - --libs-only-L) - libs_L=true - ;; - --libs-only-l) - libs_l=true - ;; - --*) - usage 1 - ;; - ace) - # The ACE compiler should be the same as TAO's compiler! - the_compiler="`ace-config --cxx tao`" - the_libs="$the_libs `ace-config --libs ace`" - the_flags="$the_flags `ace-config --cxxflags ace`" - ;; - tao) -# 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." - exit 1 -# the_libs="$the_libs @TAO_LIBDIR@ @ORBSVCS_LIBS@" -# the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@" - ;; - *) - cnf_sh=${libdir}/${1}Conf.sh - if test -f ${cnf_sh}; then - . ${cnf_sh} - up_name=`echo $1 | tr a-z A-Z` - cnf_compiler=\$${up_name}_COMPILER - cnf_libdir=\$${up_name}_LIBDIR - cnf_libs=\$${up_name}_LIBS - cnf_flags=\$${up_name}_INCLUDEDIR - the_compiler="`eval echo $cnf_compiler`" - the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`" - the_flags="$the_flags `eval echo $cnf_flags`" - else - echo Unknown library \`$1\' 1>&2 - fi - ;; - esac - shift -done - -if $cxx; then - all_flags="$the_compiler" -fi - -if $cxxflags; then - all_flags="$all_flags $the_flags" -fi - -if $libs_L || $libs_l; then - all_flags="$all_flags $the_libs" -fi - -if test -z "$all_flags" || test "x$all_flags" = "x "; then - exit 1 -fi - -# Straight out any possible duplicates, but be careful to -# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz' -other_flags= -lib_L_flags= -rev_libs= -for i in $all_flags; do - case "$i" in - # a library, save it for later, in reverse order - -l*) rev_libs="$i $rev_libs" ;; - -L*|-R*) - if $libs_L; then - case " $lib_L_flags " in - *\ $i\ *) ;; # already there - *) lib_L_flags="$lib_L_flags $i" ;; # add it to output - esac - fi;; - *) - case " $other_flags " in - *\ $i\ *) ;; # already there - *) other_flags="$other_flags $i" ;; # add it to output - esac ;; - esac -done - -ord_libs= -if $libs_l; then - for i in $rev_libs; do - case " $ord_libs " in - *\ $i\ *) ;; # already there - *) ord_libs="$i $ord_libs" ;; # add it to output in reverse order - esac - done -fi - -echo $other_flags $lib_L_flags $ord_libs - -exit 0 |