update after backport

[apache] / build / fastgen.sh

diff --git a/build/fastgen.sh b/build/fastgen.sh
index eb9d83e6f74dfb1acaa605d1e5fea7c3408d2a52..7b089577276035a5912a1732b44ae18f038c130b 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -1,59 +1,22 @@
 #! /bin/sh
-# ====================================================================
-# The Apache Software License, Version 1.1
 #
-# Copyright (c) 2000 The Apache Software Foundation.  All rights
-# reserved.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-#    if any, must include the following acknowledgment:
-#       "This product includes software developed by the
-#        Apache Software Foundation (http://www.apache.org/)."
-#    Alternately, this acknowledgment may appear in the software itself,
-#    if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-#    not be used to endorse or promote products derived from this
-#    software without prior written permission. For written
-#    permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-#    nor may "Apache" appear in their name, without prior written
-#    permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation.  For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
 #
 # The build environment was provided by Sascha Schumann.
-#
 
 srcdir=$1
 shift
@@ -70,7 +33,7 @@ top_builddir=`pwd`
 if test "$mkdir_p" = "yes"; then
   mkdir_p="mkdir -p"
 else
-  mkdir_p="$top_srcdir/helpers/mkdir.sh"
+  mkdir_p="$top_srcdir/build/mkdir.sh"
 fi
 
 if test "$bsd_makefile" = "yes"; then
@@ -79,34 +42,52 @@ if test "$bsd_makefile" = "yes"; then
   for makefile in $@; do
     echo "creating $makefile"
     dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
 
-    cat - $top_srcdir/$makefile.in <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile 
+    if test -z "$dir"; then
+        real_srcdir=$top_srcdir
+        real_builddir=$top_builddir
+        dir="."
+    else
+        $mkdir_p "$dir/"
+        real_srcdir=$top_srcdir/$dir
+        real_builddir=$top_builddir/$dir
+    fi
+    cat - $top_srcdir/$makefile.in <<EOF      | \
+       sed 's/^include \(.*\)/.include "\1"/' | \
+       sed 's/^ifdef \(.*\)/.ifdef \1/'       | \
+       sed 's/^else\(.*\)/.else\1/'           | \
+       sed 's/^endif\(.*\)/.endif\1/' >$makefile 
 top_srcdir   = $top_srcdir
 top_builddir = $top_builddir
-srcdir       = $top_srcdir/$dir
-builddir     = $top_builddir/$dir
-VPATH        = $top_srcdir/$dir
+srcdir       = $real_srcdir
+builddir     = $real_builddir
+VPATH        = $real_srcdir
 EOF
     
-    test -z "$dir" && dir="."
     touch $dir/.deps
   done
 else  
   for makefile in $@; do
     echo "creating $makefile"
     dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
 
+    if test -z "$dir"; then
+        real_srcdir=$top_srcdir
+        real_builddir=$top_builddir
+        dir="."
+    else
+        $mkdir_p "$dir/"
+        real_srcdir=$top_srcdir/$dir
+        real_builddir=$top_builddir/$dir
+    fi
     cat - $top_srcdir/$makefile.in <<EOF >$makefile
 top_srcdir   = $top_srcdir
 top_builddir = $top_builddir
-srcdir       = $top_srcdir/$dir
-builddir     = $top_builddir/$dir
-VPATH        = $top_srcdir/$dir
+srcdir       = $real_srcdir
+builddir     = $real_builddir
+VPATH        = $real_srcdir
 EOF
-  
-    test -z "$dir" && dir="."
+
     touch $dir/.deps
   done
 fi