having check installed shouldn't be mandatory

diff --git a/configure b/configure
index 2f1714e2525e909d7335f110ebfb6da6efd73634..48eab7a611927f84e128101cb2f4e9500b209f0c 100755 (executable)
--- a/configure
+++ b/configure
@@ -607,15 +607,17 @@ ac_func_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+LIBOBJS
+EGREP
+GREP
+CPP
+HAVE_CHECK_FALSE
+HAVE_CHECK_TRUE
 CHECK_LIBS
 CHECK_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-LIBOBJS
-EGREP
-GREP
-CPP
 HAVE_LIBGD_FALSE
 HAVE_LIBGD_TRUE
 IMAGELIBS
@@ -710,12 +712,12 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 CHECK_CFLAGS
-CHECK_LIBS'
+CHECK_LIBS
+CPP'
 
 
 # Initialize some variables set by options.
@@ -1343,7 +1345,6 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1352,6 +1353,7 @@ Some influential environment variables:
   CHECK_CFLAGS
               C compiler flags for CHECK, overriding pkg-config
   CHECK_LIBS  linker flags for CHECK, overriding pkg-config
+  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -4068,6 +4070,264 @@ else
 fi
 
 
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+       if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suite_create in -lcheck" >&5
+$as_echo_n "checking for suite_create in -lcheck... " >&6; }
+if ${ac_cv_lib_check_suite_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcheck  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char suite_create ();
+int
+main ()
+{
+return suite_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_check_suite_create=yes
+else
+  ac_cv_lib_check_suite_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_check_suite_create" >&5
+$as_echo "$ac_cv_lib_check_suite_create" >&6; }
+if test "x$ac_cv_lib_check_suite_create" = xyes; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
+$as_echo_n "checking for CHECK... " >&6; }
+
+if test -n "$CHECK_CFLAGS"; then
+    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "check >= 0.9.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.6" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CHECK_LIBS"; then
+    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.6\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "check >= 0.9.6") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.6" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.6" 2>&1`
+        else
+               CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.6" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$CHECK_PKG_ERRORS" >&5
+
+       as_fn_error $? "Package requirements (check >= 0.9.6) were not met:
+
+$CHECK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables CHECK_CFLAGS
+and CHECK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables CHECK_CFLAGS
+and CHECK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+       CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
+       CHECK_LIBS=$pkg_cv_CHECK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+
+ if test "$CHECK_LIBS"; then
+  HAVE_CHECK_TRUE=
+  HAVE_CHECK_FALSE='#'
+else
+  HAVE_CHECK_TRUE='#'
+  HAVE_CHECK_FALSE=
+fi
+
+
 # Checks for header files.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5308,218 +5568,6 @@ fi
 done
 
 
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-       if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-       _pkg_min_version=0.9.0
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-               PKG_CONFIG=""
-       fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
-$as_echo_n "checking for CHECK... " >&6; }
-
-if test -n "$CHECK_CFLAGS"; then
-    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "check >= 0.9.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.6" 2>/dev/null`
-                     test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$CHECK_LIBS"; then
-    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.6\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "check >= 0.9.6") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.6" 2>/dev/null`
-                     test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.6" 2>&1`
-        else
-               CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.6" 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$CHECK_PKG_ERRORS" >&5
-
-       as_fn_error $? "Package requirements (check >= 0.9.6) were not met:
-
-$CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables CHECK_CFLAGS
-and CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables CHECK_CFLAGS
-and CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-       CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
-       CHECK_LIBS=$pkg_cv_CHECK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
 ac_config_files="$ac_config_files Makefile src/Makefile tests/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5651,6 +5699,10 @@ if test -z "${HAVE_LIBGD_TRUE}" && test -z "${HAVE_LIBGD_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBGD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CHECK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

diff --git a/configure.ac b/configure.ac
index 9456f1e417e246f0afd99786effe2c8f163b7db9..59e1092c7d92f7e8f2af99eb02c1d2bd4b18db3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AC_CHECK_LIB([m], [pow])
 AC_CHECK_LIB([gd], [gdImageLine], [IMAGELIBS=-lgd])
 AC_SUBST([IMAGELIBS])
 AM_CONDITIONAL([HAVE_LIBGD], [test "$IMAGELIBS" = "-lgd"])
+AC_CHECK_LIB([check], [suite_create], [PKG_CHECK_MODULES([CHECK], [check >= 0.9.6])])
+AM_CONDITIONAL([HAVE_CHECK], [test "$CHECK_LIBS"])
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h inttypes.h locale.h stdint.h stdlib.h string.h sys/file.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h syslog.h unistd.h wchar.h])
@@ -35,7 +37,5 @@ AC_FUNC_MKTIME
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([dup2 localtime_r memset mkdir pow rmdir setlocale strcasecmp strchr strdup strerror strncasecmp strstr strtol strtoul strtoull tzset])
 
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.6])
-
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 AC_OUTPUT

diff --git a/src/Makefile.am b/src/Makefile.am
index e1cd0aea63a1f65c827292de0131a0339d00aa06..96825f6ec214e60ce8f1e396e5803c3e184df926 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = vnstat vnstatd
 if HAVE_LIBGD
-  bin_PROGRAMS += vnstati
+bin_PROGRAMS += vnstati
 endif
 vnstati_LDADD = $(IMAGELIBS)
 vnstat_SOURCES = vnstat.c vnstat.h ifinfo.c ifinfo.h dbxml.c dbxml.h dbjson.c dbjson.h dbshow.c dbshow.h dbaccess.c dbaccess.h dbmerge.c dbmerge.h common.c common.h misc.c misc.h cfg.c cfg.h ibw.c ibw.h traffic.c traffic.h

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8a9f09c52c1502a7cefa78ff202936de4fb86787..a5b410a6f1baf545580ebc5e1e653f529b367034 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,11 @@
+if HAVE_CHECK
 TESTS = check_vnstat
 check_PROGRAMS = check_vnstat
 check_vnstat_CFLAGS = @CHECK_CFLAGS@ -DPROCNETDEV=\"testdir/proc/dev\" -DSYSCLASSNET=\"testdir/sysclassnet\"
 check_vnstat_LDADD = @CHECK_LIBS@ -lgd
 check_vnstat_SOURCES = vnstat_tests.c vnstat_tests.h common_tests.c common_tests.h database_tests.c database_tests.h config_tests.c config_tests.h ifinfo_tests.c ifinfo_tests.h misc_tests.c misc_tests.h daemon_tests.c daemon_tests.h
 check_vnstat_SOURCES += $(top_builddir)/src/cfg.c $(top_builddir)/src/cfg.h $(top_builddir)/src/common.c $(top_builddir)/src/common.h $(top_builddir)/src/daemon.c $(top_builddir)/src/daemon.h $(top_builddir)/src/dbaccess.c $(top_builddir)/src/dbaccess.h $(top_builddir)/src/dbcache.c $(top_builddir)/src/dbcache.h $(top_builddir)/src/dbjson.c $(top_builddir)/src/dbjson.h $(top_builddir)/src/dbmerge.c $(top_builddir)/src/dbmerge.h $(top_builddir)/src/dbshow.c $(top_builddir)/src/dbshow.h $(top_builddir)/src/dbxml.c $(top_builddir)/src/dbxml.h $(top_builddir)/src/ibw.c $(top_builddir)/src/ibw.h $(top_builddir)/src/ifinfo.c $(top_builddir)/src/ifinfo.h $(top_builddir)/src/image.c $(top_builddir)/src/image.h $(top_builddir)/src/misc.c $(top_builddir)/src/misc.h $(top_builddir)/src/traffic.c $(top_builddir)/src/traffic.h
+endif
 
 clean-local:
        -rm -fr *.gc* test.log test.xml testdir

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3d123f611b9a76361376b8eb1c58708c2cb64fbb..774c0892fc4f8ececdcc11d24ca99d697838cebd 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -31,8 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-TESTS = check_vnstat$(EXEEXT)
-check_PROGRAMS = check_vnstat$(EXEEXT)
+@HAVE_CHECK_TRUE@TESTS = check_vnstat$(EXEEXT)
+@HAVE_CHECK_TRUE@check_PROGRAMS = check_vnstat$(EXEEXT)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -43,20 +43,47 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_check_vnstat_OBJECTS = check_vnstat-vnstat_tests.$(OBJEXT) \
-       check_vnstat-common_tests.$(OBJEXT) \
-       check_vnstat-database_tests.$(OBJEXT) \
-       check_vnstat-config_tests.$(OBJEXT) \
-       check_vnstat-ifinfo_tests.$(OBJEXT) \
-       check_vnstat-misc_tests.$(OBJEXT) \
-       check_vnstat-daemon_tests.$(OBJEXT) check_vnstat-cfg.$(OBJEXT) \
-       check_vnstat-common.$(OBJEXT) check_vnstat-daemon.$(OBJEXT) \
-       check_vnstat-dbaccess.$(OBJEXT) check_vnstat-dbcache.$(OBJEXT) \
-       check_vnstat-dbjson.$(OBJEXT) check_vnstat-dbmerge.$(OBJEXT) \
-       check_vnstat-dbshow.$(OBJEXT) check_vnstat-dbxml.$(OBJEXT) \
-       check_vnstat-ibw.$(OBJEXT) check_vnstat-ifinfo.$(OBJEXT) \
-       check_vnstat-image.$(OBJEXT) check_vnstat-misc.$(OBJEXT) \
-       check_vnstat-traffic.$(OBJEXT)
+am__check_vnstat_SOURCES_DIST = vnstat_tests.c vnstat_tests.h \
+       common_tests.c common_tests.h database_tests.c \
+       database_tests.h config_tests.c config_tests.h ifinfo_tests.c \
+       ifinfo_tests.h misc_tests.c misc_tests.h daemon_tests.c \
+       daemon_tests.h $(top_builddir)/src/cfg.c \
+       $(top_builddir)/src/cfg.h $(top_builddir)/src/common.c \
+       $(top_builddir)/src/common.h $(top_builddir)/src/daemon.c \
+       $(top_builddir)/src/daemon.h $(top_builddir)/src/dbaccess.c \
+       $(top_builddir)/src/dbaccess.h $(top_builddir)/src/dbcache.c \
+       $(top_builddir)/src/dbcache.h $(top_builddir)/src/dbjson.c \
+       $(top_builddir)/src/dbjson.h $(top_builddir)/src/dbmerge.c \
+       $(top_builddir)/src/dbmerge.h $(top_builddir)/src/dbshow.c \
+       $(top_builddir)/src/dbshow.h $(top_builddir)/src/dbxml.c \
+       $(top_builddir)/src/dbxml.h $(top_builddir)/src/ibw.c \
+       $(top_builddir)/src/ibw.h $(top_builddir)/src/ifinfo.c \
+       $(top_builddir)/src/ifinfo.h $(top_builddir)/src/image.c \
+       $(top_builddir)/src/image.h $(top_builddir)/src/misc.c \
+       $(top_builddir)/src/misc.h $(top_builddir)/src/traffic.c \
+       $(top_builddir)/src/traffic.h
+@HAVE_CHECK_TRUE@am_check_vnstat_OBJECTS =  \
+@HAVE_CHECK_TRUE@      check_vnstat-vnstat_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-common_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-database_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-config_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-ifinfo_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-misc_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-daemon_tests.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-cfg.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-common.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-daemon.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbaccess.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbcache.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbjson.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbmerge.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbshow.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-dbxml.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-ibw.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-ifinfo.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-image.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-misc.$(OBJEXT) \
+@HAVE_CHECK_TRUE@      check_vnstat-traffic.$(OBJEXT)
 check_vnstat_OBJECTS = $(am_check_vnstat_OBJECTS)
 check_vnstat_DEPENDENCIES =
 check_vnstat_LINK = $(CCLD) $(check_vnstat_CFLAGS) $(CFLAGS) \
@@ -70,7 +97,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(check_vnstat_SOURCES)
-DIST_SOURCES = $(check_vnstat_SOURCES)
+DIST_SOURCES = $(am__check_vnstat_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -168,26 +195,42 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-check_vnstat_CFLAGS = @CHECK_CFLAGS@ -DPROCNETDEV=\"testdir/proc/dev\" -DSYSCLASSNET=\"testdir/sysclassnet\"
-check_vnstat_LDADD = @CHECK_LIBS@ -lgd
-check_vnstat_SOURCES = vnstat_tests.c vnstat_tests.h common_tests.c \
-       common_tests.h database_tests.c database_tests.h \
-       config_tests.c config_tests.h ifinfo_tests.c ifinfo_tests.h \
-       misc_tests.c misc_tests.h daemon_tests.c daemon_tests.h \
-       $(top_builddir)/src/cfg.c $(top_builddir)/src/cfg.h \
-       $(top_builddir)/src/common.c $(top_builddir)/src/common.h \
-       $(top_builddir)/src/daemon.c $(top_builddir)/src/daemon.h \
-       $(top_builddir)/src/dbaccess.c $(top_builddir)/src/dbaccess.h \
-       $(top_builddir)/src/dbcache.c $(top_builddir)/src/dbcache.h \
-       $(top_builddir)/src/dbjson.c $(top_builddir)/src/dbjson.h \
-       $(top_builddir)/src/dbmerge.c $(top_builddir)/src/dbmerge.h \
-       $(top_builddir)/src/dbshow.c $(top_builddir)/src/dbshow.h \
-       $(top_builddir)/src/dbxml.c $(top_builddir)/src/dbxml.h \
-       $(top_builddir)/src/ibw.c $(top_builddir)/src/ibw.h \
-       $(top_builddir)/src/ifinfo.c $(top_builddir)/src/ifinfo.h \
-       $(top_builddir)/src/image.c $(top_builddir)/src/image.h \
-       $(top_builddir)/src/misc.c $(top_builddir)/src/misc.h \
-       $(top_builddir)/src/traffic.c $(top_builddir)/src/traffic.h
+@HAVE_CHECK_TRUE@check_vnstat_CFLAGS = @CHECK_CFLAGS@ -DPROCNETDEV=\"testdir/proc/dev\" -DSYSCLASSNET=\"testdir/sysclassnet\"
+@HAVE_CHECK_TRUE@check_vnstat_LDADD = @CHECK_LIBS@ -lgd
+@HAVE_CHECK_TRUE@check_vnstat_SOURCES = vnstat_tests.c vnstat_tests.h \
+@HAVE_CHECK_TRUE@      common_tests.c common_tests.h \
+@HAVE_CHECK_TRUE@      database_tests.c database_tests.h \
+@HAVE_CHECK_TRUE@      config_tests.c config_tests.h ifinfo_tests.c \
+@HAVE_CHECK_TRUE@      ifinfo_tests.h misc_tests.c misc_tests.h \
+@HAVE_CHECK_TRUE@      daemon_tests.c daemon_tests.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/cfg.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/cfg.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/common.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/common.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/daemon.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/daemon.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbaccess.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbaccess.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbcache.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbcache.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbjson.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbjson.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbmerge.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbmerge.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbshow.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbshow.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbxml.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/dbxml.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/ibw.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/ibw.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/ifinfo.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/ifinfo.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/image.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/image.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/misc.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/misc.h \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/traffic.c \
+@HAVE_CHECK_TRUE@      $(top_builddir)/src/traffic.h
 all: all-am
 
 .SUFFIXES: