Menu
▾
▴
[systemimager-commits] r3795 - in trunk: . autoconf
|
From: Andrea R. <ar...@sy...> - 2006-11-05 16:36:13
|
Author: arighi
Date: 2006-11-05 10:35:59 -0600 (Sun, 05 Nov 2006)
New Revision: 3795
Modified:
trunk/autoconf/configure.ac
trunk/configure
Log:
- added dependencies from rsync and mkcramfs binaries in the configure
- updated SystemImager release in the configure
Modified: trunk/autoconf/configure.ac
===================================================================
--- trunk/autoconf/configure.ac 2006-11-01 18:32:03 UTC (rev 3794)
+++ trunk/autoconf/configure.ac 2006-11-05 16:35:59 UTC (rev 3795)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(SystemImager, 3.5.2, sis...@li...)
+AC_INIT(SystemImager, 3.7.5, sis...@li...)
AC_CONFIG_AUX_DIR(autoconf)
#AC_CONFIG_SRCDIR([src/bc-1.06/acconfig.h])
#AC_CONFIG_HEADER([config.h])
@@ -15,13 +15,28 @@
AC_PROG_CPP
AC_PROG_LEX
case $LEX in
- :) SI_CHECK_FAIL(lex,flex,,You can't build many components without the flex parser);;
+ :) SI_CHECK_FAIL(lex,flex,,You cannot build many components without the flex parser);;
esac
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
#AC_PROG_RANLIB
+AC_PATH_PROG(RSYNC, rsync)
+if test -z "$RSYNC" ; then
+ SI_CHECK_FAIL(rsync,,,
+ [*** 'rsync' missing, please install or fix your PATH ***])
+fi
+
+AC_PATH_PROG(MKCRAMFS, mkcramfs)
+if test -z "$MKCRAMFS"; then
+ AC_PATH_PROG(MKCRAMFS, mkfs.cramfs)
+ if test -z "$MKCRAMFS"; then
+ SI_CHECK_FAIL(mkcramfs,,,
+ [*** 'mkcramfs' or 'mkfs.cramfs' not found, please install cramfs tools or fix your PATH ***])
+ fi
+fi
+
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lcrypt':
# AC_CHECK_LIB([crypt], [main])
Modified: trunk/configure
===================================================================
--- trunk/configure 2006-11-01 18:32:03 UTC (rev 3794)
+++ trunk/configure 2006-11-05 16:35:59 UTC (rev 3795)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SystemImager 3.5.2.
+# Generated by GNU Autoconf 2.59 for SystemImager 3.7.5.
#
# Report bugs to <sis...@li...>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='SystemImager'
PACKAGE_TARNAME='systemimager'
-PACKAGE_VERSION='3.5.2'
-PACKAGE_STRING='SystemImager 3.5.2'
+PACKAGE_VERSION='3.7.5'
+PACKAGE_STRING='SystemImager 3.7.5'
PACKAGE_BUGREPORT='sis...@li...'
# Factoring default headers for most tests.
@@ -310,7 +310,7 @@
# include <unistd.h>
#endif"
-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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC CPP LEX LEXLIB LEX_OUTPUT_ROOT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE gcc_exec gxx_exec GCC GXX python_exec PYTHON_PATH EGREP BUILD_LVM found_docbook2man BUILD_DOCS 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC CPP LEX LEXLIB LEX_OUTPUT_ROOT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RSYNC MKCRAMFS gcc_exec gxx_exec GCC GXX python_exec PYTHON_PATH EGREP BUILD_LVM found_docbook2man BUILD_DOCS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -787,7 +787,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures SystemImager 3.5.2 to adapt to many kinds of systems.
+\`configure' configures SystemImager 3.7.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -844,7 +844,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of SystemImager 3.5.2:";;
+ short | recursive ) echo "Configuration of SystemImager 3.7.5:";;
esac
cat <<\_ACEOF
@@ -964,7 +964,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-SystemImager configure 3.5.2
+SystemImager configure 3.7.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -978,7 +978,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by SystemImager $as_me 3.5.2, which was
+It was created by SystemImager $as_me 3.7.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -3221,8 +3221,8 @@
case $LEX in
:)
SI_MSG=`echo -e "- lex not found!\n"`
- if test "x" != "xYou can't build many components without the flex parser"; then
- SI_MSG=`echo -e "$SI_MSG\n- You can't build many components without the flex parser"`
+ if test "x" != "xYou cannot build many components without the flex parser"; then
+ SI_MSG=`echo -e "$SI_MSG\n- You cannot build many components without the flex parser"`
fi
if test "xflex" != "x"; then
SI_MSG=`echo -e "$SI_MSG\n- Try installing the flex package\n"`
@@ -3366,6 +3366,181 @@
#AC_PROG_RANLIB
+# Extract the first word of "rsync", so it can be a program name with args.
+set dummy rsync; 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_path_RSYNC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $RSYNC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RSYNC="$RSYNC" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_RSYNC="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+RSYNC=$ac_cv_path_RSYNC
+
+if test -n "$RSYNC"; then
+ echo "$as_me:$LINENO: result: $RSYNC" >&5
+echo "${ECHO_T}$RSYNC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z "$RSYNC" ; then
+
+ SI_MSG=`echo -e "- rsync not found!\n"`
+ if test "x" != "x*** 'rsync' missing, please install or fix your PATH ***"; then
+ SI_MSG=`echo -e "$SI_MSG\n- *** 'rsync' missing, please install or fix your PATH ***"`
+ fi
+ if test "x" != "x"; then
+ SI_MSG=`echo -e "$SI_MSG\n- Try installing the package\n"`
+ fi
+ if test "x" != "x"; then
+ SI_MSG=`echo -e "$SI_MSG\n- or get the latest software from \n"`
+ fi
+
+ { { echo "$as_me:$LINENO: error: !
+************************************************************
+$SI_MSG
+************************************************************
+" >&5
+echo "$as_me: error: !
+************************************************************
+$SI_MSG
+************************************************************
+" >&2;}
+ { (exit 1); exit 1; }; }
+
+
+fi
+
+# Extract the first word of "mkcramfs", so it can be a program name with args.
+set dummy mkcramfs; 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_path_MKCRAMFS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MKCRAMFS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MKCRAMFS="$MKCRAMFS" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MKCRAMFS="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+MKCRAMFS=$ac_cv_path_MKCRAMFS
+
+if test -n "$MKCRAMFS"; then
+ echo "$as_me:$LINENO: result: $MKCRAMFS" >&5
+echo "${ECHO_T}$MKCRAMFS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z "$MKCRAMFS"; then
+ # Extract the first word of "mkfs.cramfs", so it can be a program name with args.
+set dummy mkfs.cramfs; 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_path_MKCRAMFS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MKCRAMFS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MKCRAMFS="$MKCRAMFS" # 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MKCRAMFS="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+MKCRAMFS=$ac_cv_path_MKCRAMFS
+
+if test -n "$MKCRAMFS"; then
+ echo "$as_me:$LINENO: result: $MKCRAMFS" >&5
+echo "${ECHO_T}$MKCRAMFS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ if test -z "$MKCRAMFS"; then
+
+ SI_MSG=`echo -e "- mkcramfs not found!\n"`
+ if test "x" != "x*** 'mkcramfs' or 'mkfs.cramfs' not found, please install cramfs tools or fix your PATH ***"; then
+ SI_MSG=`echo -e "$SI_MSG\n- *** 'mkcramfs' or 'mkfs.cramfs' not found, please install cramfs tools or fix your PATH ***"`
+ fi
+ if test "x" != "x"; then
+ SI_MSG=`echo -e "$SI_MSG\n- Try installing the package\n"`
+ fi
+ if test "x" != "x"; then
+ SI_MSG=`echo -e "$SI_MSG\n- or get the latest software from \n"`
+ fi
+
+ { { echo "$as_me:$LINENO: error: !
+************************************************************
+$SI_MSG
+************************************************************
+" >&5
+echo "$as_me: error: !
+************************************************************
+$SI_MSG
+************************************************************
+" >&2;}
+ { (exit 1); exit 1; }; }
+
+
+ fi
+fi
+
# Checks for libraries.
# FIXME: Replace `main' with a function in `-lcrypt':
# AC_CHECK_LIB([crypt], [main])
@@ -4778,7 +4953,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by SystemImager $as_me 3.5.2, which was
+This file was extended by SystemImager $as_me 3.7.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4833,7 +5008,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-SystemImager config.status 3.5.2
+SystemImager config.status 3.7.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -5041,6 +5216,8 @@
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@LN_S@,$LN_S,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
+s,@RSYNC@,$RSYNC,;t t
+s,@MKCRAMFS@,$MKCRAMFS,;t t
s,@gcc_exec@,$gcc_exec,;t t
s,@gxx_exec@,$gxx_exec,;t t
s,@GCC@,$GCC,;t t
|