diff options
author | Petri Lehtinen <petri@digip.org> | 2010-01-17 13:57:20 +0200 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2010-01-17 13:57:20 +0200 |
commit | f9febb64c5dc15e03ecf3ca552e0654ee919b52e (patch) | |
tree | a6f694927514fdcd7eef4c1563c3ac2a6dccc725 /configure.ac | |
parent | b76ee75aad975849ce8a55d10c55e5090dd33d8f (diff) | |
parent | aeb5b481c95c6bd71e3025a7965861ab82a643b8 (diff) | |
download | jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.zip jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.tar.gz jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.tar.bz2 |
Merge branch '1.1'
Conflicts:
Makefile.am
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d28a5e4..917c04a 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AC_PROG_LIBTOOL # Checks for library functions. AC_CONFIG_FILES([ + jansson.pc Makefile doc/Makefile src/Makefile |