Use foreign option with AM_INIT_AUTOMAKE

Update AM_INIT_AUTOMAKE usage, which makes it possible to
use autoreconf with the ibacm package.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..b7b08e6
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,78 @@
+dnl Process this file with autoconf to produce a configure script.\r
+\r
+AC_PREREQ(2.57)\r
+AC_INIT(ibacm, 1.0.7, linux-rdma@vger.kernel.org)\r
+AC_CONFIG_SRCDIR([src/acm.c])\r
+AC_CONFIG_AUX_DIR(config)\r
+AM_CONFIG_HEADER(config.h)\r
+AM_INIT_AUTOMAKE([foreign])\r
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
+\r
+AM_PROG_LIBTOOL\r
+\r
+AC_ARG_ENABLE(libcheck, [  --disable-libcheck  do not test for presence of ib libraries],\r
+[       if test "$enableval" = "no"; then\r
+                disable_libcheck=yes\r
+        fi\r
+])\r
+\r
+dnl Checks for programs\r
+AC_PROG_CC\r
+\r
+dnl Checks for typedefs, structures, and compiler characteristics.\r
+AC_C_CONST\r
+AC_CHECK_SIZEOF(long)\r
+\r
+dnl Checks for libraries\r
+if test "$disable_libcheck" != "yes"; then\r
+AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
+    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
+AC_CHECK_LIB(ibumad, umad_send, [],\r
+    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
+fi\r
+\r
+dnl Checks for header files.\r
+AC_HEADER_STDC\r
+if test "$disable_libcheck" != "yes"; then\r
+AC_CHECK_HEADER(infiniband/verbs.h, [],\r
+    AC_MSG_ERROR([<infiniband/verbs.h> not found.  Is libibverbs installed?]))\r
+AC_CHECK_HEADER(infiniband/umad.h, [],\r
+    AC_MSG_ERROR([<infiniband/umad.h> not found.  Is libibumad installed?]))\r
+fi\r
+\r
+dnl Check for gcc atomic intrinsics\r
+AC_MSG_CHECKING(compiler support for atomics)\r
+AC_TRY_LINK([int i = 0;],\r
+    [ return __sync_add_and_fetch(&i, 1) != __sync_sub_and_fetch(&i, 1); ],\r
+    [ AC_MSG_RESULT(yes) ],\r
+    [\r
+        AC_MSG_RESULT(no)\r
+        AC_DEFINE(DEFINE_ATOMICS, 1, [Set to 1 to implement atomics])\r
+    ])\r
+\r
+AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
+    if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r
+        ac_cv_version_script=yes\r
+    else\r
+        ac_cv_version_script=no\r
+    fi)\r
+\r
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
+\r
+AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
+if test "x$rdmadir" = "x"; then\r
+   AC_SUBST(rdmadir, rdma)\r
+fi\r
+AC_SUBST(sbindir)\r
+\r
+AC_ARG_VAR(rdmascript, [Required dependency script name])\r
+if test "x$rdmascript" = "x"; then\r
+   if test -n "`grep -q 'release 6' /etc/redhat-release`"; then\r
+      AC_SUBST(rdmascript, rdma)\r
+   else\r
+      AC_SUBST(rdmascript, openibd)\r
+   fi\r
+fi\r
+\r
+AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])\r
+AC_OUTPUT\r

diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index c61496c..0000000
--- a/configure.in
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.\r
-\r
-AC_PREREQ(2.57)\r
-AC_INIT(ibacm, 1.0.7, linux-rdma@vger.kernel.org)\r
-AC_CONFIG_SRCDIR([src/acm.c])\r
-AC_CONFIG_AUX_DIR(config)\r
-AM_CONFIG_HEADER(config.h)\r
-AM_INIT_AUTOMAKE(ibacm, 1.0.7)\r
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
-\r
-AM_PROG_LIBTOOL\r
-\r
-AC_ARG_ENABLE(libcheck, [  --disable-libcheck  do not test for presence of ib libraries],\r
-[       if test "$enableval" = "no"; then\r
-                disable_libcheck=yes\r
-        fi\r
-])\r
-\r
-dnl Checks for programs\r
-AC_PROG_CC\r
-\r
-dnl Checks for typedefs, structures, and compiler characteristics.\r
-AC_C_CONST\r
-AC_CHECK_SIZEOF(long)\r
-\r
-dnl Checks for libraries\r
-if test "$disable_libcheck" != "yes"; then\r
-AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
-    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
-AC_CHECK_LIB(ibumad, umad_send, [],\r
-    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
-fi\r
-\r
-dnl Checks for header files.\r
-AC_HEADER_STDC\r
-if test "$disable_libcheck" != "yes"; then\r
-AC_CHECK_HEADER(infiniband/verbs.h, [],\r
-    AC_MSG_ERROR([<infiniband/verbs.h> not found.  Is libibverbs installed?]))\r
-AC_CHECK_HEADER(infiniband/umad.h, [],\r
-    AC_MSG_ERROR([<infiniband/umad.h> not found.  Is libibumad installed?]))\r
-fi\r
-\r
-dnl Check for gcc atomic intrinsics\r
-AC_MSG_CHECKING(compiler support for atomics)\r
-AC_TRY_LINK([int i = 0;],\r
-    [ return __sync_add_and_fetch(&i, 1) != __sync_sub_and_fetch(&i, 1); ],\r
-    [ AC_MSG_RESULT(yes) ],\r
-    [\r
-        AC_MSG_RESULT(no)\r
-        AC_DEFINE(DEFINE_ATOMICS, 1, [Set to 1 to implement atomics])\r
-    ])\r
-\r
-AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
-    if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r
-        ac_cv_version_script=yes\r
-    else\r
-        ac_cv_version_script=no\r
-    fi)\r
-\r
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
-\r
-AC_ARG_VAR(rdmadir, [Directory for configuration files])\r
-if test "x$rdmadir" = "x"; then\r
-   AC_SUBST(rdmadir, rdma)\r
-fi\r
-AC_SUBST(sbindir)\r
-\r
-AC_ARG_VAR(rdmascript, [Required dependency script name])\r
-if test "x$rdmascript" = "x"; then\r
-   if test -n "`grep -q 'release 6' /etc/redhat-release`"; then\r
-      AC_SUBST(rdmascript, rdma)\r
-   else\r
-      AC_SUBST(rdmascript, openibd)\r
-   fi\r
-fi\r
-\r
-AC_CONFIG_FILES([Makefile ibacm.spec ibacm.init])\r
-AC_OUTPUT\r