X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure;h=51252f17d137c060ccc3605a0771b1f8467aaaab;hb=4a6ee8b677fd7addc97fc0d245f95ddde3b5f8e4;hp=698cc7a2833c2258cb6a61c6152cfe11e9d85b94;hpb=fe0c91cce702525cc26669b382d3d8a234b7e65f;p=secnet.git diff --git a/configure b/configure index 698cc7a..51252f1 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in. +# From configure.ac Id: configure.in. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for secnet 0.1.18+. # @@ -629,7 +629,6 @@ WRITESTRINGS EGREP GREP CPP -RM INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -680,7 +679,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +_SUBDIRMK_MAKEFILES' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -2344,6 +2344,35 @@ ac_config_headers="$ac_config_headers config.h" + ac_config_files="$ac_config_files main.mk:main.mk.tmp Subdir.mk:Subdir.mk.tmp" + + + + _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES subdirmk/regen.mk" + ac_config_files="$ac_config_files subdirmk/regen.mk:subdirmk/regen.mk.in" + + + _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES subdirmk/usual.mk" + ac_config_files="$ac_config_files subdirmk/usual.mk:subdirmk/usual.mk.in" + + + + + + subdirmk_subdirs="$subdirmk_subdirs 'test-example/'" + ac_config_files="$ac_config_files test-example/Subdir.mk:test-example/Subdir.mk.tmp" + + + subdirmk_subdirs="$subdirmk_subdirs 'mtest/'" + ac_config_files="$ac_config_files mtest/Subdir.mk:mtest/Subdir.mk.tmp" + + + subdirmk_subdirs="$subdirmk_subdirs 'stest/'" + ac_config_files="$ac_config_files stest/Subdir.mk:stest/Subdir.mk.tmp" + + + + ac_ext=c @@ -3342,46 +3371,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# 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 - - ;; -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 - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4735,7 +4724,12 @@ else $as_echo "$as_me: WARNING: Disabling IPv6 support" >&2;} fi -ac_config_files="$ac_config_files Makefile" + + + _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES common.make" + ac_config_files="$ac_config_files common.make:common.make.in" + + ac_config_commands="$ac_config_commands default" @@ -5426,6 +5420,13 @@ _ASBOX _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# + + '$srcdir'/subdirmk/generate --srcdir='$srcdir' $subdirmk_subdirs + + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -5435,7 +5436,14 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main.mk.tmp" ;; + "Subdir.mk") CONFIG_FILES="$CONFIG_FILES Subdir.mk:Subdir.mk.tmp" ;; + "subdirmk/regen.mk") CONFIG_FILES="$CONFIG_FILES subdirmk/regen.mk:subdirmk/regen.mk.in" ;; + "subdirmk/usual.mk") CONFIG_FILES="$CONFIG_FILES subdirmk/usual.mk:subdirmk/usual.mk.in" ;; + "test-example/Subdir.mk") CONFIG_FILES="$CONFIG_FILES test-example/Subdir.mk:test-example/Subdir.mk.tmp" ;; + "mtest/Subdir.mk") CONFIG_FILES="$CONFIG_FILES mtest/Subdir.mk:mtest/Subdir.mk.tmp" ;; + "stest/Subdir.mk") CONFIG_FILES="$CONFIG_FILES stest/Subdir.mk:stest/Subdir.mk.tmp" ;; + "common.make") CONFIG_FILES="$CONFIG_FILES common.make:common.make.in" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -5992,7 +6000,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "default":C) echo timestamp >stamp-h ;; + "default":C) echo timestamp >config.stamp ;; esac done # for ac_tag