# add

[ccunit/ccunit.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e86392a..420cd41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,11 +18,11 @@ dnl    License along with the CCUnit Library; see the file COPYING.LESSER.
 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.4a, [tsutsumi@users.sourceforge.jp])
-AC_CONFIG_SRCDIR([src/ccunit/CCUnitList.c])
+AC_PREREQ(2.50)
+AC_INIT(CCUnit, 1.1, [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])
 
@@ -32,10 +32,24 @@ AC_LANG(C)
 AC_GNU_SOURCE
 AC_PROG_CC(gcc cc)
 AC_PROG_CC_C_O
-AC_PROG_RANLIB
+# AC_PROG_RANLIB
 AC_PROG_LN_S
+
 AM_WITH_DMALLOC
 ARG_WITH_DOXYGEN
+ARG_ENABLE_COVERAGE
+AC_ARG_ENABLE(japanese-doc,
+  AC_HELP_STRING([--enable-japanese-doc],[output japanese documents]),
+  [ case "${enableval}" in
+    yes) jpn_doc=yes;;
+    no)  jpn_doc=no;;
+    *)   jpn_doc=no;;
+    esac ], [jpn_doc=no])
+AM_CONDITIONAL(JPNDOC, test x$jpn_doc = xyes)
+
+AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
 
 # Checks for libraries.
 
@@ -48,13 +62,18 @@ 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, u_short, u_int, u_long])
+AC_CHECK_TYPES([quad_t, int64_t, long long], break)
+AC_CHECK_TYPES([u_quad_t, u_int64_t, unsigned long long], break)
 
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gettimeofday strerror strncasecmp strrchr memset])
+AC_CHECK_FUNCS([atexit on_exit], break)
 AC_REPLACE_FUNCS([strdup])
 
 # Initialize the test suite and build position independent wrappers.
@@ -65,25 +84,10 @@ AC_CONFIG_FILES([Makefile
                  src/tools/Makefile
                 doc/Makefile
                 doc/Doxyfile
-                tests/Makefile])
-
-cwdir=`pwd`
-cd tests
-for t in test*.c
-do
-    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 "
-done
-
-AC_SUBST(TESTSRCS,[$testsrcs])
-AC_SUBST(TESTOBJS,[$testobjs])
-AC_SUBST(FAILSRCS,[$failsrcs])
-AC_SUBST(FAILOBJS,[$failobjs])
-cd $cwdir
+                tests/Makefile
+                examples/Makefile
+                examples/complex/Makefile])
 
 AC_OUTPUT
+
+AC_CREATE_PREFIX_CONFIG_H(src/ccunit/config.h,,config/config.h)