add prefix to macros in config.h

diff --git a/configure.ac b/configure.ac
index 6ce7594..b2df085 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,10 +19,10 @@ dnl    If not, write to the Free Software Foundation, Inc., 59 Temple
 dnl    Place - Suite 330, Boston, MA 02111-1307, USA.  
 
 # AC_PREREQ(2.57)
-AC_INIT(CCUnit, 0.5, [tsutsumi@users.sourceforge.jp])
-AC_CONFIG_SRCDIR([src/ccunit/CCUnitList.c])
+AC_INIT(CCUnit, 0.6, [tsutsumi@users.sourceforge.jp])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_HEADER([src/ccunit/config.h:config/config.h.in])
+AC_CONFIG_HEADER([config/config.h])
 
 AM_INIT_AUTOMAKE([gnu check-news readme-alpha dist-bzip2 dist-zip -Wall])
 
@@ -54,11 +54,10 @@ AC_CHECK_TYPES(u_char)
 AC_CHECK_TYPES(u_short)
 AC_CHECK_TYPES(u_int)
 AC_CHECK_TYPES(u_long)
-AC_CHECK_TYPES(int64_t)
-AC_CHECK_TYPES(u_int64_t)
-AC_CHECK_TYPES(long long)
-AC_CHECK_TYPES(quad_t)
-AC_CHECK_TYPES(u_quad_t)
+AC_CHECK_TYPES(quad_t,,
+       AC_CHECK_TYPES(int64_t,,AC_CHECK_TYPES(long long)))
+AC_CHECK_TYPES(u_quad_t,,
+       AC_CHECK_TYPES(u_int64_t,,AC_CHECK_TYPES(unsigned long long)))
 
 # Checks for library functions.
 AC_FUNC_MALLOC
@@ -97,3 +96,5 @@ AC_SUBST(FAILOBJS,[$failobjs])
 cd $cwdir
 
 AC_OUTPUT
+
+AC_CREATE_PREFIX_CONFIG_H(src/ccunit/config.h,,config/config.h)