AX_LIB_TABIX: address review comments by Peter Johansson

1 files changed, 35 insertions, 34 deletions

diff --git a/m4/ax_lib_tabix.m4 b/m4/ax_lib_tabix.m4
index 9fe3f3c..a31d07b 100644
--- a/m4/ax_lib_tabix.m4
+++ b/m4/ax_lib_tabix.m4
@@ -4,22 +4,23 @@
 #
 # SYNOPSIS
 #
-#   AX_LIB_TABIX([ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#   AX_LIB_TABIX()
 #
 # DESCRIPTION
 #
 #   This macro searches for an installed tabix library. If nothing was
 #   specified when calling configure, it searches first in /usr/local and
-#   then in /usr. If the --with-tabix=DIR is specified, it will try to find
-#   it in DIR/include/tabix/tabix.h and DIR/lib/libtabix.a. As a final try
-#   it will look in DIR/tabix.h and DIR/libtabix.a as the tabix library does
-#   not contain an install rule.
+#   then tries with ld's default library search path. If the
+#   --with-tabix=DIR is specified, it will try to find it in
+#   DIR/include/tabix/tabix.h and DIR/lib/libtabix.a. As a final try it will
+#   look in DIR/tabix.h and DIR/libtabix.a as the tabix library does not
+#   contain an install rule.
 #
 #   If --without-tabix is specified, the library is not searched at all.
 #
-#   If either the header file (sam.h) or the library (libbam) is not found,
-#   the configuration exits on error, asking for a valid tabix installation
-#   directory or --without-tabix.
+#   If either the header file (tabix.h) or the library (libtabix) is not
+#   found, the configuration exits on error, asking for a valid tabix
+#   installation directory or --without-tabix.
 #
 #   The macro defines the symbol HAVE_TABIX if the library is found. You
 #   should use autoheader to include a definition for this symbol in a
@@ -71,46 +72,45 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 1
+#serial 2
 
-AU_ALIAS([AC_LIB_TABIX], [AX_LIB_TABIX])
 AC_DEFUN([AX_LIB_TABIX],
 #
 # Handle user hints
 #
-[AC_MSG_CHECKING(if tabix is wanted)
+[AC_MSG_CHECKING([if tabix is wanted])
 AC_ARG_WITH([tabix],
   AS_HELP_STRING([--with-tabix],
                  [search for tabix in DIR/include and DIR/lib]),
  [if test "$withval" != no ; then
-   AC_MSG_RESULT(yes)
+   AC_MSG_RESULT([yes])
    if test -d "$withval" ; then
      TABIX_HOME="$withval"
    else
      AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
    fi
  else
-   AC_MSG_RESULT(no)
+   AC_MSG_RESULT([no])
  fi],
- [AC_MSG_RESULT(yes)])
+ [AC_MSG_RESULT([yes])])
 
 if test -f "${TABIX_HOME}/include/tabix/tabix.h" ; then
-        TABIX_INCDIR="${TABIX_HOME}/include/tabix"
-        TABIX_LIBDIR="${TABIX_HOME}/lib"
+        TABIX_INCDIR="-I${TABIX_HOME}/include/tabix"
+        TABIX_LIBDIR="-L${TABIX_HOME}/lib"
 elif test -f "${TABIX_HOME}/include/tabix.h" ; then
-        TABIX_INCDIR="${TABIX_HOME}/include"
-        TABIX_LIBDIR="${TABIX_HOME}/lib"
+        TABIX_INCDIR="-I${TABIX_HOME}/include"
+        TABIX_LIBDIR="-L${TABIX_HOME}/lib"
 elif test -f "${TABIX_HOME}/tabix.h" ; then
-        TABIX_INCDIR="${TABIX_HOME}"
-        TABIX_LIBDIR="${TABIX_HOME}"
+        TABIX_INCDIR="-I${TABIX_HOME}"
+        TABIX_LIBDIR="-L${TABIX_HOME}"
 elif test -f "/usr/local/include/tabix/tabix.h" ; then
         TABIX_HOME="/usr/local"
-        TABIX_INCDIR="${TABIX_HOME}/include/tabix"
-        TABIX_LIBDIR="${TABIX_HOME}/lib"
+        TABIX_INCDIR="-I${TABIX_HOME}/include/tabix"
+        TABIX_LIBDIR="-L${TABIX_HOME}/lib"
 else
         TABIX_HOME="/usr"
-        TABIX_INCDIR="${TABIX_HOME}/include/tabix"
-        TABIX_LIBDIR="${TABIX_HOME}/lib"
+        TABIX_INCDIR="-I${TABIX_HOME}/include/tabix"
+        TABIX_LIBDIR=""
 fi
 
 #
@@ -120,19 +120,20 @@ if test -n "${TABIX_HOME}" ; then
 
         TABIX_OLD_LDFLAGS=$LDFLAGS
         TABIX_OLD_CPPFLAGS=$LDFLAGS
-        LDFLAGS="$LDFLAGS -L${TABIX_LIBDIR}"
-        CPPFLAGS="$CPPFLAGS -I${TABIX_INCDIR}"
+        LDFLAGS="$LDFLAGS ${TABIX_LIBDIR}"
+        CPPFLAGS="$CPPFLAGS ${TABIX_INCDIR}"
         AC_LANG_SAVE
         AC_LANG_C
-        AC_CHECK_HEADER(tabix.h, [ac_cv_tabix_h=yes], [ac_cv_tabix_h=no])
-        AC_CHECK_LIB(tabix, ti_open, [ac_cv_libtabix=yes], [ac_cv_libtabix=no])
+        AC_CHECK_HEADER([tabix.h], [ac_cv_tabix_h=yes], [ac_cv_tabix_h=no])
+        AC_CHECK_LIB([tabix],[ti_open],[ac_cv_libtabix=yes],[ac_cv_libtabix=no])
         AC_LANG_RESTORE
-        if test "$ac_cv_libtabix" = "yes" -a "$ac_cv_tabix_h" = "yes" ; then
+        if test "$ac_cv_libtabix" = "yes" && \
+           test "$ac_cv_tabix_h"  = "yes" ; then
                 #
                 # If both library and header were found, use them
                 #
-                AC_MSG_CHECKING(tabix)
-                AC_MSG_RESULT(ok)
+                AC_MSG_CHECKING([tabix])
+                AC_MSG_RESULT([ok])
                 with_tabix=yes
         else
                 #
@@ -140,9 +141,9 @@ if test -n "${TABIX_HOME}" ; then
                 #
                 LDFLAGS="$TABIX_OLD_LDFLAGS"
                 CPPFLAGS="$TABIX_OLD_CPPFLAGS"
-                AC_MSG_CHECKING(tabix)
-                AC_MSG_RESULT(failed)
-                AC_MSG_ERROR(either specify a valid tabix installation with --with-tabix=DIR or disable tabix usage with --without-tabix)
+                AC_MSG_CHECKING([tabix])
+                AC_MSG_RESULT([failed])
+                AC_MSG_ERROR([either specify a valid tabix installation with --with-tabix=DIR or disable tabix usage with --without-tabix])
         fi
 fi
 ])