Skip to content

Commit 116e7a3

Browse files
pjstevnspjstevns
committed
rebuild autotools after jemalloc addition
1 parent 2e1f3e5 commit 116e7a3

13 files changed

+395
-224
lines changed

‎Makefile.in

+43-21
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Makefile.in generated by automake 1.11.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.3 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6-
# Inc.
5+
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6+
# Foundation, Inc.
77
# This Makefile.in is free software; the Free Software Foundation
88
# gives unlimited permission to copy and/or distribute it,
99
# with or without modifications, as long as this notice is preserved.
@@ -75,9 +75,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7575
distdir = $(PACKAGE)-$(VERSION)
7676
top_distdir = $(distdir)
7777
am__remove_distdir = \
78-
{ test ! -d "$(distdir)" \
79-
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
80-
&& rm -fr "$(distdir)"; }; }
78+
if test -d "$(distdir)"; then \
79+
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
80+
&& rm -rf "$(distdir)" \
81+
|| { sleep 5 && rm -rf "$(distdir)"; }; \
82+
else :; fi
8183
am__relativize = \
8284
dir0=`pwd`; \
8385
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -106,6 +108,8 @@ am__relativize = \
106108
DIST_ARCHIVES = $(distdir).tar.gz
107109
GZIP_ENV = --best
108110
distuninstallcheck_listfiles = find . -type f -print
111+
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
112+
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
109113
distcleancheck_listfiles = find . -type f -print
110114
ACLOCAL = @ACLOCAL@
111115
AMTAR = @AMTAR@
@@ -246,7 +250,7 @@ all: config.h
246250
$(MAKE) $(AM_MAKEFLAGS) all-recursive
247251

248252
.SUFFIXES:
249-
am--refresh:
253+
am--refresh: Makefile
250254
@:
251255
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
252256
@for dep in $?; do \
@@ -282,10 +286,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
282286
$(am__aclocal_m4_deps):
283287

284288
config.h: stamp-h1
285-
@if test ! -f $@; then \
286-
rm -f stamp-h1; \
287-
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
288-
else :; fi
289+
@if test ! -f $@; then rm -f stamp-h1; else :; fi
290+
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
289291

290292
stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
291293
@rm -f stamp-h1
@@ -514,15 +516,19 @@ dist-gzip: distdir
514516
$(am__remove_distdir)
515517

516518
dist-bzip2: distdir
517-
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
519+
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
520+
$(am__remove_distdir)
521+
522+
dist-lzip: distdir
523+
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
518524
$(am__remove_distdir)
519525

520526
dist-lzma: distdir
521527
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
522528
$(am__remove_distdir)
523529

524530
dist-xz: distdir
525-
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
531+
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
526532
$(am__remove_distdir)
527533

528534
dist-tarZ: distdir
@@ -553,6 +559,8 @@ distcheck: dist
553559
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
554560
*.tar.lzma*) \
555561
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
562+
*.tar.lz*) \
563+
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
556564
*.tar.xz*) \
557565
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
558566
*.tar.Z*) \
@@ -572,6 +580,7 @@ distcheck: dist
572580
&& am__cwd=`pwd` \
573581
&& $(am__cd) $(distdir)/_build \
574582
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
583+
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
575584
$(DISTCHECK_CONFIGURE_FLAGS) \
576585
&& $(MAKE) $(AM_MAKEFLAGS) \
577586
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -600,8 +609,16 @@ distcheck: dist
600609
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
601610
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
602611
distuninstallcheck:
603-
@$(am__cd) '$(distuninstallcheck_dir)' \
604-
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
612+
@test -n '$(distuninstallcheck_dir)' || { \
613+
echo 'ERROR: trying to run $@ with an empty' \
614+
'$$(distuninstallcheck_dir)' >&2; \
615+
exit 1; \
616+
}; \
617+
$(am__cd) '$(distuninstallcheck_dir)' || { \
618+
echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
619+
exit 1; \
620+
}; \
621+
test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
605622
|| { echo "ERROR: files left after uninstall:" ; \
606623
if test -n "$(DESTDIR)"; then \
607624
echo " (check DESTDIR support)"; \
@@ -632,10 +649,15 @@ install-am: all-am
632649

633650
installcheck: installcheck-recursive
634651
install-strip:
635-
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
636-
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
637-
`test -z '$(STRIP)' || \
638-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
652+
if test -z '$(STRIP)'; then \
653+
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
654+
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
655+
install; \
656+
else \
657+
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
658+
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
659+
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
660+
fi
639661
mostlyclean-generic:
640662

641663
clean-generic:
@@ -723,8 +745,8 @@ uninstall-am:
723745
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
724746
all all-am am--refresh check check-am clean clean-generic \
725747
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
726-
dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
727-
distcheck distclean distclean-generic distclean-hdr \
748+
dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
749+
dist-zip distcheck distclean distclean-generic distclean-hdr \
728750
distclean-libtool distclean-tags distcleancheck distdir \
729751
distuninstallcheck dvi dvi-am html html-am info info-am \
730752
install install-am install-data install-data-am install-dvi \

‎acinclude.m4

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ AC_MSG_RESULT([
2626
LIBEVENT: $EVENTLIB
2727
OPENSSL: $SSLLIB
2828
ZDB: $ZDBLIB
29-
JEMALLOC: $JEMALLOC
29+
JEMALLOC: $JEMALLOCLIB
3030
3131
])
3232
])
@@ -274,8 +274,10 @@ fi
274274
AC_DEFUN([DM_CHECK_JEMALLOC], [dnl
275275
AC_ARG_WITH(jemalloc,[ --with-jemalloc=PATH path to libjemalloc base directory (e.g. /usr/local or /usr)],
276276
[lookforjemalloc="$withval"],[lookforjemalloc="no"])
277-
if test [ "x$lookforjemalloc" != "xno" ] ; then
278-
CFLAGS="$CFLAGS -I${lookforzdb}/include"
277+
if test [ "x$lookforjemalloc" = "xno" ] ; then
278+
CFLAGS="$CFLAGS -I${prefix}/include/jemalloc"
279+
else
280+
CFLAGS="$CFLAGS -I${lookforjemalloc}/include/jemalloc"
279281
fi
280282
AC_CHECK_HEADERS([jemalloc.h jemalloc_defs.h],
281283
[JEMALLOCLIB="-ljemalloc"],

0 commit comments

Comments
 (0)