[master 1/1] Don't pass anything to ./configure.

dashea installerbot-noreply at redhat.com
Thu May 14 17:10:04 UTC 2015


From: David Shea <dshea at redhat.com>

Add a couple of lines to configure.ac to make --disable-static the
default, and everything else we were using is already the default.
---
 Makefile.am             | 2 --
 anaconda.spec.in        | 4 +---
 configure.ac            | 5 +++++
 docs/translations.txt   | 3 +--
 scripts/makeupdates     | 2 +-
 widgets/configure.ac    | 5 +++++
 widgets/src/Makefile.am | 2 --
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d26572f..3ff721f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-
 SUBDIRS = data docs dracut po pyanaconda scripts tests widgets utils
 
 EXTRA_DIST = config.rpath COPYING
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 1b276ad..0eb0a2f 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -226,9 +226,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
 %setup -q
 
 %build
-%configure --disable-static \
-           --enable-introspection \
-           --enable-gtk-doc
+%configure
 %{__make} %{?_smp_mflags}
 
 %install
diff --git a/configure.ac b/configure.ac
index 08daf1e..40c3986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,11 @@ m4_define(python_required_version, 2.5)
 
 AC_PREREQ([2.63])
 AC_INIT([anaconda], [23.7], [anaconda-devel-list at redhat.com])
+
+# Disable building static libraries.
+# This needs to be set before initializing automake
+AC_DISABLE_STATIC
+
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 tar-ustar])
 
 AC_CONFIG_HEADERS([config.h])
diff --git a/docs/translations.txt b/docs/translations.txt
index 999a9a9..e8041b4 100644
--- a/docs/translations.txt
+++ b/docs/translations.txt
@@ -46,8 +46,7 @@ MAKING A RELEASE
 ----------------
 
 git clean -d -x -f
-./autogen.sh && ./configure --disable-static \
---enable-introspection --enable-gtk-doc
+./autogen.sh && ./configure
 make bumpver                      # zanata pull by dependent po-pull target
 git commit -a -m "New version."   # DO NOT run 'git clean -d -x -f' after
 make && make release              # signed tag happens after dist now
diff --git a/scripts/makeupdates b/scripts/makeupdates
index 575a1be..dd8a381 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -399,7 +399,7 @@ def checkAutotools(srcdir, builddir):
         if not os.path.isfile('configure'):
             os.system('./autogen.sh')
         os.chdir(builddir)
-        os.system(os.path.join(srcdir, 'configure') + ' --prefix=`rpm --eval %_prefix` --enable-gtk-doc --enable-introspection')
+        os.system(os.path.join(srcdir, 'configure') + ' --prefix=`rpm --eval %_prefix`')
         os.chdir(srcdir)
 
 def copyUpdatedIsys(updates, srcdir, builddir):
diff --git a/widgets/configure.ac b/widgets/configure.ac
index ba241e4..fd60e4f 100644
--- a/widgets/configure.ac
+++ b/widgets/configure.ac
@@ -21,6 +21,11 @@
 
 AC_PREREQ([2.63])
 AC_INIT([AnacondaWidgets], [3.2], [clumens at redhat.com])
+
+# Disable building static libraries.
+# This needs to be set before initializing automake
+AC_DISABLE_STATIC
+
 AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 
diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am
index e5b3097..07cca0a 100644
--- a/widgets/src/Makefile.am
+++ b/widgets/src/Makefile.am
@@ -23,8 +23,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
-
 GISOURCES = BaseWindow.c \
 	 DiskOverview.c \
 	 HubWindow.c \


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/fa141d20d01548a883c599b1737c3ee001f3b9ab


More information about the anaconda-patches mailing list