summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Dolan <mu@netsoc.tcd.ie>2013-06-23 11:16:41 +0100
committerStephen Dolan <mu@netsoc.tcd.ie>2013-06-23 12:01:58 +0100
commitf44ecf3872571ef0c65f9e03570430be67327322 (patch)
tree163797ed631befe85aa2911f80b05bc428146a82
parent1c9e03f8009be4ff6d4e79f5399c476e13caca45 (diff)
Remove Autoconf-generated config.h.
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am5
-rw-r--r--config.h.in69
-rw-r--r--configure.ac1
-rw-r--r--main.c1
5 files changed, 2 insertions, 75 deletions
diff --git a/.gitignore b/.gitignore
index 25993ebf..e1358917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ stamp-h1
config.log
config.status
autom4te.cache
-config.h
Makefile
jq-*.tar.gz
configure
diff --git a/Makefile.am b/Makefile.am
index 228e78cf..b3b8fa0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,9 +112,8 @@ DOC_FILES = docs/content docs/public docs/templates docs/site.yml \
# setup is only used by distribution developers, not package developers.
# Still, as a matter of allowing patching, its not a bad idea to distribute
# the developer setup script in the tarball.
-EXTRA_DIST = config.h.in $(man_MANS) $(TESTS) \
- $(TEST_LOG_COMPILER) gen_utf8_tables.py jq.spec \
- $(DOC_FILES) scripts/version \
+EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) \
+ gen_utf8_tables.py jq.spec $(DOC_FILES) scripts/version \
parser.h parser.c lexer.h lexer.c libjq.map
# README.md is expected in Github projects, good stuff in it, so we'll
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index cf218100..00000000
--- a/config.h.in
+++ /dev/null
@@ -1,69 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#undef YYTEXT_POINTER
diff --git a/configure.ac b/configure.ac
index 70a8c875..c24a6287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,6 @@ AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno])
AC_SUBST([BUNDLER], ["$bundle_cmd"])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([-Wall])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/main.c b/main.c
index d66da9f7..75ae45f9 100644
--- a/main.c
+++ b/main.c
@@ -8,7 +8,6 @@
#include "jv.h"
#include "jq.h"
#include "jv_parse.h"
-#include "config.h" /* Autoconf generated header file */
#include "jv_alloc.h"
#include "version.h"