From f00919d7063bb84d05a92438fc5c2d68ad684f39 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 20 Jul 2002 05:24:22 +0000 Subject: 2002-07-19 Roland McGrath * configure.in (force_install): New substituted variable, set to yes/no by --enable-force-install. * Makefile.in (force-install): New variable from configure. [$(force_install) = yes]: Make installed headers depend on a force target. * configure: Regenerated. --- Makefile.in | 13 ++++++++-- configure | 80 +++++++++++++++++++++++++++++++++++------------------------- configure.in | 10 ++++++-- 3 files changed, 66 insertions(+), 37 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7279e50c..7e56df86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,6 +21,7 @@ systype=@systype@ prefix=@prefix@ version = @VERSION@ tool_prefix=@ac_tool_prefix@ +force_install=@force_install@ exec_prefix=$(prefix) @@ -341,10 +342,18 @@ installed-headers-names = $(addprefix $(includedir)/,$(installed-headers)) installed-sysdep-headers-names = $(addprefix $(includedir)/,$($(systype)-installed-headers)) install: install-headers install-kernel -$(installed-headers-names): $(includedir)/%: $(srcdir)/include/% +ifeq ($(force_install),yes) + instforce := FORCE + FORCE: +else + instforce := +endif + +$(installed-headers-names): $(includedir)/%: $(srcdir)/include/% $(instforce) $(INSTALL_DATA) $< $@ -$(installed-sysdep-headers-names): $(includedir)/%: $(sysdep)/include/% +$(installed-sysdep-headers-names): $(includedir)/%: $(sysdep)/include/% \ + $(instforce) $(INSTALL_DATA) $< $@ install-headers: mkheaderdirs $(installed-headers-names) $(installed-sysdep-headers-names) diff --git a/configure b/configure index a8233cc5..bc7b2792 100755 --- a/configure +++ b/configure @@ -13,9 +13,12 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_default_prefix= ac_help="$ac_help - --enable-smp=MAXCPUS enable SMP with up to MAXCPUS processors" + --enable-force-install force installation of files from this package, + even if they are older than the installed files" ac_help="$ac_help - --enable-fpe enable FPU emulator for machines with no FPU" + --enable-smp=MAXCPUS enable SMP with up to MAXCPUS processors" +ac_help="$ac_help + --enable-fpe enable FPU emulator for machines with no FPU" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -561,7 +564,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:565: checking host system type" >&5 +echo "configure:568: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -597,6 +600,16 @@ esac # # Options # +# Check whether --enable-force-install or --disable-force-install was given. +if test "${enable_force_install+set}" = set; then + enableval="$enable_force_install" + force_install=$enableval +else + force_install=no +fi + + + # Check whether --enable-smp or --disable-smp was given. if test "${enable_smp+set}" = set; then enableval="$enable_smp" @@ -641,7 +654,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:645: checking for a BSD compatible install" >&5 +echo "configure:658: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -698,7 +711,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:702: checking for $ac_word" >&5 +echo "configure:715: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -729,7 +742,7 @@ done echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:733: checking build system type" >&5 +echo "configure:746: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -755,7 +768,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:759: checking for $ac_word" >&5 +echo "configure:772: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -789,7 +802,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:793: checking for $ac_word" >&5 +echo "configure:806: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -819,7 +832,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:823: checking for $ac_word" >&5 +echo "configure:836: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -868,7 +881,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:872: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:885: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -879,12 +892,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 883 "configure" +#line 896 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -914,13 +927,13 @@ else cross_linkable=yes fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:918: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:931: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:924: checking whether we are using GNU C" >&5 +echo "configure:937: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -929,7 +942,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -963,7 +976,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:967: checking for $ac_word" >&5 +echo "configure:980: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -995,7 +1008,7 @@ fi # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:999: checking for $ac_word" >&5 +echo "configure:1012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1028,7 +1041,7 @@ fi # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. set dummy ${ac_tool_prefix}mig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1032: checking for $ac_word" >&5 +echo "configure:1045: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1060,7 +1073,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "mig", so it can be a program name with args. set dummy mig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1064: checking for $ac_word" >&5 +echo "configure:1077: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1096,7 +1109,7 @@ fi # Extract the first word of "mbchk", so it can be a program name with args. set dummy mbchk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1100: checking for $ac_word" >&5 +echo "configure:1113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MBCHK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1127,7 +1140,7 @@ fi # Check oskit version. NEEDED_OSKIT_VERSION=19991121 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1131: checking how to run the C preprocessor" >&5 +echo "configure:1144: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1142,13 +1155,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1159,13 +1172,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1176,13 +1189,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1208,13 +1221,13 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for oskit version >= ${NEEDED_OSKIT_VERSION}""... $ac_c" 1>&6 -echo "configure:1212: checking for oskit version >= ${NEEDED_OSKIT_VERSION}" >&5 +echo "configure:1225: checking for oskit version >= ${NEEDED_OSKIT_VERSION}" >&5 if eval "test \"`echo '$''{'gnumach_cv_oskit_version_${NEEDED_OSKIT_VERSION}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if _OSKIT_VERSION < ${NEEDED_OSKIT_VERSION} @@ -1222,7 +1235,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1247,7 +1260,7 @@ fi SMP_LIBS= if test $MAXCPUS -gt 1; then echo $ac_n "checking for smp_init in -loskit_smp""... $ac_c" 1>&6 -echo "configure:1251: checking for smp_init in -loskit_smp" >&5 +echo "configure:1264: checking for smp_init in -loskit_smp" >&5 ac_lib_var=`echo oskit_smp'_'smp_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1255,7 +1268,7 @@ else ac_save_LIBS="$LIBS" LIBS="-loskit_smp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1439,6 +1452,7 @@ s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g s%@systype@%$systype%g s%@cross_compiling@%$cross_compiling%g +s%@force_install@%$force_install%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g diff --git a/configure.in b/configure.in index 0e613e75..89a3b199 100644 --- a/configure.in +++ b/configure.in @@ -39,8 +39,14 @@ AC_PREFIX_DEFAULT() # # Options # +AC_ARG_ENABLE(force-install, +[ --enable-force-install force installation of files from this package, + even if they are older than the installed files], + force_install=$enableval, force_install=no) +AC_SUBST(force_install) + AC_ARG_ENABLE(smp, -[ --enable-smp=MAXCPUS enable SMP with up to MAXCPUS processors]) +[ --enable-smp=MAXCPUS enable SMP with up to MAXCPUS processors]) case "x${enable_smp-no}" in xno) MAXCPUS=1 ;; xyes) AC_MSG_WARN([defaulting to max 4 CPUs; use --enable-smp=MAXCPUS]) @@ -51,7 +57,7 @@ esac AC_DEFINE_UNQUOTED(NCPUS, $MAXCPUS) AC_ARG_ENABLE(fpe, -[ --enable-fpe enable FPU emulator for machines with no FPU], +[ --enable-fpe enable FPU emulator for machines with no FPU], [test "x$enableval" = xno || AC_DEFINE(FPE)]) # -- cgit v1.2.3