[master 6/8] Remove unused parts of the configure.ac files.

David Shea dshea at redhat.com
Thu Jul 24 19:32:50 UTC 2014


We never check the output of any of those program tests, so if you don't
have a working awk or grep installed, too bad. Nothing links directly
with libX11 anymore. We don't need an explicit check for pkg-config
because we always run PKG_CHECK_MODULES. nfs and ipv6 cannot be
disabled. We don't use glib directly. Caring about timezones has been
moved to an external library. There's no need to reset $LIBS
because none of the checks we have left set it in the first place.
---
 configure.ac         | 28 ----------------------------
 widgets/configure.ac |  7 +------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8abad7d..ef1b81a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,8 @@ AC_DEFINE_UNQUOTED([BUILD_DATE], ["`date +%m%d%Y`"], [Date of anaconda build])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 
 # Checks for programs.
-AC_PROG_AWK
-AC_PROG_GREP
 AC_PROG_CC
-AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_PROG_MKDIR_P
 
@@ -69,7 +65,6 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18.3])
 
 # Checks for header files.
-AC_PATH_X
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h],
                  [],
                  [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
@@ -104,7 +99,6 @@ PKG_CHECK_MODULES([PYTHON], [python], [
     [AC_MSG_FAILURE([*** Unable to find python library])])
 
 # Check for libraries we need that provide pkg-config scripts
-PKG_PROG_PKG_CONFIG([0.23])
 PKG_CHECK_MODULES([RPM], [rpm >= 4.10.0])
 PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.4])
 
@@ -115,23 +109,6 @@ else
     CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 fi
 
-# NFS support can, in theory, be enabled or disabled
-AC_ARG_ENABLE(nfs,
-    AC_HELP_STRING([--enable-nfs],
-                   [enable NFS support (default is yes)]),
-    [nfs=$enableval],
-    [nfs=yes])
-
-# IPv6 support can be enabled or disabled
-AC_ARG_ENABLE(ipv6,
-    AC_HELP_STRING([--enable-ipv6],
-                   [enable IPv6 support (default is yes)]),
-    [ipv6=$enableval],
-    [ipv6=yes])
-if test x$ipv6 = xyes ; then
-    AC_SUBST(IPV6_CFLAGS, [-DENABLE_IPV6])
-fi
-
 # GCC likes to bomb out on some ridiculous warnings.  Add your favorites
 # here.
 SHUT_UP_GCC="-Wno-unused-result"
@@ -157,11 +134,6 @@ cflags_filter() {
 }
 CFLAGS="`cflags_filter $CFLAGS`"
 
-# Unset $(LIBS) because different programs and libraries will have different
-# lists of libraries to link with, we don't want everything linking against
-# all libraries we checked for.
-LIBS=
-
 # Get the release number from the spec file
 rel="`awk '/Release:/ { split($2, r, "%"); print r[[1]] }' $srcdir/anaconda.spec.in`"
 AC_SUBST(PACKAGE_RELEASE, [$rel])
diff --git a/widgets/configure.ac b/widgets/configure.ac
index ceaa3d6..cbdc079 100644
--- a/widgets/configure.ac
+++ b/widgets/configure.ac
@@ -34,9 +34,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_TYPE_SIZE_T
 
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_LIBTOOL
-AC_PROG_LN_S
 
 AM_GNU_GETTEXT([external])
 
@@ -51,15 +49,12 @@ AS_IF([test "x$found_introspection" = xyes], [:],
 
 PKG_CHECK_MODULES([GLADEUI], [gladeui-2.0 >= 3.10])
 PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.11.3])
-PKG_CHECK_MODULES([GLIB], [glib-2.0])
 PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier >= 5.2.1])
 PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 1.30])
 
 AC_CHECK_HEADERS([libintl.h stdlib.h string.h unistd.h locale.h])
 
-AC_STRUCT_TIMEZONE
-
-AC_CHECK_FUNCS([pow setenv setlocale strchr])
+AC_CHECK_FUNCS([setenv setlocale])
 AC_CONFIG_FILES([Makefile
                  glade/Makefile
                  src/Makefile
-- 
1.9.3



More information about the anaconda-patches mailing list