[build] Move/Refactor aclocal macros.

* Move all the m4 macros in to their own directory.
* Rename 'ax_with_jemalloc.m4' -> 'lnav_with_jemalloc.m4' because
  'ax_with_*' is a convention for third-party aclocal macros in the
  official archives.
* Rename the methods to be more lnav specific.
pull/127/head
Suresh Sundriyal 9 years ago
parent bd2ae532de
commit 7886ddbb12

@ -1,6 +1,7 @@
AC_INIT(lnav, 0.7.2, lnav@googlegroups.com)
AC_CONFIG_SRCDIR([src/lnav.cc])
AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_SILENT_RULES([yes])
@ -92,7 +93,7 @@ AC_SEARCH_LIBS(Gpm_Open, gpm)
AC_CHECK_HEADERS(execinfo.h pty.h util.h zlib.h bzlib.h libutil.h sys/ttydefaults.h)
AX_WITH_JEMALLOC
LNAV_WITH_JEMALLOC
AX_WITH_CURSES

@ -15,10 +15,10 @@ dnl See the License for the specific language governing permissions and
dnl limitations under the License.
dnl
dnl jemalloc.m4: Trafficserver's jemalloc autoconf macros
dnl lnav_with_jemalloc.m4: lnav's jemalloc autoconf macros
dnl
dnl
AC_DEFUN([AX_ADDTO], [
AC_DEFUN([LNAV_ADDTO], [
if test "x$$1" = "x"; then
test "x$verbose" = "xyes" && echo " setting $1 to \"$2\""
$1="$2"
@ -40,7 +40,7 @@ AC_DEFUN([AX_ADDTO], [
fi
])dnl
AC_DEFUN([AX_WITH_JEMALLOC], [
AC_DEFUN([LNAV_WITH_JEMALLOC], [
enable_jemalloc=no
AC_ARG_WITH([jemalloc], [AC_HELP_STRING([--with-jemalloc=DIR], [use a specific jemalloc library])],
[
@ -70,9 +70,9 @@ if test "$enable_jemalloc" != "no"; then
jemalloc_have_libs=0
if test "$modify_env_variables" != "no"; then
AX_ADDTO(CPPFLAGS, [-I${jemalloc_include}])
AX_ADDTO(LDFLAGS, [-L${jemalloc_ldflags}])
AX_ADDTO(LIBTOOL_LINK_FLAGS, [-R${jemalloc_ldflags}])
LNAV_ADDTO(CPPFLAGS, [-I${jemalloc_include}])
LNAV_ADDTO(LDFLAGS, [-L${jemalloc_ldflags}])
LNAV_ADDTO(LIBTOOL_LINK_FLAGS, [-R${jemalloc_ldflags}])
fi
# On Darwin, jemalloc symbols are prefixed with je_. Search for that first,
# then fall back to unadorned symbols.
@ -84,7 +84,7 @@ if test "$enable_jemalloc" != "no"; then
AC_CHECK_HEADERS(jemalloc/jemalloc.h, [jemalloc_have_headers=1])
if test "$jemalloc_have_headers" != "0"; then
jemalloch=1
AX_ADDTO(LIBS, [-ljemalloc])
LNAV_ADDTO(LIBS, [-ljemalloc])
else
AC_MSG_WARN([jemalloc headers not found])
fi
Loading…
Cancel
Save