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 823593b5930ccaa0e4979da1213d0d6e90f2438c..914d1c23a3a669a12df62eda7634116810ff0f8b 100644 (file)
--- 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 b4ddcac2f55a38d7ab51a83ee0e653a899d8a77b..4c8dc4fd196dff47e1356e9a6a2ffa008ad8d843 100755 (executable)
--- 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"