wok-next diff tinyproxy/stuff/no-docs-and-tests.diff @ rev 8678

Automated merge with https://bitbucket.org/gokhlayeh/wok
author Antoine Bodin <gokhlayeh@slitaz.org>
date Thu Feb 17 00:50:03 2011 +0100 (2011-02-17)
parents
children df64154dacd6
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/tinyproxy/stuff/no-docs-and-tests.diff	Thu Feb 17 00:50:03 2011 +0100
     1.3 @@ -0,0 +1,100 @@
     1.4 +diff --git a/Makefile.am b/Makefile.am
     1.5 +index 7de41f2..9d1f99b 100644
     1.6 +--- a/Makefile.am
     1.7 ++++ b/Makefile.am
     1.8 +@@ -2,9 +2,7 @@ SUBDIRS = \
     1.9 + 	src \
    1.10 + 	data \
    1.11 + 	etc \
    1.12 +-	docs \
    1.13 + 	m4macros \
    1.14 +-	tests
    1.15 + 
    1.16 + # tools want this on a single line
    1.17 + ACLOCAL_AMFLAGS = -I m4macros
    1.18 +diff --git a/Makefile.in b/Makefile.in
    1.19 +index d0ec918..5be49d4 100644
    1.20 +--- a/Makefile.in
    1.21 ++++ b/Makefile.in
    1.22 +@@ -221,9 +221,7 @@ SUBDIRS = \
    1.23 + 	src \
    1.24 + 	data \
    1.25 + 	etc \
    1.26 +-	docs \
    1.27 + 	m4macros \
    1.28 +-	tests
    1.29 + 
    1.30 + 
    1.31 + # tools want this on a single line
    1.32 +diff --git a/configure b/configure
    1.33 +index 01d6883..facfadd 100755
    1.34 +--- a/configure
    1.35 ++++ b/configure
    1.36 +@@ -6811,67 +6811,10 @@
    1.37 + fi
    1.38 + 
    1.39 + 
    1.40 +-
    1.41 +-
    1.42 +-
    1.43 +-
    1.44 +-
    1.45 +-# Check for asciidoc
    1.46 +-# Extract the first word of "a2x", so it can be a program name with args.
    1.47 +-set dummy a2x; ac_word=$2
    1.48 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1.49 +-$as_echo_n "checking for $ac_word... " >&6; }
    1.50 +-if test "${ac_cv_path_A2X+set}" = set; then :
    1.51 +-  $as_echo_n "(cached) " >&6
    1.52 +-else
    1.53 +-  case $A2X in
    1.54 +-  [\\/]* | ?:[\\/]*)
    1.55 +-  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
    1.56 +-  ;;
    1.57 +-  *)
    1.58 +-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.59 +-for as_dir in $PATH
    1.60 +-do
    1.61 +-  IFS=$as_save_IFS
    1.62 +-  test -z "$as_dir" && as_dir=.
    1.63 +-    for ac_exec_ext in '' $ac_executable_extensions; do
    1.64 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1.65 +-    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
    1.66 +-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.67 +-    break 2
    1.68 +-  fi
    1.69 +-done
    1.70 +-  done
    1.71 +-IFS=$as_save_IFS
    1.72 +-
    1.73 +-  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
    1.74 +-  ;;
    1.75 +-esac
    1.76 +-fi
    1.77 +-A2X=$ac_cv_path_A2X
    1.78 +-if test -n "$A2X"; then
    1.79 +-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
    1.80 +-$as_echo "$A2X" >&6; }
    1.81 +-else
    1.82 +-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.83 +-$as_echo "no" >&6; }
    1.84 +-fi
    1.85 +-
    1.86 +-
    1.87 +- if test "x$A2X" != "xno"; then
    1.88 +-  HAVE_A2X_TRUE=
    1.89 +-  HAVE_A2X_FALSE='#'
    1.90 +-else
    1.91 +-  HAVE_A2X_TRUE='#'
    1.92 +-  HAVE_A2X_FALSE=
    1.93 +-fi
    1.94 +-
    1.95 +-if test x"$A2X" = x"no"; then
    1.96 +-  as_fn_error "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5
    1.97 +-fi
    1.98 +-
    1.99 ++  HAVE_A2X_TRUE='#'
   1.100 ++  HAVE_A2X_FALSE=
   1.101 + ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile"
   1.102 + 
   1.103 +