diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2016-02-13 10:41:17 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-02-13 10:41:17 -0500 |
commit | 5ca6148aaf7b930a8868d0543f1a307d40532243 (patch) | |
tree | 55ec538c5bdef601b0ac8ebca71ad495f644326d /configure.ac | |
parent | 3d3886672433f0775f772d8d2ee47c5f5e0bc745 (diff) | |
parent | 3044fbedd58961f8c1168eb3bc2eeeb8a2b0b60e (diff) |
Merge branch 'upstream' into dfsg_clean20160213+dfsg
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index a8060104..351d1129 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,14 @@ -AC_INIT([urweb], [20151220]) +AC_INIT([urweb], [20160213]) WORKING_VERSION=0 AC_USE_SYSTEM_EXTENSIONS # automake 1.12 requires this, but automake 1.11 doesn't recognize it m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall -Werror foreign no-define]) AC_PROG_CC() AC_PROG_LIBTOOL() -AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([include/urweb/config.h]) AX_PTHREAD([echo >/dev/null], [echo "Your C compiler does not support POSIX threads."; exit 1]) @@ -91,25 +91,7 @@ if test [-z $SQHEADER]; then fi if test [$WORKING_VERSION = "1"]; then - VERSION="$VERSION + `hg identify || (cat .hg_archival.txt | grep 'node\:') || echo ?`" -fi - -# Clang does not like being passed -pthread, since it's implicit on OS X. -# So let's get rid of that! Here's to hoping it doesn't break Clang -# on other platforms. -AC_MSG_CHECKING([if compiling with clang]) -AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([], [[ -#ifndef __clang__ - not clang -#endif -]])], -[CLANG=yes], [CLANG=no]) -AC_MSG_RESULT([$CLANG]) - -if test [$CLANG = "yes"]; then - PTHREAD_CFLAGS="" - PTHREAD_LIBS="" + VERSION="$VERSION + `git log -1 --format="%H" || echo ?`" fi # Check if pthread_t is a scalar or pointer type so we can use the correct @@ -160,7 +142,7 @@ Ur/Web configuration: include directory: INCLUDE $INCLUDE site-lisp directory: SITELISP $SITELISP C compiler: CC $CC - Extra CC args: CCARGS $CCARGS + Extra CC args: CCARGS $CCARGS Extra MLTON args: MLTONARGS $MLTONARGS Postgres C header: PGHEADER $PGHEADER MySQL C header: MSHEADER $MSHEADER |