From: Todd C. Miller Date: Mon, 7 Jun 2010 15:21:23 +0000 (-0400) Subject: Fix --without-iologdir X-Git-Tag: SUDO_1_7_3~109 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6ff55be1f226494d0cd086924efe17d6412d7ea;p=sudo Fix --without-iologdir --HG-- branch : 1.7 --- diff --git a/aclocal.m4 b/aclocal.m4 index 17b317be6..75381e1b9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -172,7 +172,9 @@ AC_DEFUN(SUDO_IO_LOGDIR, [ else with_iologdir="/usr/adm/sudo-io" fi - SUDO_DEFINE_UNQUOTED(_PATH_SUDO_IO_LOGDIR, "$with_iologdir") + if test "${with_iologdir-yes}" != "no"; then + SUDO_DEFINE_UNQUOTED(_PATH_SUDO_IO_LOGDIR, "$with_iologdir") + fi AC_MSG_RESULT($with_iologdir) ])dnl diff --git a/configure b/configure index 9d871a63c..efcb58a31 100755 --- a/configure +++ b/configure @@ -3658,8 +3658,7 @@ fi if test "${with_iologdir+set}" = set; then : withval=$with_iologdir; case $with_iologdir in yes) ;; - no) as_fn_error "\"--without-iologdir not supported.\"" "$LINENO" 5 - ;; + no) ;; esac fi @@ -6524,13 +6523,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6527: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6526: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6530: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6529: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6533: output\"" >&5) + (eval echo "\"\$as_me:6532: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7735,7 +7734,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7738 "configure"' > conftest.$ac_ext + echo '#line 7737 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9128,11 +9127,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9131: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9130: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9135: \$? = $ac_status" >&5 + echo "$as_me:9134: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9467,11 +9466,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9470: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9469: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9474: \$? = $ac_status" >&5 + echo "$as_me:9473: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9572,11 +9571,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9575: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9574: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9579: \$? = $ac_status" >&5 + echo "$as_me:9578: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9627,11 +9626,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9630: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9629: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9634: \$? = $ac_status" >&5 + echo "$as_me:9633: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11994,7 +11993,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11997 "configure" +#line 11996 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12090,7 +12089,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12093 "configure" +#line 12092 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17968,10 +17967,12 @@ $as_echo_n "checking for I/O log dir location... " >&6; } else with_iologdir="/usr/adm/sudo-io" fi - cat >>confdefs.h <>confdefs.h <&5 $as_echo "$with_iologdir" >&6; } diff --git a/configure.in b/configure.in index 29d649024..b60d08021 100644 --- a/configure.in +++ b/configure.in @@ -699,8 +699,7 @@ esac]) AC_ARG_WITH(iologdir, [AS_HELP_STRING([--with-iologdir=DIR], [directory to store sudo I/O log files in])], [case $with_iologdir in yes) ;; - no) AC_MSG_ERROR(["--without-iologdir not supported."]) - ;; + no) ;; esac]) AC_ARG_WITH(sendmail, [AS_HELP_STRING([--with-sendmail], [set path to sendmail])