diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-08-14 21:02:08 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-08-14 21:02:08 +0300 |
| commit | 56643d4311ecb26001527520da6264d92eab3d76 (patch) | |
| tree | b5ff0c8da7d24671d963ebcb3c2600a38bcfabae /configure.ac | |
| parent | cb8fcc780894420ab85bfd5e80ed274999c4161f (diff) | |
| parent | 145032a57f7844c29f2c40415b46338ac3445207 (diff) | |
| download | jansson-56643d4311ecb26001527520da6264d92eab3d76.zip jansson-56643d4311ecb26001527520da6264d92eab3d76.tar.gz jansson-56643d4311ecb26001527520da6264d92eab3d76.tar.bz2 | |
Merge branch '1.3'
Conflicts:
doc/apiref.rst
src/jansson_private.h
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 572a633..cabc732 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,8 @@ AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CC -AC_PROG_CXX AC_PROG_LIBTOOL +AM_CONDITIONAL([GCC], [test x$GCC = xyes]) # Checks for libraries. |