aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2010-01-17 13:57:20 +0200
committerPetri Lehtinen <petri@digip.org>2010-01-17 13:57:20 +0200
commitf9febb64c5dc15e03ecf3ca552e0654ee919b52e (patch)
treea6f694927514fdcd7eef4c1563c3ac2a6dccc725 /configure.ac
parentb76ee75aad975849ce8a55d10c55e5090dd33d8f (diff)
parentaeb5b481c95c6bd71e3025a7965861ab82a643b8 (diff)
downloadjansson-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.ac1
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