From 4a0d37afda0b98efa21184635baa519ca776418c Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 4 Jul 2016 21:07:53 +0800 Subject: [PATCH] Update makefile --- Makefile.in | 12 +-- configure | 198 +++++++++++++++++++++++-------------------- libcork/Makefile.in | 1 - libev/Makefile.in | 1 - libipset/Makefile.in | 1 - libudns/Makefile.in | 1 - src/Makefile.in | 1 - 7 files changed, 114 insertions(+), 101 deletions(-) diff --git a/Makefile.in b/Makefile.in index fefbb7de..52f46341 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,6 +78,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_DOCUMENTATION_TRUE@am__append_1 = doc subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -251,7 +252,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -361,8 +361,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@USE_SYSTEM_SHARED_LIB_FALSE@SUBDIRS = libsodium libcork libipset libudns libev src doc -@USE_SYSTEM_SHARED_LIB_TRUE@SUBDIRS = libcork libipset src doc +@USE_SYSTEM_SHARED_LIB_FALSE@SUBDIRS = libsodium libcork libipset \ +@USE_SYSTEM_SHARED_LIB_FALSE@ libudns libev src $(am__append_1) +@USE_SYSTEM_SHARED_LIB_TRUE@SUBDIRS = libcork libipset src \ +@USE_SYSTEM_SHARED_LIB_TRUE@ $(am__append_1) ACLOCAL_AMFLAGS = -I m4 pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = shadowsocks-libev.pc @@ -421,8 +423,8 @@ distclean-hdr: -rm -f config.h stamp-h1 shadowsocks-libev.pc: $(top_builddir)/config.status $(srcdir)/shadowsocks-libev.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ -doc/Makefile: $(top_builddir)/config.status $(top_srcdir)/doc/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ +@ENABLE_DOCUMENTATION_TRUE@doc/Makefile: $(top_builddir)/config.status $(top_srcdir)/doc/Makefile.in +@ENABLE_DOCUMENTATION_TRUE@ cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/configure b/configure index 77f42488..1907aea0 100755 --- a/configure +++ b/configure @@ -653,7 +653,8 @@ RM GZIP XMLTO ASCIIDOC -DISABLE_DOCUMENTATION +ENABLE_DOCUMENTATION_FALSE +ENABLE_DOCUMENTATION_TRUE USE_SYSTEM_SHARED_LIB_FALSE USE_SYSTEM_SHARED_LIB_TRUE OTOOL64 @@ -12034,19 +12035,22 @@ fi # Check whether --enable-documentation was given. if test "${enable_documentation+set}" = set; then : - enableval=$enable_documentation; + enableval=$enable_documentation; disable_documentation=true else - enable_documentation=yes + disable_documentation=false fi -if test "x$enable_documentation" = xyes; then : - DISABLE_DOCUMENTATION=0 + if test x$disable_documentation = xfalse; then + ENABLE_DOCUMENTATION_TRUE= + ENABLE_DOCUMENTATION_FALSE='#' else - DISABLE_DOCUMENTATION=1 + ENABLE_DOCUMENTATION_TRUE='#' + ENABLE_DOCUMENTATION_FALSE= fi -if test "x$enable_documentation" = xyes; then +if test -z "$ENABLE_DOCUMENTATION_TRUE"; then : + # Extract the first word of "asciidoc", so it can be a program name with args. set dummy asciidoc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -12170,6 +12174,88 @@ $as_echo "no" >&6; } fi + # Extract the first word of "rm", so it can be a program name with args. +set dummy rm; 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_RM+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $RM in + [\\/]* | ?:[\\/]*) + ac_cv_path_RM="$RM" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_RM="$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 + + test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" + ;; +esac +fi +RM=$ac_cv_path_RM +if test -n "$RM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 +$as_echo "$RM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "mv", so it can be a program name with args. +set dummy mv; 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_MV+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MV in + [\\/]* | ?:[\\/]*) + ac_cv_path_MV="$MV" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MV="$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 + + test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv" + ;; +esac +fi +MV=$ac_cv_path_MV +if test -n "$MV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5 +$as_echo "$MV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -12239,6 +12325,7 @@ $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed + fi ac_ext=c @@ -12885,88 +12972,6 @@ $as_echo "no" >&6; } fi -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; 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_RM+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$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 - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" - ;; -esac -fi -RM=$ac_cv_path_RM -if test -n "$RM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 -$as_echo "$RM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "mv", so it can be a program name with args. -set dummy mv; 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_MV+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MV in - [\\/]* | ?:[\\/]*) - ac_cv_path_MV="$MV" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MV="$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 - - test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv" - ;; -esac -fi -MV=$ac_cv_path_MV -if test -n "$MV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5 -$as_echo "$MV" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then : else @@ -15884,13 +15889,20 @@ if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then : fi -ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile src/Makefile doc/Makefile" +ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile src/Makefile" if test -z "$USE_SYSTEM_SHARED_LIB_TRUE"; then : else ac_config_files="$ac_config_files libudns/Makefile libev/Makefile" fi + +if test -z "$ENABLE_DOCUMENTATION_TRUE"; then : + ac_config_files="$ac_config_files doc/Makefile" + + +fi + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16036,6 +16048,10 @@ if test -z "${USE_SYSTEM_SHARED_LIB_TRUE}" && test -z "${USE_SYSTEM_SHARED_LIB_F as_fn_error $? "conditional \"USE_SYSTEM_SHARED_LIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DOCUMENTATION_TRUE}" && test -z "${ENABLE_DOCUMENTATION_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DOCUMENTATION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BUILD_REDIRECTOR_TRUE}" && test -z "${BUILD_REDIRECTOR_FALSE}"; then as_fn_error $? "conditional \"BUILD_REDIRECTOR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16922,9 +16938,9 @@ do "libcork/Makefile") CONFIG_FILES="$CONFIG_FILES libcork/Makefile" ;; "libipset/Makefile") CONFIG_FILES="$CONFIG_FILES libipset/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "libudns/Makefile") CONFIG_FILES="$CONFIG_FILES libudns/Makefile" ;; "libev/Makefile") CONFIG_FILES="$CONFIG_FILES libev/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/libcork/Makefile.in b/libcork/Makefile.in index bcd8b4c2..ad54af2c 100644 --- a/libcork/Makefile.in +++ b/libcork/Makefile.in @@ -220,7 +220,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ diff --git a/libev/Makefile.in b/libev/Makefile.in index 966481de..fd30b10a 100644 --- a/libev/Makefile.in +++ b/libev/Makefile.in @@ -187,7 +187,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ diff --git a/libipset/Makefile.in b/libipset/Makefile.in index 42272dd7..7512b254 100644 --- a/libipset/Makefile.in +++ b/libipset/Makefile.in @@ -216,7 +216,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ diff --git a/libudns/Makefile.in b/libudns/Makefile.in index 0029f297..23f8555f 100644 --- a/libudns/Makefile.in +++ b/libudns/Makefile.in @@ -208,7 +208,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ diff --git a/src/Makefile.in b/src/Makefile.in index 0a9da1ad..bc9c24a4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -335,7 +335,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@