X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=9b32906ffc321b38f34c39a6505aa3260540dbf2;hb=45df28fa6284417ebcc5de1ad9a371dd4447b8c1;hp=745a146bfa2f0ade61a8af99813aa6f06bcd6852;hpb=84983a8a492e1262fcb6320327b15c8e3f4083f3;p=ccunit%2Fccunit.git

diff --git a/configure.ac b/configure.ac
index 745a146..9b32906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-dnl    Copyright (C) 2003 TSUTSUMI Kikuo.
+dnl    Copyright (C) 2003, 2010, 2013 TSUTSUMI Kikuo.
 dnl    This file is part of the CCUnit Library.
 
 dnl    The CCUnit Library is free software; you can redistribute it and/or
@@ -18,24 +18,47 @@ 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.4, [tsutsumi@users.sourceforge.jp])
-AC_CONFIG_SRCDIR([src/ccunit/CCUnitList.c])
+AC_PREREQ([2.69])
+LT_PREREQ([2.2.8])
+AC_INIT([CCUnit],[2.1],[tsntsumi@users.sourceforge.jp],[],[http://ccunit.sourceforge.jp])
+AC_REVISION([$Revision$])
+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])
+AC_CONFIG_MACRO_DIR([config])
 
 AM_INIT_AUTOMAKE([gnu check-news readme-alpha dist-bzip2 dist-zip -Wall])
 
+AX_PREFIX_CONFIG_H(src/ccunit/config.h,,config/config.h)
+
+AC_SUBST(DISTDOCDIR,$PACKAGE-$VERSION-doc)
+AC_SUBST(DISTDOCJADIR,$PACKAGE-$VERSION-docja)
+
 AC_LANG(C)
 
 # Checks for programs.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC(gcc cc)
 AC_PROG_CC_C_O
-AC_PROG_RANLIB
+# AC_PROG_RANLIB
 AC_PROG_LN_S
+
+AM_PROG_AR
 AM_WITH_DMALLOC
 ARG_WITH_DOXYGEN
+ARG_ENABLE_COVERAGE
+AC_ARG_ENABLE(japanese-doc,
+  AS_HELP_STRING([--enable-japanese-doc],[output japanese documents]),
+  [ case "${enableval}" in
+    yes) enable_jadoc=yes;;
+    no)  enable_jadoc=no;;
+    *)   enable_jadoc=no;;
+    esac ], [enable_jadoc=no])
+AM_CONDITIONAL(ENABLE_JADOC, test x$enable_jadoc = xyes)
+
+#AC_REQUIRE(AC_CANONICAL_HOST)
+
+LT_INIT([dlopen win32-dll])
 
 # Checks for libraries.
 
@@ -48,42 +71,36 @@ AC_HEADER_STDBOOL
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
+
+    AC_TYPE_LONG_DOUBLE_WIDER
+    ac_cv_c_long_double=$ac_cv_type_long_double_wider
+    if test $ac_cv_c_long_double = yes; then
+      AC_DEFINE([HAVE_LONG_DOUBLE],[1],[Define to 1 if the type `long double' works and has more range or
+	 precision than `double'.])
+    fi
+  
 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([gettimeofday memset strcasecmp strerror strncasecmp strrchr strstr])
+AC_CHECK_FUNCS([atexit on_exit], break)
 AC_REPLACE_FUNCS([strdup])
 
 # Initialize the test suite and build position independent wrappers.
-
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/ccunit/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