summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael E Brown <michael_e_brown@dell.com>2007-12-12 12:05:12 -0600
committerMichael E Brown <michael_e_brown@dell.com>2007-12-12 12:05:35 -0600
commitd453d03cc0c7e2a7ebc48382bff2105b60d0922c (patch)
treee58414fa6cccf283f1b1aec0c2cbda4d38ec9295
parentdc5948117b2848be2dfa8984cd78fe5d1694aa0c (diff)
downloadmock-d453d03cc0c7e2a7ebc48382bff2105b60d0922c.tar.gz
mock-d453d03cc0c7e2a7ebc48382bff2105b60d0922c.tar.xz
mock-d453d03cc0c7e2a7ebc48382bff2105b60d0922c.zip
remove dead code from autoconf files since we no longer compile anything.
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in3
-rwxr-xr-xconfigure43
-rw-r--r--configure.ac23
4 files changed, 1 insertions, 72 deletions
diff --git a/Makefile.am b/Makefile.am
index dc40a6a..1fadd67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,6 @@ RELEASE_STRING = $(RELEASE_NAME)-$(RELEASE_VERSION)
VERSION = $(RELEASE_VERSION)
PACKAGE = $(RELEASE_NAME)
-LIBTOOL_CURRENT=@LIBTOOL_CURRENT@
-LIBTOOL_REVISION=@LIBTOOL_REVISION@
-LIBTOOL_AGE=@LIBTOOL_AGE@
-
CLEANFILES=mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp version docs/daemontest
DISTCLEANFILES=*~
diff --git a/Makefile.in b/Makefile.in
index 400cbd9..d6ffc02 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,9 +191,6 @@ RELEASE_SUBLEVEL = @RELEASE_SUBLEVEL@
RELEASE_EXTRALEVEL = @RELEASE_EXTRALEVEL@
RELEASE_VERSION = $(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)
RELEASE_STRING = $(RELEASE_NAME)-$(RELEASE_VERSION)
-LIBTOOL_CURRENT = @LIBTOOL_CURRENT@
-LIBTOOL_REVISION = @LIBTOOL_REVISION@
-LIBTOOL_AGE = @LIBTOOL_AGE@
CLEANFILES = mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp \
version docs/daemontest $(EXTRA_PROGRAMS) py/*.pyc \
py/mock/*.pyc py/mock/plugins/*.pyc
diff --git a/configure b/configure
index 9664c83..ea0ecde 100755
--- a/configure
+++ b/configure
@@ -649,8 +649,6 @@ pyexecdir
pkgpyexecdir
RELEASE_NAME RELEASE_MAJOR RELEASE_MINOR RELEASE_SUBLEVEL RELEASE_EXTRALEVEL RELEASE_RPM_EXTRALEVEL
LIBTOOL_CURRENT LIBTOOL_REVISION LIBTOOL_AGE
-BLD_SRC_DIFFERENT_TRUE
-BLD_SRC_DIFFERENT_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -2413,15 +2411,6 @@ do
fi
done
-# Update the version information only immediately before a public release of your software. More frequent updates are unnecessary, and only guarantee that the current interface number gets larger faster.
-# If the library source code has changed at all since the last update, then increment revision (c:r:a becomes c:r+1:a).
-# If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
-# If any interfaces have been added since the last public release, then increment age.
-# If any interfaces have been removed since the last public release, then set age to 0.
-LIBTOOL_CURRENT=$(( $RELEASE_MAJOR ))
-LIBTOOL_REVISION=$RELEASE_MINOR
-LIBTOOL_AGE=0
-
if test -z "$RELEASE_RPM_EXTRALEVEL"; then
if test -z "$RELEASE_EXTRALEVEL"; then
RELEASE_RPM_EXTRALEVEL=%{nil}
@@ -2434,30 +2423,9 @@ PACKAGE_VERSION=`echo ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${REL
PACKAGE_STRING=`echo ${RELEASE_NAME} ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${RELEASE_EXTRALEVEL}`
VERSION=$PACKAGE_VERSION
-cat confdefs.h |
- grep -v 'define VERSION ' |
- grep -v 'define PACKAGE_VERSION ' |
- grep -v 'define PACKAGE_STRING ' > confdefs.new
-mv confdefs.new confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-# check if build dir == source dir.
- if test x$srcdir != x.; then
- BLD_SRC_DIFFERENT_TRUE=
- BLD_SRC_DIFFERENT_FALSE='#'
-else
- BLD_SRC_DIFFERENT_TRUE='#'
- BLD_SRC_DIFFERENT_FALSE=
-fi
-
-
# generate files and exit
ac_config_files="$ac_config_files Makefile ${PACKAGE_NAME}.spec"
@@ -2594,13 +2562,6 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${BLD_SRC_DIFFERENT_TRUE}" && test -z "${BLD_SRC_DIFFERENT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BLD_SRC_DIFFERENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BLD_SRC_DIFFERENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -3186,13 +3147,11 @@ RELEASE_RPM_EXTRALEVEL!$RELEASE_RPM_EXTRALEVEL$ac_delim
LIBTOOL_CURRENT!$LIBTOOL_CURRENT$ac_delim
LIBTOOL_REVISION!$LIBTOOL_REVISION$ac_delim
LIBTOOL_AGE!$LIBTOOL_AGE$ac_delim
-BLD_SRC_DIFFERENT_TRUE!$BLD_SRC_DIFFERENT_TRUE$ac_delim
-BLD_SRC_DIFFERENT_FALSE!$BLD_SRC_DIFFERENT_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 4860dc3..1402b9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,15 +42,6 @@ do
fi
done
-# Update the version information only immediately before a public release of your software. More frequent updates are unnecessary, and only guarantee that the current interface number gets larger faster.
-# If the library source code has changed at all since the last update, then increment revision (c:r:a becomes c:r+1:a).
-# If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
-# If any interfaces have been added since the last public release, then increment age.
-# If any interfaces have been removed since the last public release, then set age to 0.
-LIBTOOL_CURRENT=$(( $RELEASE_MAJOR ))
-LIBTOOL_REVISION=$RELEASE_MINOR
-LIBTOOL_AGE=0
-
if test -z "$RELEASE_RPM_EXTRALEVEL"; then
if test -z "$RELEASE_EXTRALEVEL"; then
RELEASE_RPM_EXTRALEVEL=%{nil}
@@ -63,23 +54,9 @@ PACKAGE_VERSION=[`echo ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${RE
PACKAGE_STRING=[`echo ${RELEASE_NAME} ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${RELEASE_EXTRALEVEL}`]
VERSION=$PACKAGE_VERSION
-cat confdefs.h |
- grep -v 'define VERSION ' |
- grep -v 'define PACKAGE_VERSION ' |
- grep -v 'define PACKAGE_STRING ' > confdefs.new
-mv confdefs.new confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
AC_SUBST([RELEASE_NAME RELEASE_MAJOR RELEASE_MINOR RELEASE_SUBLEVEL RELEASE_EXTRALEVEL RELEASE_RPM_EXTRALEVEL])
AC_SUBST([ LIBTOOL_CURRENT LIBTOOL_REVISION LIBTOOL_AGE ])
-# check if build dir == source dir.
-AM_CONDITIONAL([BLD_SRC_DIFFERENT], [test x$srcdir != x.])
-
# generate files and exit
AC_CONFIG_FILES([ Makefile ${PACKAGE_NAME}.spec ])
AC_OUTPUT