--- embedaddon/smartmontools/configure.ac 2013/07/22 01:17:35 1.1.1.1 +++ embedaddon/smartmontools/configure.ac 2013/10/14 07:54:03 1.1.1.2 @@ -1,15 +1,15 @@ # -# $Id: configure.ac,v 1.1.1.1 2013/07/22 01:17:35 misho Exp $ +# $Id: configure.ac,v 1.1.1.2 2013/10/14 07:54:03 misho Exp $ # dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(smartmontools, 6.1, smartmontools-support@lists.sourceforge.net) +AC_INIT(smartmontools, 6.2, smartmontools-support@lists.sourceforge.net) AC_CONFIG_SRCDIR(smartctl.cpp) smartmontools_configure_date=`date -u +'%Y-%m-%d %T %Z'` -smartmontools_cvs_tag=`echo '$Id: configure.ac,v 1.1.1.1 2013/07/22 01:17:35 misho Exp $'` -smartmontools_release_date=2013-03-16 -smartmontools_release_time="14:35:27 UTC" +smartmontools_cvs_tag=`echo '$Id: configure.ac,v 1.1.1.2 2013/10/14 07:54:03 misho Exp $'` +smartmontools_release_date=2013-07-26 +smartmontools_release_time="17:38:20 UTC" AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args", [smartmontools Configure Arguments]) AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_DATE, "$smartmontools_configure_date", [smartmontools Configure Date]) @@ -67,13 +67,17 @@ esac AC_MSG_CHECKING([whether this is a build from SVN]) is_svn_build=no svn_deps= -if test -f "$srcdir/.svn/entries"; then +if test -f "$srcdir/.svn/wc.db"; then + # SVN 1.7, 1.8 working copy + svn_deps='${srcdir}/.svn/wc.db' +elif test -f "${srcdir}/.svn/entries"; then + # SVN <= 1.6 working copy (SVN 1.7 has empty entries file) + svn_deps='${srcdir}/.svn/entries' +fi +if test -n "$svn_deps"; then is_svn_build=unknown if (cd "$srcdir" && svn --version && svnversion && svn info) >/dev/null 2>&1; then is_svn_build=yes - svn_deps='${srcdir}/.svn/entries' - # SVN 1.7 working copy? - test -f "$srcdir/.svn/wc.db" && svn_deps='${srcdir}/.svn/wc.db' fi fi AC_SUBST([svn_deps]) @@ -336,6 +340,9 @@ AC_SUBST(smartmontools_release_time) os_libs= os_dltools='curl wget lynx' os_mailer=mail +os_hostname="'hostname'" +os_dnsdomainname= +os_nisdomainname="'domainname'" os_darwin=no os_solaris=no os_win32=no @@ -345,6 +352,8 @@ os_man_filter= case "${host}" in *-*-linux*) os_deps='os_linux.o cciss.o dev_areca.o' + os_dnsdomainname="'dnsdomainname' 'hostname -d'" + os_nisdomainname="'nisdomainname' 'hostname -y' 'domainname'" os_man_filter=Linux ;; *-*-freebsd*|*-*-dragonfly*|*-*-kfreebsd*-gnu*) @@ -379,6 +388,9 @@ case "${host}" in ;; *-*-cygwin*) os_deps='os_win32.o dev_areca.o' + os_hostname="'hostname' 'echo "'"${HOSTNAME?unset}"'"'" + os_dnsdomainname="'dnsdomainname' 'hostname -d' 'echo "'"${USERDNSDOMAIN?unset}"'"'" + os_nisdomainname= os_win32=yes os_man_filter=Cygwin ;; @@ -428,6 +440,9 @@ AC_SUBST([os_deps]) AC_SUBST([os_libs]) AC_SUBST([os_dltools]) AC_SUBST([os_mailer]) +AC_SUBST([os_hostname]) +AC_SUBST([os_dnsdomainname]) +AC_SUBST([os_nisdomainname]) AC_SUBST([os_man_filter]) # Create drivedb.h update branch name from version: 5.41[.X] -> RELEASE_5_41_DRIVEDB @@ -533,6 +548,7 @@ case "$host_os" in fi echo "local drive database: `eval eval eval echo $sysconfdir`/smart_drivedb.h" >&AS_MESSAGE_FD echo "smartd config file: `eval eval eval echo $sysconfdir`/smartd.conf${smartd_suffix}" >&AS_MESSAGE_FD + echo "smartd warning script: `eval eval eval echo $sysconfdir`/smartd_warning.sh" >&AS_MESSAGE_FD if test -n "$initddir"; then echo "smartd initd script: `eval eval eval echo $initddir`/smartd${smartd_suffix}" >&AS_MESSAGE_FD elif test -z "$systemdsystemunitdir"; then