drop cppunit-config in favor of pkg-config

7 files changed, 0 insertions, 263 deletions

diff --git a/.gitignore b/.gitignore
index 118ef84..045e102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ stamp-h1
 .libs
 *.lo
 *.tar.*
-cppunit-config
 _configs.sed
 
 examples/cppunittest/cppunittestmain
diff --git a/Makefile.am b/Makefile.am
index 18371e0..e39432c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,6 @@ SUBDIRS = src include examples doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cppunit.pc
 
-bin_SCRIPTS = cppunit-config
-man_MANS = cppunit-config.1
-
 doc_DATA = \
 	BUGS \
 	INSTALL \
diff --git a/configure.ac b/configure.ac
index 019be20..ffd5fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@ AC_CONFIG_FILES([
 	Makefile
 	cppunit.pc
 	cppunit.spec
-	cppunit-config
 	src/Makefile
 	src/DllPlugInTester/Makefile
 	src/cppunit/Makefile
diff --git a/cppunit-config.1 b/cppunit-config.1
deleted file mode 100644
index baa8b58..0000000
--- a/cppunit-config.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH cppunit 1 "September 2001"
-.SH NAME
-cppunit-config - script to get information about the installed version of cppunit
-.SH SYNOPSIS
-.B cppunit-config
-[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
-.SH DESCRIPTION
-.PP
-\fIcppunit-config\fP is a tool that is used to configure to determine
-the compiler and linker flags that should be used to compile and link
-programs that use \fIcppunit\fP. It is also used internally to the .m4
-macros for GNU autoconf that are included with \fIcppunit\fP.
-.
-.SH OPTIONS
-.l
-\fIcppunit-config\fP accepts the following options:
-.TP 8
-.B  \-\-version
-Print the currently installed version of \fIcppunit\fP on the standard
-output.
-.TP 8
-.B  \-\-libs
-Print the linker flags that are necessary to link a \fIcppunit\fP
-program.
-.TP 8
-.B  \-\-cflags
-Print the compiler flags that are necessary to compile a \fIcppunit\fP
-program.
-.TP 8
-.B  \-\-prefix
-Print the prefix with which \fIcppunit\fP was compiled.
-.TP 8
-.B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that
-\fIcppunit\fP was built with when computing the output for the
-\-\-cflags and \-\-libs options. This option is also used for the exec
-prefix if \-\-exec\-prefix was not specified. This option must be
-specified before any \-\-libs or \-\-cflags options.
-.TP 8
-.B  \-\-exec\-prefix
-Print the exec\-prefix with which \fIcppunit\fP was compiled.
-.TP 8
-.B  \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIcppunit\fP was built with when computing the output for the
-\-\-cflags and \-\-libs options.  This option must be specified before
-any \-\-libs or \-\-cflags options.
-.SH COPYRIGHT
-cppunit Copyright \(co 1996-2000 by Michael Feathers <mfeathers@objectmentor.com>  
-.PP
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-.PP
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.SH AUTHOR
-This manpage is an almost word-for-word copy of the gtk-config
-manpage, written by Owen Taylor.  It was modified by E. Sommerlade
-<eric@sommerla.de>.
diff --git a/cppunit-config.in b/cppunit-config.in
deleted file mode 100644
index 51e8b58..0000000
--- a/cppunit-config.in
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-includedir=@includedir@
-
-usage()
-{
-    cat <<EOF
-Usage: cppunit-config [OPTION] ...
-
-Generic options
-  --version	output CppUnit version information.
-  --help	display this help and exit.
-
-Compilation support options
-  --cflags	print pre-processor and compiler flags
-  --libs	print library linking information
-
-Install directories CppUnit was configured to
-  --prefix[=DIR]      
-  --exec-prefix[=DIR]
-
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --version)
-      echo @CPPUNIT_VERSION@
-      ;;
-    --help)
-      usage 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-if test "$echo_prefix" = "yes"; then
-	echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-	echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes"; then
-      if test "$includedir" != "/usr/include" ; then
-            echo -I$includedir
-      fi
-fi
-
-if test "$echo_libs" = "yes"; then
-      if test @libdir@ != /usr/lib ; then
-            my_linker_flags="-L@libdir@"
-      fi
-      echo ${my_linker_flags} -lcppunit @LIBADD_DL@
-fi      
-
-
-
-
diff --git a/cppunit.m4 b/cppunit.m4
deleted file mode 100644
index 41f067b..0000000
--- a/cppunit.m4
+++ /dev/null
@@ -1,92 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_CPPUNIT],
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    AC_MSG_RESULT(no)
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    if test "x${cppunit_major_min}" = "x" ; then
-       cppunit_major_min=0
-    fi
-    
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    if test "x${cppunit_minor_min}" = "x" ; then
-       cppunit_minor_min=0
-    fi
-    
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x${cppunit_micro_min}" = "x" ; then
-       cppunit_micro_min=0
-    fi
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-
diff --git a/cppunit.spec.in b/cppunit.spec.in
index 39507dc..1f87e0c 100644
--- a/cppunit.spec.in
+++ b/cppunit.spec.in
@@ -41,7 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/cppunit-config
 %{_bindir}/DllPlugInTester
 %{_includedir}/cppunit/*
 %{_mandir}/man1/*