diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-01-13 15:27:11 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-01-13 15:27:11 +0000 |
| commit | 2fcfa4e3b89f6eaf3fd592379459fb7e53dde3b6 (patch) | |
| tree | 0cc31266138a41dcf38b4bf129e398e504b5ad63 | |
| parent | 9f6f63782658d8f32dc327da0f6da4e295c4e1f6 (diff) | |
Some minor build fixes, after move to git.
| -rw-r--r-- | .gitignore | 30 | ||||
| -rwxr-xr-x | autogen.sh | 10 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 41 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f97f7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +.deps +.libs +*.la +*.lo +*.o +Makefile +Makefile.in + + +/aclocal.m4 +/autom4te.cache +/config.guess +/config.h +/config.h.in +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/libtool +/ltmain.sh +/missing +/stamp-h1 +/INSTALL + +/module/jails_oid.h +/module/jails_tree.? + +/tools/jail-measure @@ -1,5 +1,13 @@ #!/bin/sh -ex +# Some boiler plate to get git setup as expected +if test -d .git; then + if test -f .git/hooks/pre-commit.sample && \ + test ! -f .git/hooks/pre-commit; then + cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit + fi +fi + set -ex aclocal @@ -7,5 +15,5 @@ autoheader libtoolize --force automake -a autoconf -./configure --enable-maintainer-mode "$@" +./configure "$@" diff --git a/configure.in b/configure.in index 8676902..042cff5 100644 --- a/configure.in +++ b/configure.in @@ -48,9 +48,9 @@ AC_CHECK_HEADERS([netinet/in.h netinet/in_systm.h netinet/ip.h arpa/inet.h], , AC_CHECK_HEADERS([sys/queue.h sys/limits.h sys/stat.h sys/time.h], , [echo "ERROR: required header not found."; exit 1]) AC_CHECK_HEADERS([bsnmp/snmpmod.h], , - [echo "ERROR: required bsnmp header not found." exit 1]) + [echo "ERROR: required bsnmp header not found."; exit 1]) AC_CHECK_HEADERS([pcap.h], , - [echo "ERROR: required pcap header not found." exit 1]) + [echo "ERROR: required pcap header not found."; exit 1]) AC_CHECK_MEMBER([struct xprison_v1.pr_version], AC_DEFINE_UNQUOTED(HAVE_XPRISON_V1, 1, [Have prison V1 structure defined]), [], |