Integrate GNU autoheader, and the libffi unconfig.

diff --git a/.gitignore b/.gitignore
index 20992fb7e39945364c50e1f09f948222d478d7a3..dc8217efb9665cbba49f0e209c2e6cb2d7f9007f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ libtool
 .dirstamp
 .libs
 autom4te.cache
 .dirstamp
 .libs
 autom4te.cache

+config.h
+config.h.in

 control
 control.tmp
 config.log
 control
 control.tmp
 config.log

diff --git a/Makefile.am b/Makefile.am
index 232f64a15faef45dbd43ddca83b6509e22acae45..7c97a6d7ec491b9eae00ea44ce9aa8544bc37bf0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 # XXX: do I really need -fno-common?
 AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1
 
 # XXX: do I really need -fno-common?
 AM_CPPFLAGS = -Werror -fno-common -I$(srcdir)/include -DYYDEBUG=1

+AM_CPPFLAGS += -include $(srcdir)/config.h -include $(srcdir)/unconfig.h

 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 
 lib_LTLIBRARIES = libcycript.la
 libcycript_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp

diff --git a/autogen.sh b/autogen.sh
index 201acfd4906964becaa85ac9629ab4e1bc76f4f9..d82b6af773afba96b30445bdb4481f1be3d3d051 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,4 +29,5 @@ fi
 
 aclocal -I m4
 autoconf
 
 aclocal -I m4
 autoconf

+autoheader

 automake -acf
 automake -acf

diff --git a/configure.ac b/configure.ac
index 709043cfb05e0bca06430f9d1013fcb7791b9bf8..1eecf5bdf7b91ab37bed0a7566b6ede4734352ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_COPYRIGHT([Copyright (C) 2009-2012  Jay Freeman (saurik)])
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])

+AC_CONFIG_HEADERS([config.h])

 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 

diff --git a/unconfig.h b/unconfig.h
new file mode 100644 (file)
index 0000000..d843b85
--- /dev/null
+++ b/unconfig.h
@@ -0,0 +1,30 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
+*/
+
+/* GNU General Public License, Version 3 {{{ */
+/*
+ * Cycript 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 of the License,
+ * or (at your option) any later version.
+ *
+ * Cycript 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 Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+// on Mac OS X, ffi/ffi.h #defines these macros
+
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION