[Olsr-cvs] olsrd-current CHANGELOG, 1.81, 1.82 Makefile.inc, 1.28, 1.29 gcc-warnings, 1.2, 1.3

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11624

Modified Files:
	CHANGELOG Makefile.inc gcc-warnings 
Log Message:
* use /bin/sh instead of /bin/bash - patch by John Hay, slightly modified by me

Index: gcc-warnings
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/gcc-warnings,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gcc-warnings	27 Jun 2007 20:20:57 -0000	1.2
--- gcc-warnings	7 Sep 2007 09:07:25 -0000	1.3
***************
*** 1,3 ****
! #!/bin/bash --norc
  #
  # We expect warning options for gcc as argumenst and return the ones which are accepted
--- 1,3 ----
! #!/bin/sh
  #
  # We expect warning options for gcc as argumenst and return the ones which are accepted
***************
*** 17,32 ****
  done
  
! while read error; do 
!     case "$error" in
!     *error:\ unrecognized\ option*) opt="${error#*\`}"
!                                     opt="${opt%\'*}"
!                                     OPTS="${OPTS//$opt/}"
!                                     ;;
!     esac
! done < <($CC $OPTS -E - 2>&1 >/dev/null <<EOF
!     int main(void) {
!         return 0;
!     }
!     EOF)
! echo $OPTS
  exit 0
--- 17,44 ----
  done
  
! testcompile() {
!     $CC $OPTS -E - 2>&1 <<- EOF
!        int main(void) {
!            return 0;
!        }
! EOF
! }
! 
! parsetest() {
!     while read error; do 
!        case "$error" in
!        *error:\ unrecognized\ *option*)
!                                        opt="${error#*\`}"
!                                        opt="${opt%\'*}"
!                                        opt="${error#*\"}"
!                                        opt="${opt%\"*}"
!                                        OPTS=`echo $OPTS | sed -e s/$opt//g`
!                                        ;;
!        esac
!     done
!     echo $OPTS
! }
! 
! testcompile | parsetest
! 
  exit 0

Index: Makefile.inc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/Makefile.inc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile.inc	29 Aug 2007 21:46:25 -0000	1.28
--- Makefile.inc	7 Sep 2007 09:07:25 -0000	1.29
***************
*** 1,4 ****
  # programs
! CCACHE ?=       $(shell bash -c "type -path ccache")
  ifeq ($(origin CC),default)
  CC = 		$(CCACHE) gcc
--- 1,4 ----
  # programs
! CCACHE ?=       $(shell which ccache 2> /dev/null)
  ifeq ($(origin CC),default)
  CC = 		$(CCACHE) gcc

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/CHANGELOG,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** CHANGELOG	7 Sep 2007 08:53:48 -0000	1.81
--- CHANGELOG	7 Sep 2007 09:07:25 -0000	1.82
***************
*** 126,131 ****
    data.
  
! PATCH by John Hay <(spam-protected)>
  - update to new FreeBSD WLAN API
  
  - paving the way to activate -Wshadow, much more to do
--- 126,132 ----
    data.
  
! PATCHES by John Hay <(spam-protected)>
  - update to new FreeBSD WLAN API
+ - do not require /bin/bash, use /bin/sh
  
  - paving the way to activate -Wshadow, much more to do