From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 10 Oct 2008 18:36:53 +0000 (+0000)
Subject: Remove unwanted /etc/apt... in configure.in
X-Git-Tag: Release-7.0.0~3993
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=57c4551f71bb683033467afb38f8f08693ea597d;p=bacula%2Fbacula

Remove unwanted /etc/apt... in configure.in

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7748 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 823593b593..914d1c23a3 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2067,9 +2067,6 @@ freebsd)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`uname -a |awk '{print $3}'`
 	VER=`echo $DISTVER | cut -c 1`
 	if test x$VER = x4 ; then
@@ -2134,9 +2131,6 @@ redhat)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	if test -f /etc/whitebox-release ; then
 	   f=/etc/whitebox-release
 	else
@@ -2166,9 +2160,6 @@ mandrake)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/mandrake-release | grep release |\
 	   cut -f 5 -d ' '`
 	TAPEDRIVE="/dev/nst0"
@@ -2187,9 +2178,6 @@ gentoo)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release`
 	TAPEDRIVE="/dev/nst0"
 	PSCMD="ps -e -o pid,command"
@@ -2206,9 +2194,6 @@ slackware)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/slackware-version`
 	TAPEDRIVE="/dev/nst0"
 	PSCMD="ps -e -o pid,command"
@@ -2239,9 +2224,6 @@ suse)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/SuSE-release |grep VERSION|\
 	    cut -f 3 -d ' '`
 	TAPEDRIVE="/dev/nst0"
@@ -2260,9 +2242,6 @@ suse5)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTNAME=suse
 	DISTVER=5.x
 	TAPEDRIVE="/dev/nst0"
diff --git a/bacula/configure b/bacula/configure
index b4ddcac2f5..4c8dc4fd19 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -30385,9 +30385,6 @@ freebsd)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`uname -a |awk '{print $3}'`
 	VER=`echo $DISTVER | cut -c 1`
 	if test x$VER = x4 ; then
@@ -30455,9 +30452,6 @@ redhat)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	if test -f /etc/whitebox-release ; then
 	   f=/etc/whitebox-release
 	else
@@ -30487,9 +30481,6 @@ mandrake)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/mandrake-release | grep release |\
 	   cut -f 5 -d ' '`
 	TAPEDRIVE="/dev/nst0"
@@ -30508,9 +30499,6 @@ gentoo)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release`
 	TAPEDRIVE="/dev/nst0"
 	PSCMD="ps -e -o pid,command"
@@ -30527,9 +30515,6 @@ slackware)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/slackware-version`
 	TAPEDRIVE="/dev/nst0"
 	PSCMD="ps -e -o pid,command"
@@ -30563,9 +30548,6 @@ suse)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTVER=`cat /etc/SuSE-release |grep VERSION|\
 	    cut -f 3 -d ' '`
 	TAPEDRIVE="/dev/nst0"
@@ -30584,9 +30566,6 @@ suse5)
 	if test ! $? = 0; then
 	   hostname="localhost"
 	fi
-	if `grep -q ubuntu /etc/apt/sources.list`; then
-	   DISTNAME="ubuntu"
-	fi
 	DISTNAME=suse
 	DISTVER=5.x
 	TAPEDRIVE="/dev/nst0"