Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #5 from eugeneotto/master

Homebrew modifications
  • Loading branch information...
commit e4cebc7b076bb0fd789e6c8268e255d5a6aff7cc 2 parents fa8e660 + 2485f64
@fizx authored
Showing with 600 additions and 507 deletions.
  1. +11 −0 INSTALL
  2. +575 −493 configure
  3. +5 −5 configure.ac
  4. +9 −9 libtool
View
11 INSTALL
@@ -40,6 +40,17 @@ cd -
make
sudo make install
+Mac OS X with Homebrew:
+------------------------------------------------------------------------
+brew install argp-standalone pcre json-c
+./configure
+make
+sudo make install
+
+If you have a few extra minutes, consider replacing the last make with a
+'make check' and let us know if it reports any failures from the test
+suite - thanks!
+
Mac OS X with MacPorts:
------------------------------------------------------------------------
View
1,068 configure
575 additions, 493 deletions not shown
View
10 configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
AC_INIT([parsleyc], [1.0], [kyle@kylemaxwell.com])
AM_INIT_AUTOMAKE([1.9 foreign])
@@ -12,8 +12,8 @@ AC_PROG_YACC
AC_PROG_LIBTOOL
AC_CHECK_HEADER(pcre.h, , AC_MSG_ERROR([could not find pcre.h]))
AC_CHECK_HEADER(argp.h, , AC_MSG_ERROR([could not find argp.h]))
-AC_CHECK_HEADER(json/json.h, , AC_MSG_ERROR([could not find json.h]))
-AC_CHECK_HEADER(json/printbuf.h, , AC_MSG_ERROR([could not find printbuf.h]))
+AC_CHECK_HEADER(json-c/json.h, , AC_MSG_ERROR([could not find json.h]))
+AC_CHECK_HEADER(json-c/printbuf.h, , AC_MSG_ERROR([could not find printbuf.h]))
AC_PATH_PROG(XML2_CONFIG, xml2-config, , [$PATH])
if test x$XML2_CONFIG = x ; then
@@ -36,7 +36,7 @@ LIBS="$LIBS $XML2_LIBS $XSLT_LIBS"
AC_CHECK_LIB(pcre, pcre_compile, , AC_MSG_ERROR([could not find pcre]))
-AC_CHECK_LIB(json, json_object_new_string, , AC_MSG_ERROR([could not find the json library]))
+AC_CHECK_LIB(json-c, json_object_new_string, , AC_MSG_ERROR([could not find the json library]))
AC_CHECK_FUNC(argp_parse, , [AC_CHECK_LIB(argp, argp_parse, , AC_MSG_ERROR([could not find argp]))])
AC_CHECK_LIB(xslt, xsltApplyStylesheet, , AC_MSG_ERROR([could not find libxslt]))
@@ -44,4 +44,4 @@ AC_CHECK_LIB(xml2, htmlParseFile, , AC_MSG_ERROR([could not find libxml2 with ht
AC_CHECK_LIB(exslt, exsltRegisterAll, , AC_MSG_ERROR([could not find libexslt]))
AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT
View
18 libtool
@@ -2,7 +2,7 @@
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status (parsleyc) 1.0
-# Libtool was configured on host kyles-macbook:
+# Libtool was configured on host Eugenes-MacBook-Air-2.local:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -56,13 +56,13 @@ fast_install=needless
# The host system.
host_alias=
-host=i386-apple-darwin10.0.0
-host_os=darwin10.0.0
+host=i386-apple-darwin12.4.0
+host_os=darwin12.4.0
# The build system.
build_alias=
-build=i386-apple-darwin10.0.0
-build_os=darwin10.0.0
+build=i386-apple-darwin12.4.0
+build_os=darwin12.4.0
# A sed program that does not truncate output.
SED="/usr/bin/sed"
@@ -234,7 +234,7 @@ finish_eval=""
hardcode_into_libs=no
# Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64 /usr/lib/i686-apple-darwin10/4.2.1 /usr/lib /usr/local/lib"
+sys_lib_search_path_spec="/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/x86_64 /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/x86_64 /usr/lib /usr/llvm-gcc-4.2/lib/gcc /usr/llvm-gcc-4.2/lib /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib /usr/local/lib"
# Run-time system search path for libraries.
sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
@@ -254,7 +254,7 @@ striplib="strip -x"
# The linker used to build libraries.
-LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
+LD="/usr/llvm-gcc-4.2/libexec/gcc/i686-apple-darwin11/4.2.1/ld"
# Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
@@ -302,8 +302,8 @@ old_archive_from_new_cmds=""
old_archive_from_expsyms_cmds=""
# Commands used to build a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module~\$DSYMUTIL \$lib || :"
-archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym~\$DSYMUTIL \$lib || :"
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ~\$DSYMUTIL \$lib || :"
+archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym~\$DSYMUTIL \$lib || :"
# Commands used to build a loadable module if different from building
# a shared archive.

0 comments on commit e4cebc7

Please sign in to comment.
Something went wrong with that request. Please try again.