Fix autotools to include the necessary M4 files

PATCH Applied Jason Gunthorpe 2 participants 5 messages Oct 7, 2010 – Oct 25, 2010 2 messages not in the archive InfiniBand

lore

Share & tools

lore

Jason Gunthorpe

author

2010-10-07 22:33 UTC #0 lore raw

PATCH 1/1 Fix autotools to include the necessary M4 files

Otherwise running autogen.sh with a new version of autotools and then building on a system with an older version tends to explode. Unfortunately this is sometimes necessary since the new version is required by the package.

This is how GNU envisions this mess works at least..

Signed-off-by Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>

---
 infiniband-diags/Makefile.am  |    1 +
 infiniband-diags/configure.in |    1 +
 libibmad/Makefile.am          |    2 +-
 libibmad/configure.in         |    1 +
 libibumad/Makefile.am         |    2 +-
 libibumad/configure.in        |    1 +
 opensm/configure.in           |    1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

infiniband-diags/Makefile.am +1 -0

index af90b05..e4d3d90 100644
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = libibnetdisc
 
 INCLUDES = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \

infiniband-diags/configure.in +1 -0

index b9326c0..3c16aec 100644
@@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 AC_INIT(infiniband-diags, 1.5.7, [email protected])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

libibmad/Makefile.am +1 -1

index 6881453..f732c6c 100644
@@ -1,4 +1,4 @@
-
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = .
 
 INCLUDES = -I$(srcdir)/include -I$(includedir)

libibmad/configure.in +1 -0

index 23ec914..97e8cb3 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(libibmad, 1.3.6, [email protected])
 AC_CONFIG_SRCDIR([src/sa.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

libibumad/Makefile.am +1 -1

index 6e3f518..28bf69c 100644
@@ -1,4 +1,4 @@
-
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = .
 
 INCLUDES = -I$(srcdir)/include/infiniband -I$(includedir)

libibumad/configure.in +1 -0

index 9fcd609..04ecb0e 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(libibumad, 1.3.6, [email protected])
 AC_CONFIG_SRCDIR([src/umad.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

opensm/configure.in +1 -0

index 8695965..057724a 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(opensm, 3.3.7, [email protected])
 AC_CONFIG_SRCDIR([opensm/osm_opensm.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AC_CONFIG_HEADERS(include/config.h include/opensm/osm_config.h)
 AM_INIT_AUTOMAKE

Signature · 6 lines

1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20101007223301.GA30829-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org

Sasha Khapyorsky

2010-10-25 18:05 UTC #2 lore raw

Hi Jason,

Quoted 32 lines · Jason Gunthorpe

Otherwise running autogen.sh with a new version of autotools and then building on a system with an older version tends to explode. Unfortunately this is sometimes necessary since the new version is required by the package.
This is how GNU envisions this mess works at least..
Signed-off-by Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
---
 infiniband-diags/Makefile.am  |    1 +
 infiniband-diags/configure.in |    1 +
 libibmad/Makefile.am          |    2 +-
 libibmad/configure.in         |    1 +
 libibumad/Makefile.am         |    2 +-
 libibumad/configure.in        |    1 +
 opensm/configure.in           |    1 +
 7 files changed, 7 insertions(+), 2 deletions(-)
infiniband-diags/Makefile.am +1 -0
index af90b05..e4d3d90 100644
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = libibnetdisc
 
 INCLUDES = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
infiniband-diags/configure.in +0 -0
index b9326c0..3c16aec 100644

infiniband-diags/configure.in dnl Process this file with autoconf to produce a configure script. · line 8

Quoted 6 lines

infiniband-diags/configure.in +1 -0

@@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 AC_INIT(infiniband-diags, 1.5.7, [email protected])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

infiniband-diags directory does have any custom m4 macros (libibmad and libibumad too). Could you explain why should it fail without the change? Is this for potential future use?

Sasha

Quoted 60 lines

libibmad/Makefile.am +1 -1

index 6881453..f732c6c 100644
@@ -1,4 +1,4 @@
-
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = .
 
 INCLUDES = -I$(srcdir)/include -I$(includedir)

libibmad/configure.in +1 -0

index 23ec914..97e8cb3 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(libibmad, 1.3.6, [email protected])
 AC_CONFIG_SRCDIR([src/sa.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

libibumad/Makefile.am +1 -1

index 6e3f518..28bf69c 100644
@@ -1,4 +1,4 @@
-
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = .
 
 INCLUDES = -I$(srcdir)/include/infiniband -I$(includedir)

libibumad/configure.in +1 -0

index 9fcd609..04ecb0e 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(libibumad, 1.3.6, [email protected])
 AC_CONFIG_SRCDIR([src/umad.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE

opensm/configure.in +1 -0

index 8695965..057724a 100644
@@ -4,6 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT(opensm, 3.3.7, [email protected])
 AC_CONFIG_SRCDIR([opensm/osm_opensm.c])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AC_CONFIG_HEADERS(include/config.h include/opensm/osm_config.h)
 AM_INIT_AUTOMAKE

Signature · 1 line

1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Jason Gunthorpe

author

2010-10-25 18:14 UTC #3 lore raw

Quoted 27 lines · Sasha Khapyorsky

Hi Jason,
Quoted 24 lines · Jason Gunthorpe
Otherwise running autogen.sh with a new version of autotools and then building on a system with an older version tends to explode. Unfortunately this is sometimes necessary since the new version is required by the package.
This is how GNU envisions this mess works at least..
Signed-off-by Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
 infiniband-diags/Makefile.am  |    1 +
 infiniband-diags/configure.in |    1 +
 libibmad/Makefile.am          |    2 +-
 libibmad/configure.in         |    1 +
 libibumad/Makefile.am         |    2 +-
 libibumad/configure.in        |    1 +
 opensm/configure.in           |    1 +
 7 files changed, 7 insertions(+), 2 deletions(-)
infiniband-diags/Makefile.am +2 -0
index af90b05..e4d3d90 100644
+++ b/infiniband-diags/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I config
 SUBDIRS = libibnetdisc
 

Quoted 15 lines

infiniband-diags/configure.in dnl Process this file with autoconf to produce a configure script. · line 8
Quoted 11 lines
infiniband-diags/Makefile.am +0 -0
 INCLUDES = -I$(top_builddir)/include/ -I$(srcdir)/include -I$(includedir) \
infiniband-diags/configure.in +2 -0
index b9326c0..3c16aec 100644
+++ b/infiniband-diags/configure.in
@@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 AC_INIT(infiniband-diags, 1.5.7, [email protected])
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
infiniband-diags directory does have any custom m4 macros (libibmad and libibumad too). Could you explain why should it fail without the change? Is this for potential future use?

No, this is needed right now, libtool will install its custom m4 macros if this directive is present, otherwise it doesn't and that can muck things up later.

If you don't have this directive then you get warnings from libtool about this possible risk:

jggl{jgg}/tmp/ofa/management/libibumad#./autogen.sh
+ aclocal -I config
+ libtoolize --force --copy
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.in and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+ autoheader
+ automake --foreign --add-missing --copy
configure.in:45: installing config/config.guess' configure.in:45: installing config/config.sub'
configure.in:8: installing `config/install-sh'
configure.in:8: installing `config/missing'
Makefile.am: installing `config/depcomp'
+ autoconf

vs after patching:

jggl{jgg}/tmp/ofa/management/libibumad#./autogen.sh
+ aclocal -I config
+ libtoolize --force --copy
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `config'.
libtoolize: copying file `config/libtool.m4'
libtoolize: copying file `config/ltoptions.m4'
libtoolize: copying file `config/ltsugar.m4'
libtoolize: copying file `config/ltversion.m4'
libtoolize: copying file `config/lt~obsolete.m4'
+ autoheader
+ automake --foreign --add-missing --copy
+ autoconf

Much happier.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20101025181451.GE15514-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org

Sasha Khapyorsky

2010-10-25 18:27 UTC #5 lore raw

Quoted 18 lines · Jason Gunthorpe

vs after patching:
jggl{jgg}/tmp/ofa/management/libibumad#./autogen.sh
+ aclocal -I config
+ libtoolize --force --copy
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `config'.
libtoolize: copying file `config/libtool.m4'
libtoolize: copying file `config/ltoptions.m4'
libtoolize: copying file `config/ltsugar.m4'
libtoolize: copying file `config/ltversion.m4'
libtoolize: copying file `config/lt~obsolete.m4'
+ autoheader
+ automake --foreign --add-missing --copy
+ autoconf

Quoted 1 line

Much happier.

Ok. I see now.

Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Sasha Khapyorsky

Applied

2010-10-25 19:05 UTC #6 lore raw

In reply to a message not in the archive

Quoted 8 lines · Jason Gunthorpe

Otherwise running autogen.sh with a new version of autotools and then building on a system with an older version tends to explode. Unfortunately this is sometimes necessary since the new version is required by the package.
This is how GNU envisions this mess works at least..
Signed-off-by Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>

Applied. Thanks.

Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html