httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org (Ralf S. Engelschall)
Subject cvs commit: apache-1.3 configure
Date Sat, 25 Jul 1998 10:52:53 GMT
rse         98/07/25 03:52:52

  Modified:    src      CHANGES
               .        configure
  Log:
  Make sure the `configure' scripts doesn't fail when trying to guess the
  domainname of the machine and there are multiple `domainname' and `search'
  entries in /etc/resolv.conf.
  
  PR: 2710
  
  Revision  Changes    Path
  1.982     +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.981
  retrieving revision 1.982
  diff -u -r1.981 -r1.982
  --- CHANGES	1998/07/25 08:13:14	1.981
  +++ CHANGES	1998/07/25 10:52:46	1.982
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.2
   
  +  *) Make sure the `configure' scripts doesn't fail when trying to guess the
  +     domainname of the machine and there are multiple `domainname' and
  +     `search' entries in /etc/resolv.conf.
  +     [Ralf S. Engelschall] PR#2710
  +
     *) Add note about the SHARED_CORE requirement on some platforms also to the
        INSTALL file because a lot of users don't read htdocs/manual/dso.html
        first. [Ralf S. Engelschall] PR#2701
  
  
  
  1.40      +2 -2      apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- configure	1998/07/12 09:25:46	1.39
  +++ configure	1998/07/25 10:52:50	1.40
  @@ -821,12 +821,12 @@
       hostname="`echo $hostname | sed -e 's/\..*//'`"
       domainname="";
       if [ -f /etc/resolv.conf ]; then
  -        domainname="`egrep '^[ 	]*domain' /etc/resolv.conf |\
  +        domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -1 |\
                        sed -e 's/.*domain//' -e 's/^[ 	]*//' \
                            -e 's/^ *//' -e 's/^	*//' \
                            -e 's/^\.//' -e 's/^/./'`"
           if [ ".$domainname" = . ]; then
  -            domainname="`egrep '^[ 	]*search' /etc/resolv.conf |\
  +            domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -1 |\
                            sed -e 's/.*search//' -e 's/^[ 	]*//' \
                                -e 's/^ *//' -e 's/^	*//' \
                                -e 's/ .*//' -e 's/^\.//' -e 's/^/./'`"
  
  
  

Mime
View raw message