]> err.no Git - systemd/commitdiff
build-sys: make less noise when checking file
authorLucas De Marchi <lucas.demarchi@profusion.mobi>
Wed, 26 Jan 2011 20:10:18 +0000 (18:10 -0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 8 Feb 2011 11:44:35 +0000 (12:44 +0100)
There's already a condition that gives a warning if user is
cross-compiling an relying on files from the build system. AC_CHECK_FILE
macro only tests for file in the build system. Hence use a simple
'test -f' that does the same job, without the warning.

configure.ac

index 08f36469a9a16f28c38607d0f09c02c4ac2e296d..c34305cf31c4b55b5eab8c90f1fa2fba7be31e77 100644 (file)
@@ -274,16 +274,16 @@ if test "z$with_distro" = "z"; then
         if test "$cross_compiling" = yes; then
                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
         else
-                AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
-                AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-                AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
+                test -f "/etc/redhat-release" && with_distro="fedora"
+                test -f "/etc/SuSE-release" && with_distro="suse"
+                test -f "/etc/debian_version" &&  with_distro="debian"
+                test -f "/etc/arch-release" && with_distro="arch"
+                test -f "/etc/gentoo-release" && with_distro="gentoo"
+                test -f "/etc/slackware-version" && with_distro="slackware"
+                test -f "/etc/frugalware-release" && with_distro="frugalware"
                 if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then
                         with_distro="ubuntu"
                 fi
-                AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
-                AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
-                AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
-                AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
         fi
         if test "z$with_distro" = "z"; then
                 with_distro=`uname -s`