[ofa-general] [PATCH] management: revert configure.in update configure.in on 'make dist'

Sasha Khapyorsky sashak at voltaire.com
Sun Jul 6 17:01:49 PDT 2008


Recently configure.in automatic update was added. This setup there a
package version in accordance with tree state during 'make dist'. However
this method has a disadvantage - distributed configure.in template is
newer than an actual './configure' script, it results to an additional
(automatic) reconfiguration during build time.

This patch removes this "smart" configure.in update. Instead we will
handle versions directly in a daily build script.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 infiniband-diags/Makefile.am |    4 ----
 libibcommon/Makefile.am      |    4 ----
 libibmad/Makefile.am         |    4 ----
 libibumad/Makefile.am        |    4 ----
 opensm/Makefile.am           |    4 ----
 5 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/infiniband-diags/Makefile.am b/infiniband-diags/Makefile.am
index b6228b5..c22ba5e 100644
--- a/infiniband-diags/Makefile.am
+++ b/infiniband-diags/Makefile.am
@@ -119,10 +119,6 @@ dist-hook:
 	if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
 		$(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog ; \
 	fi
-	if [ -x $(top_srcdir)/../gen_ver.sh ] ; then \
-		ver=`$(top_srcdir)/../gen_ver.sh $(PACKAGE)` ; \
-		sed -e '/AC_INIT/s/$(PACKAGE), .*,/$(PACKAGE), '$$ver',/' $(top_srcdir)/configure.in > $(distdir)/configure.in ; \
-	fi
 
 # install this to a default location.
 install-data-hook:
diff --git a/libibcommon/Makefile.am b/libibcommon/Makefile.am
index dd8e264..75889f4 100644
--- a/libibcommon/Makefile.am
+++ b/libibcommon/Makefile.am
@@ -30,7 +30,3 @@ dist-hook:
 	if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
 		$(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog ; \
 	fi
-	if [ -x $(top_srcdir)/../gen_ver.sh ] ; then \
-		ver=`$(top_srcdir)/../gen_ver.sh $(PACKAGE)` ; \
-		sed -e '/AC_INIT/s/$(PACKAGE), .*,/$(PACKAGE), '$$ver',/' $(top_srcdir)/configure.in > $(distdir)/configure.in ; \
-	fi
diff --git a/libibmad/Makefile.am b/libibmad/Makefile.am
index 9def2fe..beae1a4 100644
--- a/libibmad/Makefile.am
+++ b/libibmad/Makefile.am
@@ -32,7 +32,3 @@ dist-hook:
 	if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
 		$(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog ; \
 	fi
-	if [ -x $(top_srcdir)/../gen_ver.sh ] ; then \
-		ver=`$(top_srcdir)/../gen_ver.sh $(PACKAGE)` ; \
-		sed -e '/AC_INIT/s/$(PACKAGE), .*,/$(PACKAGE), '$$ver',/' $(top_srcdir)/configure.in > $(distdir)/configure.in ; \
-	fi
diff --git a/libibumad/Makefile.am b/libibumad/Makefile.am
index f014f57..1e3e6fd 100644
--- a/libibumad/Makefile.am
+++ b/libibumad/Makefile.am
@@ -45,10 +45,6 @@ dist-hook:
 	if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
 		$(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog ; \
 	fi
-	if [ -x $(top_srcdir)/../gen_ver.sh ] ; then \
-		ver=`$(top_srcdir)/../gen_ver.sh $(PACKAGE)` ; \
-		sed -e '/AC_INIT/s/$(PACKAGE), .*,/$(PACKAGE), '$$ver',/' $(top_srcdir)/configure.in > $(distdir)/configure.in ; \
-	fi
 
 install-data-hook:
 	cd $(DESTDIR)$(mandir)/man3 && \
diff --git a/opensm/Makefile.am b/opensm/Makefile.am
index fca5319..0fb1363 100644
--- a/opensm/Makefile.am
+++ b/opensm/Makefile.am
@@ -29,7 +29,3 @@ dist-hook: $(EXTRA_DIST)
 	if [ -x $(top_srcdir)/../gen_chlog.sh ] ; then \
 		$(top_srcdir)/../gen_chlog.sh $(PACKAGE) > $(distdir)/ChangeLog ; \
 	fi
-	if [ -x $(top_srcdir)/../gen_ver.sh ] ; then \
-		ver=`$(top_srcdir)/../gen_ver.sh $(PACKAGE)` ; \
-		sed -e '/AC_INIT/s/$(PACKAGE), .*,/$(PACKAGE), '$$ver',/' $(top_srcdir)/configure.in > $(distdir)/configure.in ; \
-	fi
-- 
1.5.5.1.178.g1f811




More information about the general mailing list