merge autotools based build system and renaming of header directory.

28 files changed, 326 insertions, 94 deletions

diff --git a/.gitignore b/.gitignore
index b0aff9a..3019b38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,22 @@
 .DS_Store
 Makefile
 /build/
+*.deps/
+*.dirstamp
+*.libs/
+*.o
+*.lo
+*.la
+*.pc
+config/
+Makefile.in
+autom4te.cache/
+aclocal.m4
+.version
+config.*
+libtool
+src/yajl/yajl_version.h
+stamp-h1
+configure
+json_reformat
+json_verify
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..0568a7f
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,53 @@
+EXTRA_DIST = src/YAJL.dxy
+
+dist_doc_DATA = TODO README
+
+lib_LTLIBRARIES = libyail.la
+
+pkginclude_HEADERS = src/yajl/yajl_parse.h \
+		     src/yajl/yajl_gen.h \
+		     src/yajl/yajl_common.h \
+		     src/yajl/yajl_version.h
+
+libyail_la_SOURCES = src/yajl.c \
+		     src/yajl_lex.c \
+		     src/yajl_parser.c \
+		     src/yajl_buf.c \
+		     src/yajl_encode.c \
+		     src/yajl_gen.c \
+		     src/yajl_alloc.c \
+		     src/yajl_version.c \
+		     src/yajl_parser.h \
+		     src/yajl_lex.h \
+		     src/yajl_buf.h \
+		     src/yajl_encode.h \
+		     src/yajl_alloc.h
+
+bin_PROGRAMS = json_reformat \
+	       json_verify
+
+json_reformat_SOURCES = reformatter/json_reformat.c
+
+json_reformat_LDADD = libyail.la
+
+json_verify_SOURCES = verify/json_verify.c
+
+json_verify_LDADD = libyail.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = pkgconfig/yajl.pc
+
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
+libyail_la_CPPFLAGS = -DYAJL_BUILD
+
+libyail_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+ACLOCAL_AMFLAGS = -I m4
+
+INCLUDES = -I. -I${top_srcdir}/src -I${top_srcdir}/src/yajl
+
diff --git a/configure b/configure
deleted file mode 100755
index 66c1497..0000000
--- a/configure
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Copyright (c) 2007-2011, Lloyd Hilaiel <lloyd@hilaiel.com>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-require 'fileutils'
-require 'optparse'
-
-prefix = "/usr/local"
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: configure [options]"
-  opts.on("-p", "--prefix PATH", "Set installation prefix") do |p|
-    prefix = p
-  end
-  opts.on_tail("-h", "--help", "Output usage summary") do 
-    puts opts
-    exit
-  end
-
-  opts.parse!(ARGV)
-end
-
-puts "== removing old build files"
-FileUtils.rm_rf("build")
-FileUtils.rm_f("Makefile")
-puts "== running CMake in build directory"
-FileUtils.mkdir("build")
-FileUtils.cd("build") do 
-  if (!system("cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
-    puts "The \"cmake\" program is required to configure yajl.  It's"
-    puts "available from most ports/packaging systems and http://cmake.org"
-    exit 1
-  end
-end
-
-# now generate a Makefile
-puts "== Generating Makefile"
-File.open("Makefile", "w+") do |f| 
-  f.puts ".PHONY: all clean distclean install package test distro"
-  f.puts "all: distro doc test"
-  f.puts
-  f.puts "distro:"
-  f.puts "	@cd build && make"
-  f.puts
-  f.puts "doc:"
-  f.puts "	@cd build && make doc"
-  f.puts
-  f.puts "test:"
-  f.puts "	@cd build && make test"
-  f.puts
-  f.puts "clean:"  
-  f.puts "	@cd build && make clean"
-  f.puts
-  f.puts "distclean:"  
-  f.puts "	@rm -rf Makefile build"
-  f.puts "	@rm -f yajl-*.tgz"
-  f.puts
-  f.puts "install: all" 
-  f.puts "	@cd build && make install"
-  f.puts
-  f.puts "package: all"
-  f.puts "	@echo \"compressing to `basename build/yajl-*`.tgz\""
-  f.puts "	@cd build && tar czf ../`basename yajl-*`.tgz yajl-*"
-end
-
-puts "== Configured with installation prefix: #{prefix}"
-
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..c3bd773
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,42 @@
+AC_PREREQ(2.61)
+AC_INIT([yajl], [m4_esyscmd([./git-version-gen .tarball-version])],
+        [http://lloyd.github.com/yajl])
+AC_CONFIG_AUX_DIR(config)
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign subdir-objects])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_MAINTAINER_MODE
+
+AC_PROG_CC_C99
+
+LT_INIT
+
+AC_CONFIG_HEADER([config.h])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+LT_CURRENT=1
+LT_REVISION=0
+LT_AGE=0
+
+YAJL_MAJOR=1
+YAJL_MINOR=0
+YAJL_MICRO=11
+
+dnl VERSION="${LT_CURRENT}.${LT_REVISION}.${LT_AGE}"
+
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+
+AC_SUBST(YAJL_MAJOR)
+AC_SUBST(YAJL_MINOR)
+AC_SUBST(YAJL_MICRO)
+
+AC_CONFIG_FILES([Makefile
+                 src/yajl/yajl_version.h
+                 pkgconfig/yajl.pc
+                 pkgconfig/yajl-uninstalled.pc])
+
+AC_OUTPUT
+
diff --git a/git-version-gen b/git-version-gen
new file mode 100755
index 0000000..c655179
--- /dev/null
+++ b/git-version-gen
@@ -0,0 +1,154 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2008-04-08.07
+
+# Copyright (C) 2007-2008 Free Software Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+#   produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+#   presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+    1) ;;
+    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+    v=`cat $tarball_version_file` || exit 1
+    case $v in
+	*$nl*) v= ;; # reject multi-line output
+	[0-9]*) ;;
+	*) v= ;;
+    esac
+    test -z "$v" \
+	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+    : # use $v
+elif test -d .git \
+    && v=`git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null \
+	  || git describe --tags --abbrev=4 HEAD 2>/dev/null` \
+    && case $v in
+	 v[0-9]*) ;;
+         [0-9]*) ;;
+	 *) (exit 1) ;;
+       esac
+then
+    # Is this a new git that lists number of commits since the last
+    # tag or the previous older version that did not?
+    #   Newer: v6.10-77-g0f8faeb
+    #   Older: v6.10-g0f8faeb
+#    case $v in
+#	*-*-*) : git describe is okay three part flavor ;;
+#	*-*)
+#	    : git describe is older two part flavor
+#	    # Recreate the number of commits and rewrite such that the
+#	    # result is the same as if we were using the newer version
+#	    # of git describe.
+#	    vtag=`echo "$v" | sed 's/-.*//'`
+#	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+#	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+#	    ;;
+#    esac
+
+    # Change the first '-' to a '.', so version-comparing tools work properly.
+    # Remove the "g" in git describe's output string, to save a byte.
+#    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    :
+else
+    v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+    '') ;;
+    *) # Append the suffix only if there isn't one already.
+	case $v in
+	  *-dirty) ;;
+	  *) v="$v-dirty" ;;
+	esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/m4/.gitignore
diff --git a/pkgconfig/yajl-uninstalled.pc.in b/pkgconfig/yajl-uninstalled.pc.in
new file mode 100644
index 0000000..b1733d8
--- /dev/null
+++ b/pkgconfig/yajl-uninstalled.pc.in
@@ -0,0 +1,9 @@
+libdir=@abs_top_builddir@/.libs
+includedir=@abs_top_srcdir@
+
+Name: Yajl
+Description: Yet Another JSON Library
+Version: @VERSION@
+Libs: -L${libdir} -lyajl
+Cflags: -I${includedir}
+
diff --git a/pkgconfig/yajl.pc.in b/pkgconfig/yajl.pc.in
new file mode 100644
index 0000000..d8a35b3
--- /dev/null
+++ b/pkgconfig/yajl.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Yajl
+Description: Yet Another JSON Library
+Version: @VERSION@
+Libs: -L${libdir} -lyajl
+Cflags: -I${includedir}
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e36b736..71ba1a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,7 @@ SET (SRCS yajl.c yajl_lex.c yajl_parser.c yajl_buf.c
           yajl_tree.c yajl_version.c
 )
 SET (HDRS yajl_parser.h yajl_lex.h yajl_buf.h yajl_encode.h yajl_alloc.h)
-SET (PUB_HDRS api/yajl_parse.h api/yajl_gen.h api/yajl_common.h api/yajl_tree.h)
+SET (PUB_HDRS yajl/yajl_parse.h api/yajl_gen.h api/yajl_common.h api/yajl_tree.h)
 
 # useful when fixing lexer bugs.
 #ADD_DEFINITIONS(-DYAJL_LEXER_DEBUG)
@@ -60,7 +60,7 @@ FILE(MAKE_DIRECTORY ${incDir})
 
 # generate build-time source
 SET(dollar $)
-CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
+CONFIGURE_FILE(yajl/yajl_version.h.cmake ${incDir}/yajl_version.h)
 CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
 
 # copy public headers to output directory
diff --git a/src/YAJL.dxy b/src/YAJL.dxy
index 57c720c..31f7ad3 100644
--- a/src/YAJL.dxy
+++ b/src/YAJL.dxy
@@ -463,7 +463,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  =  ../src/yajl ../src/api
+INPUT                  =  ../src/yajl.doxy ../src/yajl
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
diff --git a/src/yajl.c b/src/yajl.c
index 293e545..54e6474 100644
--- a/src/yajl.c
+++ b/src/yajl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_lex.h"
 #include "yajl_parser.h"
 #include "yajl_alloc.h"
diff --git a/src/yajl b/src/yajl.doxy
index b04c170..b04c170 100644
--- a/src/yajl
+++ b/src/yajl.doxy
diff --git a/src/api/yajl_common.h b/src/yajl/yajl_common.h
index b208fd7..b208fd7 100644
--- a/src/api/yajl_common.h
+++ b/src/yajl/yajl_common.h
diff --git a/src/api/yajl_gen.h b/src/yajl/yajl_gen.h
index 52fa99f..52fa99f 100644
--- a/src/api/yajl_gen.h
+++ b/src/yajl/yajl_gen.h
diff --git a/src/api/yajl_parse.h b/src/yajl/yajl_parse.h
index 55c8311..55c8311 100644
--- a/src/api/yajl_parse.h
+++ b/src/yajl/yajl_parse.h
diff --git a/src/api/yajl_tree.h b/src/yajl/yajl_tree.h
index 729c579..729c579 100644
--- a/src/api/yajl_tree.h
+++ b/src/yajl/yajl_tree.h
diff --git a/src/api/yajl_version.h.cmake b/src/yajl/yajl_version.h.cmake
index 4262ff7..4262ff7 100644
--- a/src/api/yajl_version.h.cmake
+++ b/src/yajl/yajl_version.h.cmake
diff --git a/src/yajl/yajl_version.h.in b/src/yajl/yajl_version.h.in
new file mode 100644
index 0000000..ecc221d
--- /dev/null
+++ b/src/yajl/yajl_version.h.in
@@ -0,0 +1,23 @@
+#ifndef YAJL_VERSION_H_
+#define YAJL_VERSION_H_
+
+#include <yajl/yajl_common.h>
+
+#define YAJL_MAJOR @YAJL_MAJOR@
+#define YAJL_MINOR @YAJL_MINOR@
+#define YAJL_MICRO @YAJL_MICRO@
+
+#define YAJL_VERSION ((YAJL_MAJOR * 10000) + (YAJL_MINOR * 100) + YAJL_MICRO)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int YAJL_API yajl_version(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* YAJL_VERSION_H_ */
+
diff --git a/src/yajl_alloc.h b/src/yajl_alloc.h
index 85dbad0..a8a9e45 100644
--- a/src/yajl_alloc.h
+++ b/src/yajl_alloc.h
@@ -23,7 +23,7 @@
 #ifndef __YAJL_ALLOC_H__
 #define __YAJL_ALLOC_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 #define YA_MALLOC(afs, sz) (afs)->malloc((afs)->ctx, (sz))
 #define YA_FREE(afs, ptr) (afs)->free((afs)->ctx, (ptr))
diff --git a/src/yajl_buf.h b/src/yajl_buf.h
index 682457f..94929a5 100644
--- a/src/yajl_buf.h
+++ b/src/yajl_buf.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_BUF_H__
 #define __YAJL_BUF_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 #include "yajl_alloc.h"
 
 /*
diff --git a/src/yajl_bytestack.h b/src/yajl_bytestack.h
index 8c34b71..1fc50c4 100644
--- a/src/yajl_bytestack.h
+++ b/src/yajl_bytestack.h
@@ -22,7 +22,7 @@
 #ifndef __YAJL_BYTESTACK_H__
 #define __YAJL_BYTESTACK_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 #define YAJL_BS_INC 128
 
diff --git a/src/yajl_encode.h b/src/yajl_encode.h
index ac7acc6..af1e8bb 100644
--- a/src/yajl_encode.h
+++ b/src/yajl_encode.h
@@ -18,7 +18,7 @@
 #define __YAJL_ENCODE_H__
 
 #include "yajl_buf.h"
-#include "api/yajl_gen.h"
+#include "yajl/yajl_gen.h"
 
 void yajl_string_encode(const yajl_print_t printer,
                         void * ctx,
diff --git a/src/yajl_gen.c b/src/yajl_gen.c
index f36da2a..2b90bf4 100644
--- a/src/yajl_gen.c
+++ b/src/yajl_gen.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_gen.h"
+#include "yajl/yajl_gen.h"
 #include "yajl_buf.h"
 #include "yajl_encode.h"
 
diff --git a/src/yajl_lex.h b/src/yajl_lex.h
index 20edf47..cbaae0c 100644
--- a/src/yajl_lex.h
+++ b/src/yajl_lex.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_LEX_H__
 #define __YAJL_LEX_H__
 
-#include "api/yajl_common.h"
+#include "yajl/yajl_common.h"
 
 typedef enum {
     yajl_tok_bool,         
diff --git a/src/yajl_parser.c b/src/yajl_parser.c
index 9788022..7a06888 100644
--- a/src/yajl_parser.c
+++ b/src/yajl_parser.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_lex.h"
 #include "yajl_parser.h"
 #include "yajl_encode.h"
diff --git a/src/yajl_parser.h b/src/yajl_parser.h
index c12fc1b..5340973 100644
--- a/src/yajl_parser.h
+++ b/src/yajl_parser.h
@@ -17,7 +17,7 @@
 #ifndef __YAJL_PARSER_H__
 #define __YAJL_PARSER_H__
 
-#include "api/yajl_parse.h"
+#include "yajl/yajl_parse.h"
 #include "yajl_bytestack.h"
 #include "yajl_buf.h"
 #include "yajl_lex.h"
diff --git a/src/yajl_tree.c b/src/yajl_tree.c
index f486e89..b0ac027 100644
--- a/src/yajl_tree.c
+++ b/src/yajl_tree.c
@@ -20,8 +20,8 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "api/yajl_tree.h"
-#include "api/yajl_parse.h"
+#include "yajl/yajl_tree.h"
+#include "yajl/yajl_parse.h"
 
 #include "yajl_parser.h"
 
diff --git a/src/yajl_version.c b/src/yajl_version.c
index 0671da7..cc7651e 100644
--- a/src/yajl_version.c
+++ b/src/yajl_version.c
@@ -1,4 +1,4 @@
-#include <yajl/yajl_version.h>
+#include "yajl_version.h"
 
 int yajl_version(void)
 {