# add changes

[ccunit/ccunit.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7c9b980..53adf29 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.2b, [tsutsumi@users.sourceforge.net])
-AC_CONFIG_SRCDIR([src/ccunit/CCUnitList.c])
+AC_INIT(CCUnit, 0.6.1, [tsutsumi@users.sourceforge.jp])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([config/config.h])
 
 AM_INIT_AUTOMAKE([gnu check-news readme-alpha dist-bzip2 dist-zip -Wall])
 
@@ -35,7 +35,7 @@ AC_PROG_CC_C_O
 AC_PROG_RANLIB
 AC_PROG_LN_S
 AM_WITH_DMALLOC
-CU_ENABLE_DOXYGEN
+ARG_WITH_DOXYGEN
 
 # Checks for libraries.
 
@@ -48,15 +48,26 @@ AC_HEADER_STDBOOL
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
+AC_C_LONG_DOUBLE
 AC_HEADER_TIME
+AC_CHECK_TYPES(u_char)
+AC_CHECK_TYPES(u_short)
+AC_CHECK_TYPES(u_int)
+AC_CHECK_TYPES(u_long)
+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
 AC_FUNC_REALLOC
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gettimeofday strerror strncasecmp strrchr])
+AC_CHECK_FUNCS([gettimeofday strerror strncasecmp strrchr memset])
 AC_REPLACE_FUNCS([strdup])
 
+# Initialize the test suite and build position independent wrappers.
+
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/ccunit/Makefile
@@ -65,24 +76,25 @@ AC_CONFIG_FILES([Makefile
                 doc/Doxyfile
                 tests/Makefile])
 
-# Initialize the test suite and build position independent wrappers.
 cwdir=`pwd`
 cd tests
 for t in test*.c
 do
-    TESTSRCS="$TESTSRCS$t "
-    TESTOBJS="$TESTOBJS`basename $t .c`.o "
+    testsrcs="$testsrcs$t "
+    testobjs="$testobjs`basename $t .c`.o "
 done
 for f in fail*.c
 do
-    FAILSRCS="$FAILSRCS$f "
-    FAILOBJS="$FAILOBJS`basename $f .c`.o "
+    failsrcs="$failsrcs$f "
+    failobjs="$failobjs`basename $f .c`.o "
 done
 
-AC_SUBST(TESTSRCS,[$TESTSRCS])
-AC_SUBST(TESTOBJS,[$TESTOBJS])
-AC_SUBST(FAILSRCS,[$FAILSRCS])
-AC_SUBST(FAILOBJS,[$FAILOBJS])
+AC_SUBST(TESTSRCS,[$testsrcs])
+AC_SUBST(TESTOBJS,[$testobjs])
+AC_SUBST(FAILSRCS,[$failsrcs])
+AC_SUBST(FAILOBJS,[$failobjs])
 cd $cwdir
 
 AC_OUTPUT
+
+AC_CREATE_PREFIX_CONFIG_H(src/ccunit/config.h,,config/config.h)