From patchwork Mon Sep 26 06:20:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 9350157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8500D607D6 for ; Mon, 26 Sep 2016 06:21:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 745122893B for ; Mon, 26 Sep 2016 06:21:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68FCA28A4A; Mon, 26 Sep 2016 06:21:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7D072893B for ; Mon, 26 Sep 2016 06:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756801AbcIZGVB (ORCPT ); Mon, 26 Sep 2016 02:21:01 -0400 Received: from mga03.intel.com ([134.134.136.65]:22569 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbcIZGVB (ORCPT ); Mon, 26 Sep 2016 02:21:01 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 25 Sep 2016 23:21:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,398,1470726000"; d="scan'208";a="883761082" Received: from phlsvsds.ph.intel.com ([10.228.195.38]) by orsmga003.jf.intel.com with ESMTP; 25 Sep 2016 23:20:59 -0700 Received: from phlsvsds.ph.intel.com (localhost.localdomain [127.0.0.1]) by phlsvsds.ph.intel.com (8.13.8/8.13.8) with ESMTP id u8Q6Kxkq021222; Mon, 26 Sep 2016 02:20:59 -0400 Received: (from iweiny@localhost) by phlsvsds.ph.intel.com (8.13.8/8.13.8/Submit) id u8Q6Kx0h021219; Mon, 26 Sep 2016 02:20:59 -0400 X-Authentication-Warning: phlsvsds.ph.intel.com: iweiny set sender to ira.weiny@intel.com using -f From: ira.weiny@intel.com To: linux-rdma@vger.kernel.org Cc: Ira Weiny Subject: [PATCH 2/2] libibmad: configure.ac: Update configure.in to configure.ac Date: Mon, 26 Sep 2016 02:20:55 -0400 Message-Id: <1474870855-21158-3-git-send-email-ira.weiny@intel.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1474870855-21158-1-git-send-email-ira.weiny@intel.com> References: <1474870855-21158-1-git-send-email-ira.weiny@intel.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ira Weiny To avoid this warning: automake: warning: autoconf input should be named 'configure.ac', not 'configure.in' Signed-off-by: Ira Weiny --- configure.ac | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 66 ------------------------------------------------------------ 2 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000000..843dbfd0d6b9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,66 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.57) +AC_INIT(libibmad, 1.3.12, linux-rdma@vger.kernel.org) +AC_CONFIG_SRCDIR([src/sa.c]) +AC_CONFIG_AUX_DIR(config) +AC_CONFIG_MACRO_DIR(config) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE + +AC_SUBST(RELEASE, ${RELEASE:-unknown}) +AC_SUBST(TARBALL, ${TARBALL:-${PACKAGE}-${VERSION}.tar.gz}) + +dnl the library version info is available in the file: libibmad.ver +ibmad_api_version=`grep LIBVERSION $srcdir/libibmad.ver | sed 's/LIBVERSION=//'` +if test -z $ibmad_api_version; then + ibmad_api_version=1:0:0 +fi +AC_SUBST(ibmad_api_version) + +AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries], +[ if test x$enableval = xno ; then + disable_libcheck=yes + fi +]) + +AM_PROG_LIBTOOL + +dnl Checks for programs +AC_PROG_CC + +dnl Checks for libraries +if test "$disable_libcheck" != "yes" +then +AC_CHECK_LIB(ibumad, umad_init, [], + AC_MSG_ERROR([umad_init() not found. libibmad requires libibumad.])) +fi + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h sys/time.h unistd.h]) +if test "$disable_libcheck" != "yes" +then +AC_CHECK_HEADER(infiniband/umad.h, [], + AC_MSG_ERROR([ not found. libibmad requires libibumad.]) +) +fi + +dnl Checks for library functions +AC_CHECK_FUNCS([memset strrchr strtol]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE + +AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, + if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then + ac_cv_version_script=yes + else + ac_cv_version_script=no + fi) + +AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes") + +AC_CONFIG_FILES([Makefile libibmad.spec]) +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 843dbfd0d6b9..000000000000 --- a/configure.in +++ /dev/null @@ -1,66 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.57) -AC_INIT(libibmad, 1.3.12, linux-rdma@vger.kernel.org) -AC_CONFIG_SRCDIR([src/sa.c]) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR(config) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE - -AC_SUBST(RELEASE, ${RELEASE:-unknown}) -AC_SUBST(TARBALL, ${TARBALL:-${PACKAGE}-${VERSION}.tar.gz}) - -dnl the library version info is available in the file: libibmad.ver -ibmad_api_version=`grep LIBVERSION $srcdir/libibmad.ver | sed 's/LIBVERSION=//'` -if test -z $ibmad_api_version; then - ibmad_api_version=1:0:0 -fi -AC_SUBST(ibmad_api_version) - -AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries], -[ if test x$enableval = xno ; then - disable_libcheck=yes - fi -]) - -AM_PROG_LIBTOOL - -dnl Checks for programs -AC_PROG_CC - -dnl Checks for libraries -if test "$disable_libcheck" != "yes" -then -AC_CHECK_LIB(ibumad, umad_init, [], - AC_MSG_ERROR([umad_init() not found. libibmad requires libibumad.])) -fi - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h sys/time.h unistd.h]) -if test "$disable_libcheck" != "yes" -then -AC_CHECK_HEADER(infiniband/umad.h, [], - AC_MSG_ERROR([ not found. libibmad requires libibumad.]) -) -fi - -dnl Checks for library functions -AC_CHECK_FUNCS([memset strrchr strtol]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE - -AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, - if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then - ac_cv_version_script=yes - else - ac_cv_version_script=no - fi) - -AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes") - -AC_CONFIG_FILES([Makefile libibmad.spec]) -AC_OUTPUT