diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules.in | 10 | ||||
| -rwxr-xr-x | configure | 120 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 138 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2006-03-15 Thomas Schwinge <tschwinge@gnu.org + + * configure.in: Check for strip and gzip. + * configure: Regenerated. + * Makerules.in (GZIP, STRIP): New variables. + (%.gz, %.stripped): New targets. + 2006-03-04 Roland McGrath <roland@frob.com> * Makefile.in (DEFS): Substitute once and use the variable elsewhere. diff --git a/Makerules.in b/Makerules.in index 376b91e..60181ae 100644 --- a/Makerules.in +++ b/Makerules.in @@ -25,11 +25,13 @@ AR = @AR@ AWK = @AWK@ CC = @CC@ CPP = @CPP@ +GZIP = @GZIP@ LD = @LD@ MBCHK = @MBCHK@ MIG = @MIG@ NM = @NM@ RANLIB = @RANLIB@ +STRIP = @STRIP@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -99,6 +101,14 @@ ASFLAGS += -DASSEMBLER $(MIG) $(MIGFLAGS) -sheader $*_interface.h -server $*_server.c \ -header /dev/null -user /dev/null $< +# gzip files +%.gz: % + $(GZIP) -9 < $< > $@ + +# strip files +%.stripped: % + $(STRIP) -o $@ $< + # # Dependency generation # @@ -277,7 +277,7 @@ ac_unique_file="kern/ipc_kobject.c" ac_default_prefix= ac_subdirs_all="$ac_subdirs_all linux" ac_subdirs_all="$ac_subdirs_all i386" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os systype INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB AR ac_ct_AR LD ac_ct_LD NM ac_ct_NM MIG ac_ct_MIG MBCHK subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os systype INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB AR ac_ct_AR LD ac_ct_LD NM ac_ct_NM STRIP ac_ct_STRIP MIG ac_ct_MIG GZIP MBCHK subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3001,6 +3001,85 @@ else NM="$ac_cv_prog_NM" fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + STRIP=$ac_ct_STRIP +else + STRIP="$ac_cv_prog_STRIP" +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. @@ -3083,6 +3162,42 @@ else fi +# Extract the first word of "gzip", so it can be a program name with args. +set dummy gzip; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_GZIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GZIP"; then + ac_cv_prog_GZIP="$GZIP" # Let the user override the test. +else +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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GZIP="gzip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_GZIP" && ac_cv_prog_GZIP="false" +fi +fi +GZIP=$ac_cv_prog_GZIP +if test -n "$GZIP"; then + echo "$as_me:$LINENO: result: $GZIP" >&5 +echo "${ECHO_T}$GZIP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Extract the first word of "mbchk", so it can be a program name with args. set dummy mbchk; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3815,8 +3930,11 @@ s,@LD@,$LD,;t t s,@ac_ct_LD@,$ac_ct_LD,;t t s,@NM@,$NM,;t t s,@ac_ct_NM@,$ac_ct_NM,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@MIG@,$MIG,;t t s,@ac_ct_MIG@,$ac_ct_MIG,;t t +s,@GZIP@,$GZIP,;t t s,@MBCHK@,$MBCHK,;t t s,@subdirs@,$subdirs,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/configure.in b/configure.in index 2f631e2..0a0baeb 100644 --- a/configure.in +++ b/configure.in @@ -58,9 +58,11 @@ AC_PROG_RANLIB AC_CHECK_TOOL([AR], [ar]) AC_CHECK_TOOL([LD], [ld]) AC_CHECK_TOOL([NM], [nm]) +AC_CHECK_TOOL([STRIP], [strip]) AC_CHECK_TOOL([MIG], [mig], [mig]) +AC_CHECK_PROG([GZIP], [gzip], [gzip], false) AC_CHECK_PROG([MBCHK], [mbchk], [mbchk], :) # Set up `machine' and `mach/machine' links in the build directory for easier |