From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Thu, 20 Jun 2013 10:27:57 +0000 (-0700)
Subject: Integrate GNU autoheader, and the libffi unconfig.
X-Git-Tag: v0.9.500%b1~81
X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/e28525029ea8f7c63494fbb1464c7c5414f4390e?ds=sidebyside

Integrate GNU autoheader, and the libffi unconfig.
---

diff --git a/.gitignore b/.gitignore
index 20992fb..dc8217e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ libtool
 .dirstamp
 .libs
 autom4te.cache
+config.h
+config.h.in
 control
 control.tmp
 config.log
diff --git a/Makefile.am b/Makefile.am
index 232f64a..7c97a6d 100644
--- 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
+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
diff --git a/autogen.sh b/autogen.sh
index 201acfd..d82b6af 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,4 +29,5 @@ fi
 
 aclocal -I m4
 autoconf
+autoheader
 automake -acf
diff --git a/configure.ac b/configure.ac
index 709043c..1eecf5b 100644
--- 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_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
diff --git a/unconfig.h b/unconfig.h
new file mode 100644
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