summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-05 01:48:33 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-05 01:48:33 +0000
commite9db4f253b8506d22657bd6e0f4af74d6abf9791 (patch)
tree189ea13d28064552457792d15c4d5e7552db1076
parent3a013198050bd30ed211dd0544e733a04e665b40 (diff)
downloadATCD-e9db4f253b8506d22657bd6e0f4af74d6abf9791.tar.gz
ChangeLogTag: Tue Jan 4 17:38:23 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--Makefile.am4
-rw-r--r--Release2
-rw-r--r--ace-config.1.in57
-rw-r--r--ace-config.in215
-rw-r--r--configure.ac2
5 files changed, 0 insertions, 280 deletions
diff --git a/Makefile.am b/Makefile.am
index 10b94178509..7cee3fe9849 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,10 +28,6 @@ SUBDIRS += \
@KOKYU@ \
@TAO@
-man_MANS = ace-config.1
-
-bin_SCRIPTS = ace-config
-
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
diff --git a/Release b/Release
index 350022f8fd2..2311a3ff0bc 100644
--- a/Release
+++ b/Release
@@ -64,8 +64,6 @@ CONTROLLED_FILES = \
VERSION \
ACEXML \
ace \
- ace-config.1.in \
- ace-config.in \
apps \
bin \
configure.ac \
diff --git a/ace-config.1.in b/ace-config.1.in
deleted file mode 100644
index 0fe88bb087d..00000000000
--- a/ace-config.1.in
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii ace-config.1
-.\"
-.TH ace-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
-.SH NAME
-ace-config \- Display ACE Library Configuration
-.SH SYNOPSIS
-.B ace-config
-.I OPTION
-.B [
-.I OPTION
-.B ... ]
-.B [
-.I LIBRARY
-.B ]
-.SH DESCRIPTION
-.B ace-config
-is a script that is used to display what compiler flags and libraries were
-used when ACE was built.
-.SH OPTIONS
-.IP --version
-ACE 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 ace
-the ACE library
-.IP netsvcs
-the ACE net services library
-.IP tao
-the ACE ORB (TAO) library
-.SH FILES
-.I @libdir@/aceConf.sh
-.RS
-Additional ACE related library configuration information.
-.RE
-.SH BUGS
-None.
-.SH AUTHOR
-Ossama Othman <ossama@uci.edu>
-.SH "SEE ALSO"
-.BR tao-config (1)
diff --git a/ace-config.in b/ace-config.in
deleted file mode 100644
index a1e19895647..00000000000
--- a/ace-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: ace-config OPTION [OPTIONS...] [LIBRARY]
-
-Generic options:
- --version output ACE 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 ACE was configured with:
- --prefix --exec-prefix --bindir --sbindir --libexecdir --datadir
- --sysconfdir --sharedstatedir --localstatedir --libdir --infodir
- --mandir --includedir
-
-Known values for LIBRARY are:
-
- ace
- netsvcs
- tao (calls tao-config)
-
-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 ACE.
-the_compiler="@CXX@"
-the_libs="@ACE_LIBDIR@ -lACE @ACE_LIBS@"
-the_flags="@ACE_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)
-# These are set before this option parsing loop begins.
-# the_compiler="@CXX@"
-# the_libs="$the_libs @ACE_LIBDIR@ -lACE @ACE_LIBS@"
-# the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@"
- ;;
- netsvcs)
- echo "Currently unsupported."
- exit 1
-# the_libs="$the_libs @ACE_LIBDIR@ @NETSVCS_LIBS@"
-# the_flags="$the_flags @ACE_INCLUDEDIR@ @CXXFLAGS@"
- ;;
- tao)
- # The TAO compiler should be the same as ACE's compiler!
- the_compiler="`tao-config --cxx tao`"
- the_libs="$the_libs `tao-config --libs tao`"
- the_flags="$the_flags `tao-config --cxxflags tao`"
- ;;
- *)
- 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
diff --git a/configure.ac b/configure.ac
index 802e33f81f8..fa0af3545cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7328,8 +7328,6 @@ dnl netsvcs/servers/Makefile
dnl tests/Makefile
AC_CONFIG_FILES([
- ace-config
- ace-config.1
Makefile
ace/Makefile
ace/QoS/Makefile