Mercurial > urweb
comparison configure.ac @ 1825:52c291b05738
Fix compilation when using Clang on OS X; it doesn't like -pthread
author | Austin Seipp <mad.one@gmail.com> |
---|---|
date | Sun, 23 Sep 2012 20:47:20 -0500 |
parents | 15eb501a17d0 |
children | 6a621a625b04 |
comparison
equal
deleted
inserted
replaced
1824:216e92b39fc1 | 1825:52c291b05738 |
---|---|
92 | 92 |
93 if test [$WORKING_VERSION = "1"]; then | 93 if test [$WORKING_VERSION = "1"]; then |
94 VERSION="$VERSION + `hg identify || (cat .hg_archival.txt | grep 'node\:') || echo ?`" | 94 VERSION="$VERSION + `hg identify || (cat .hg_archival.txt | grep 'node\:') || echo ?`" |
95 fi | 95 fi |
96 | 96 |
97 # Clang does not like being passed -pthread, since it's implicit on OS X. | |
98 # So let's get rid of that! Here's to hoping it doesn't break Clang | |
99 # on other platforms. | |
100 AC_MSG_CHECKING([if compiling with clang]) | |
101 AC_COMPILE_IFELSE( | |
102 [AC_LANG_PROGRAM([], [[ | |
103 #ifndef __clang__ | |
104 not clang | |
105 #endif | |
106 ]])], | |
107 [CLANG=yes], [CLANG=no]) | |
108 AC_MSG_RESULT([$CLANG]) | |
109 | |
110 if test [$CLANG = "yes"]; then | |
111 PTHREAD_CFLAGS="" | |
112 PTHREAD_LIBS="" | |
113 fi | |
114 | |
97 AC_SUBST(CC) | 115 AC_SUBST(CC) |
98 AC_SUBST(BIN) | 116 AC_SUBST(BIN) |
99 AC_SUBST(LIB) | 117 AC_SUBST(LIB) |
100 AC_SUBST(SRCLIB) | 118 AC_SUBST(SRCLIB) |
101 AC_SUBST(INCLUDE) | 119 AC_SUBST(INCLUDE) |
128 Extra CC args: CCARGS $CCARGS | 146 Extra CC args: CCARGS $CCARGS |
129 Postgres C header: PGHEADER $PGHEADER | 147 Postgres C header: PGHEADER $PGHEADER |
130 MySQL C header: MSHEADER $MSHEADER | 148 MySQL C header: MSHEADER $MSHEADER |
131 SQLite C header: SQHEADER $SQHEADER | 149 SQLite C header: SQHEADER $SQHEADER |
132 OpenSSL: OPENSSL_LIBS $OPENSSL_LIBS | 150 OpenSSL: OPENSSL_LIBS $OPENSSL_LIBS |
151 pthreads: PTHREAD_CFLAGS $PTHREAD_CFLAGS | |
152 PTHREAD_LIBS $PTHREAD_LIBS | |
133 | 153 |
134 Version: $VERSION | 154 Version: $VERSION |
135 EOF | 155 EOF |