| diff -ur a/configure.ac b/configure.ac |
| --- a/configure.ac 2007-05-14 10:26:14.000000000 -0700 |
| +++ b/configure.ac 2016-05-14 18:42:26.261439471 -0700 |
| @@ -56,7 +56,7 @@ |
| AC_PROG_CXX |
| |
| # see if we actually have a CXX program |
| -if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then |
| +if test "$ac_cv_prog_CXX" = "" -o ! "$ac_cv_prog_CXX" --version &>/dev/null ; then |
| AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX) |
| enable_cxx=no |
| fi |
| @@ -263,6 +263,10 @@ |
| # check for strdup macro (linux) |
| # |
| AC_MSG_CHECKING([strdup macro]) |
| +AC_ARG_WITH(strdup-macro, |
| + [ AC_HELP_STRING([--with-strdup-macro], |
| + [override strdup macro detection] ) ], |
| + [ ac_cv_strdup_macro="$withval" ], [ |
| AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
| #if HAVE_STDLIB_H |
| # include <string.h> |
| @@ -278,6 +282,7 @@ |
| [ac_cv_strdup_macro=no], |
| [ac_cv_strdup_macro=no] |
| ) |
| +],) |
| AC_MSG_RESULT([$ac_cv_strdup_macro]) |
| |
| # |
| @@ -349,6 +354,12 @@ |
| AC_CHECK_FUNCS(getpagesize) |
| AC_MSG_CHECKING([basic-block size]) |
| ac_cv_page_size=0 |
| +AC_ARG_WITH(pagesize, |
| + [ AC_HELP_STRING([--with-pagesize=nbits], |
| + [log base 2 of machine page size] ) ], |
| + [ case "$withval" in ?|1?) ac_cv_page_size=$withval; esac ], |
| + [ : # default to probing, set above ], |
| +) |
| if test $ac_cv_page_size = 0; then |
| AC_RUN_IFELSE([main() { if (getpagesize()<=2048) exit(0); else exit(1); }], |
| [ ac_cv_page_size=11 ] ) |
| @@ -389,6 +400,10 @@ |
| # check the safety of the abort function |
| # |
| AC_CHECK_FUNCS(abort) |
| +AC_ARG_WITH(abort-okay, |
| + [ AC_HELP_STRING([--with-abort-okay], |
| + [override abort okay detection] ) ], |
| + [ AC_DEFINE(ABORT_OKAY, 1) AC_MSG_RESULT([yes]) ], [ |
| AC_MSG_CHECKING([abort safe]) |
| AC_RUN_IFELSE([[ |
| static int main_b = 0; |
| @@ -429,6 +444,7 @@ |
| [ AC_DEFINE(ABORT_OKAY, 1) AC_MSG_RESULT([yes]) ], |
| [ AC_DEFINE(ABORT_OKAY, 0) AC_MSG_RESULT([no]) ] |
| ) |
| +],) |
| |
| AC_TYPE_SIGNAL |
| AC_MSG_CHECKING([signal works]) |
| @@ -593,6 +609,10 @@ |
| # |
| # check if the return.h macros work |
| # |
| +AC_ARG_WITH(return-macros, |
| + [ AC_HELP_STRING([--with-return-macros], |
| + [override return macros detection] ) ], |
| + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], [ |
| AC_MSG_CHECKING([return.h macros work]) |
| AC_RUN_IFELSE([ |
| |
| @@ -618,6 +638,7 @@ |
| [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], |
| [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] |
| ) |
| +],) |
| |
| ############################################################################## |
| |
| diff -ur a/Makefile.in b/Makefile.in |
| --- a/Makefile.in 2007-05-14 10:26:14.000000000 -0700 |
| +++ b/Makefile.in 2016-05-14 17:39:10.740821762 -0700 |
| @@ -174,66 +174,66 @@ |
| # rm -f configure |
| |
| installdirs : |
| - $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(bindir) |
| |
| installincs : $(HFLS) |
| - $(srcdir)/mkinstalldirs $(includedir) |
| - $(INSTALL_DATA) $(HFLS) $(includedir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) |
| + $(INSTALL_DATA) $(HFLS) $(DESTDIR)/$(includedir) |
| |
| installthsl : $(LIB_TH_SL) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIB_TH_SL) $(DESTDIR)/$(libdir) |
| |
| installth : $(INSTALL_THREADS) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIB_TH) $(DESTDIR)/$(libdir) |
| @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" |
| @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" |
| |
| installthcxxsl : $(LIB_TH_CXX_SL) |
| - $(srcdir)/mkinstalldirs $(shlibdir) |
| - $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir) |
| + $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(DESTDIR)/$(shlibdir) |
| |
| installthcxx : $(INSTALL_TH_CXX) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(DESTDIR)/$(libdir) |
| @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" |
| |
| installcxxsl : $(LIB_CXX_SL) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(DESTDIR)/$(libdir) |
| |
| installcxx : $(INSTALL_CXX) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIB_CXX) $(DESTDIR)/$(libdir) |
| @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" |
| @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" |
| |
| installsl : $(LIB_SL) |
| - $(srcdir)/mkinstalldirs $(shlibdir) |
| - $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir) |
| + $(INSTALL_PROGRAM) $(LIB_SL) $(DESTDIR)/$(shlibdir) |
| @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" |
| @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" |
| |
| installlib : $(INSTALL_LIB) |
| - $(srcdir)/mkinstalldirs $(libdir) |
| - $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) |
| - @RANLIB@ $(libdir)/$(LIBRARY) |
| -@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) |
| + $(INSTALL_PROGRAM) $(LIBRARY) $(DESTDIR)/$(libdir) |
| + @RANLIB@ $(DESTDIR)/$(libdir)/$(LIBRARY) |
| +@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(DESTDIR)/$(shlibdir)" |
| @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" |
| @TH_OFF@ @echo "Enter 'make installth' to install thread library" |
| |
| installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \ |
| $(srcdir)/docs/$(PDFFILE) |
| - $(srcdir)/mkinstalldirs $(docdir) |
| - $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir) |
| - $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir) |
| - $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir) |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(docdir) |
| + $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)/$(docdir) |
| + $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)/$(docdir) |
| + $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)/$(docdir) |
| |
| install : installincs installlib $(UTIL) |
| - $(srcdir)/mkinstalldirs $(bindir) |
| - $(INSTALL_PROGRAM) $(UTIL) $(bindir) |
| - @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)" |
| + $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) |
| + $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir) |
| + @echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)/$(docdir)" |
| |
| dmalloc.h.2 : $(srcdir)/configure |
| $(SHELL) $(srcdir)/configure |