From 137b1eb3e41578d9d4a066ef75c6abfa597c46cd Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Sep 2010 22:18:30 +0200
Subject: Misc changes

---
 configure.ac | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index cad1e36..041c63e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([odb/version.hxx])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-bzip2 dist-zip tar-ustar])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar])
 
 LT_INIT([win32-dll])
 
@@ -20,10 +20,6 @@ AC_CANONICAL_HOST
 AC_PROG_CXX
 AC_LANG(C++)
 
-# Required by subdir-objects.
-#
-AM_PROG_CC_C_O
-
 # Create the libtool executable so that we can use it in further tests.
 #
 LT_OUTPUT
@@ -50,7 +46,7 @@ DISABLE_RPATH
 
 # Output.
 #
-AC_CONFIG_HEADERS([config.h odb/details/config.h])
+AC_CONFIG_HEADERS([odb/config.h odb/details/config.h])
 AC_CONFIG_FILES([
   __path__(config_files)
 ])
-- 
cgit v1.1