Build system improvements: (cross compilation, libnode, etc)

- utilizing autoconf configure.guess to output canonical $target_{cpu,vendor,os}
- normalizing $target_cpu --> $arch according to v8 naming scheme
- normalizing $target_os --> $platform according to v8 naming scheme
- renamed c-ares platform-arch directories to represent v8 canonical names
- new targets in Makefile: libnode-{static,dynamic}[-debug]
- scons is symbolized as SCONS in Makefile for portability/flexibility.
- LINKFLAGS inherith from LDFLAGS ("magic" variable exported by autoconf and configure).
- When building on OS X, CFLAGS and LDFLAGS will contain appropriate -arch flag, set up by configure (instead of the Makefile).
- libv8.a make targets cleaned up with unison libv8_flags set of flags.
- the clean make target now cleans up libraries (libv8, libnode, etc).
- added config.guess, config.sub and install-sh (utilized by autoconf/configure)

Makefile

@@ -6,25 +6,19 @@ WANT_OPENSSL=1
 PREFIX=/usr
 SHELL=/bin/sh
 INSTALL = install
-
+SCONS = python tools/scons/scons.py
+LINKFLAGS += $(LDFLAGS)
 
 -include config.mak.autogen
 -include config.mak
 
+# -----------------------------------------------------------------------------
 
-platform := $(shell python -c 'import sys; print sys.platform')
-
-
-ifeq ($(platform),linux2)
-	platform := linux
-endif
-
-# fix me
-arch = x86_64
-
+dylib_suffix = so
 
 ifeq ($(platform),darwin)
 	LINKFLAGS += -framework Carbon
+	dylib_suffix = dylib
 endif
 
 ifeq ($(platform),linux)
@@ -41,18 +35,22 @@ ifdef WANT_OPENSSL
 	OPENSSL_LINKFLAGS += -lssl -lcrypto
 endif
 
+ifneq (,$(findstring build/libnode.so,$(MAKEFLAGS)))
+	CFLAGS += -shared -fPIC
+#else
+#	CFLAGS += $(MAKEFLAGS)
+endif
+
 cflags += -pedantic
 
 
-
-
 debug_CPPDEFINES = -DDEBUG $(CFLAGS)
 debug_CFLAGS = -Wall -O0 -ggdb $(CFLAGS)
 debug_CXXFLAGS = $(debug_CFLAGS)
 debug_LINKFLAGS = $(LINKFLAGS)
 
-release_CPPDEFINES = -DNODEBUG
-release_CFLAGS = -Wall -O2
+release_CPPDEFINES = -DNODEBUG $(CFLAGS)
+release_CFLAGS = -Wall -O2 $(CFLAGS)
 release_CXXFLAGS = $(release_CFLAGS)
 release_LINKFLAGS = $(LINKFLAGS)
 
@@ -96,7 +94,6 @@ node_sources = src/node.cc \
 	src/node_http_parser.cc \
 	src/node_idle_watcher.cc \
 	src/node_io_watcher.cc \
-	src/node_main.cc \
 	src/node_net.cc \
 	src/node_script.cc \
 	src/node_signal_watcher.cc \
@@ -108,6 +105,13 @@ node_sources = src/node.cc \
 node_debug_objects = $(addprefix $(builddir)/debug/,$(node_sources:.cc=.o))
 node_release_objects = $(addprefix $(builddir)/release/,$(node_sources:.cc=.o))
 
+node_exe_sources = src/node_main.cc
+
+node_exe_debug_objects = \
+    $(addprefix $(builddir)/debug/,$(node_exe_sources:.cc=.o))
+node_exe_release_objects = \
+    $(addprefix $(builddir)/release/,$(node_exe_sources:.cc=.o))
+
 # TODO HAVE_FDATASYNC should be set in configure.
 
 node_CPPFLAGS = -Isrc/ -Ideps/libeio/ -Ideps/libev/ -Ideps/http_parser/ \
@@ -215,21 +219,50 @@ $(builddir)/debug/src/node_javascript.o: src/node_javascript.cc $(builddir)/debu
 	$(CXX) -c $(debug_CXXFLAGS) $(debug_CPPFLAGS) $(node_CFLAGS) \
 		$(node_CPPFLAGS) $(OPENSSL_CPPFLAGS) $< -o $@
 
+# -----------------------------------------------------------------------------
+# end products
+
+endproduct_release_objects = $(node_release_objects) \
+		$(libev_release_objects) $(libeio_release_objects) \
+		$(http_parser_release_objects) $(cares_release_objects) $(libv8)
+
+endproduct_debug_objects = $(node_debug_objects) \
+		$(libev_debug_objects) $(libeio_debug_objects) \
+		$(http_parser_debug_objects) $(cares_debug_objects) $(libv8_g)
+
+endproduct_release_linkflags = $(release_LINKFLAGS) $(node_LINKFLAGS) \
+		$(OPENSSL_LINKFLAGS)
+
+endproduct_debug_linkflags = $(debug_LINKFLAGS) $(node_LINKFLAGS) \
+		$(OPENSSL_LINKFLAGS)
+
+
 
 # node executable
+$(builddir)/node: $(node_exe_release_objects) $(endproduct_release_objects)
+	$(CXX) -o $@ $^ $(endproduct_release_linkflags)
 
-$(builddir)/node: $(node_release_objects) $(libev_release_objects) \
-		$(libeio_release_objects) $(http_parser_release_objects) \
-		$(cares_release_objects) $(libv8)
-	$(CXX) -o $@ $^ $(release_LINKFLAGS) $(node_LINKFLAGS) $(OPENSSL_LINKFLAGS)
+$(builddir)/node_g: $(node_exe_debug_objects) $(endproduct_debug_objects)
+	$(CXX) -o $@ $^ $(endproduct_debug_linkflags)
 
-$(builddir)/node_g: $(node_debug_objects) $(libev_debug_objects) \
-		$(libeio_debug_objects) $(http_parser_debug_objects) \
-		$(cares_debug_objects) $(libv8_g)
-	$(CXX) -o $@ $^ $(debug_LINKFLAGS) $(node_LINKFLAGS) $(OPENSSL_LINKFLAGS)
+# node static library
+$(builddir)/libnode.a: $(endproduct_release_objects)
+	ar -rcs $@ $^
 
+$(builddir)/libnode_g.a: $(endproduct_debug_objects)
+	ar -rcs $@ $^
 
+# node dynamic library
+# WIP -- currently disabled
+#$(builddir)/libnode.$(dylib_suffix): CFLAGS += -shared -fPIC
+#$(builddir)/libnode.$(dylib_suffix): $(endproduct_release_objects)
+#	$(CXX) -o $@ $^ $(endproduct_release_linkflags)
+#
+#$(builddir)/libnode_g.$(dylib_suffix): CFLAGS += -shared -fPIC
+#$(builddir)/libnode_g.$(dylib_suffix): $(endproduct_debug_objects)
+#	$(CXX) -o $@ $^ $(endproduct_debug_linkflags)
 
+# built-in javascript (the "node standard library")
 $(builddir)/release/src/node_natives.h: src/node.js lib/*.js
 	python tools/js2c.py $^ > $@
 
@@ -260,13 +293,16 @@ $(builddir)/release/lib/pkgconfig/nodejs.pc: tools/nodejs.pc.in
 
 # v8 does its own debug and release version, so we don't put it in the
 # profile_builddir but rather just the builddir.
+libv8_flags = --directory="$(builddir)" --srcdir="`pwd`/deps/v8" \
+		visibility=default arch=$(arch) library=static
+# TODO: if env[SNAPSHOT_V8]; then
+libv8_flags += snapshot=on
+#fi
 $(libv8):
-	python tools/scons/scons.py -C $(builddir) -Y `pwd`/deps/v8 \
-		visibility=default mode=release arch=x64 library=static snapshot=on
+	$(SCONS) $(libv8_flags) mode=release
 
 $(libv8_g):
-	python tools/scons/scons.py -C $(builddir) -Y `pwd`/deps/v8 \
-		visibility=default mode=debug arch=x64 library=static snapshot=on
+	$(SCONS) $(libv8_flags) mode=debug
 
 
 # header deps
@@ -284,6 +320,18 @@ install: all doc
 	$(INSTALL) tools/wafadmin/Tools/*.py '$(PREFIX)/lib/node/wafadmin/Tools'
 	$(INSTALL) doc/node.1 '$(PREFIX)/share/man/man1/'
 
+libnode-static: $(builddir)/libnode.a
+	ln -fs $< $@
+
+libnode-static-debug: $(builddir)/libnode_g.a
+	ln -fs $< $@
+
+libnode-dynamic: $(builddir)/libnode.$(dylib_suffix)
+	ln -fs $< $@
+
+libnode-dynamic-debug: $(builddir)/libnode_g.$(dylib_suffix)
+	ln -fs $< $@
+
 
 
 test: $(builddir)/node
@@ -315,12 +363,14 @@ test-internet: $(builddir)/node
 doc: doc/node.1 doc/api.html doc/index.html doc/changelog.html
 
 ## HACK to give the ronn-generated page a TOC
-doc/api.html: $(builddir)/node  doc/api.markdown doc/api_header.html doc/api_footer.html
+doc/api.html: $(builddir)/node  doc/api.markdown doc/api_header.html \
+		doc/api_footer.html
 	build/node tools/ronnjs/bin/ronn.js --fragment doc/api.markdown \
 	| sed "s/<h2>\(.*\)<\/h2>/<h2 id=\"\1\">\1<\/h2>/g" \
 	| cat doc/api_header.html - doc/api_footer.html > doc/api.html
 
-doc/changelog.html: ChangeLog doc/changelog_header.html doc/changelog_footer.html
+doc/changelog.html: ChangeLog doc/changelog_header.html \
+		doc/changelog_footer.html
 	cat doc/changelog_header.html ChangeLog doc/changelog_footer.html > doc/changelog.html
 
 doc/node.1: $(builddir)/node doc/api.markdown all
@@ -334,7 +384,8 @@ docclean:
 
 clean:
 	-rm -f node node_g $(builddir)/node $(builddir)/node_g
-	-find $(builddir) -name "*.o" | xargs rm -f
+	-find $(builddir) -name "*.o" -or -name "*.a" \
+			-or -name "*.so" -or -name "*.dylib" | xargs rm -f
 	-find . -name "*.pyc" | xargs rm -f
 
 distclean: docclean
@@ -365,4 +416,10 @@ bench-idle:
 	./node benchmark/idle_clients.js &
 
 
-.PHONY: bench clean docclean dist distclean check uninstall install all test test-all website-upload
+.PHONY: all \
+  test test-all \
+  bench \
+  install uninstall \
+  dist distclean \
+  website-upload \
+  clean docclean

config.mak.in

@@ -13,6 +13,11 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 datarootdir = @datarootdir@
 PREFIX = @prefix@
+target_cpu = @target_cpu@
+target_vendor = @target_vendor@
+target_os = @target_os@
+arch = @arch@
+platform = @platform@
 
 mandir=@mandir@
 
@@ -24,4 +29,4 @@ export srcdir VPATH PREFIX
 
 
 
-HAVE_OPENSSL=@HAVE_OPENSSL@
+HAVE_OPENSSL=@HAVE_OPENSSL@

configure.ac

@@ -2,10 +2,14 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([node], [0.3.0-pre], [ryan@joyent.com])
+AC_INIT([node], [0.3.0], [ryan@joyent.com])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/node.cc])
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_TARGET
+
 config_file=config.mak.autogen
 config_append=config.mak.append
 config_in=config.mak.in
@@ -39,16 +43,81 @@ echo "# ${config_append}.  Generated by configure." > "${config_append}"
 #  --shared-libev-libpath=SHARED_LIBEV_LIBPATH
 #                        A directory to search for the shared libev DLL
 
+# ------------------------------------------------------------------------------
+# Checks
+
+# $arch (only those we support, i.e. lowest common denominator)
+# Customize by e.g: ./configure --target=i386-apple-darwin
+AC_MSG_CHECKING([target architecture identifier])
+case "$target_cpu" in
+  x64|x86_64|ia64)            arch=x64 ;;
+  ia32|i386|i486|i586|i686)   arch=ia32 ;;
+  arm|armeb)                  arch=arm ;;
+  *) AC_MSG_ERROR([Unsupported target architecture: $target_cpu]) ;;
+esac
+AC_SUBST(arch,[${arch}])
+AC_MSG_RESULT([$arch])
+
+# CFLAGS += -m{32,64}
+if ( echo "$build_cpu" | egrep -q 'x64|x86_64|ia64' ); then
+	if test "$arch" = "ia32"; then CFLAGS="${CFLAGS} -m32"; fi
+else
+	if test "$arch" = "x64"; then CFLAGS="${CFLAGS} -m64" ;fi
+fi
+
+# $platform (only those we support, i.e. [[ -d deps/c-ares/${platform}-* ]])
+AC_MSG_CHECKING([target platform identifier])
+if test "$target_os" = "none"; then target_os="$build_os"; fi
+case "$target_os" in
+  #android*)         platform=android ;;
+  cygwin*)          platform=cygwin ;;
+  darwin*)          platform=darwin ;;
+  freebsd*)         platform=freebsd ;;
+  linux*)           platform=linux ;;
+  openbsd*)         platform=openbsd ;;
+  *solaris*|sunos*) platform=solaris ;;
+  #win32*)           platform=win32 ;;
+  *) AC_MSG_ERROR([Unsupported target platform: $target_os]) ;;
+esac
+AC_SUBST(platform,[${platform}])
+AC_MSG_RESULT([$platform])
+
+# Darwin cross-compilation target -arch flag
+if test "$platform" = "darwin"; then
+	CFLAGS="${CFLAGS} -arch ${target_cpu}";
+	LDFLAGS="${LDFLAGS} -arch ${target_cpu}"
+fi
+
+# Checks for programs.
 AC_CHECK_PROGS(TAR, [gtar tar])
 AC_CHECK_TOOLS(AR, [gar ar], :)
+AC_PROG_MKDIR_P
+AC_PROG_LN_S
+AC_PROG_INSTALL
 
+# Checks for header files
+AC_HEADER_STDC
 
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_C_CHAR_UNSIGNED
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
 
-# TODO: OpenSSL
+# Checks for library functions.
+AC_FUNC_FORK
+AC_FUNC_STAT
+AC_SEARCH_LIBS([dlopen], [dl dld], [], [
+  AC_MSG_ERROR([Unable to find the dlopen() function])
+])
+
+# TODO FIXME: Check for OpenSSL -- expect it to exist for now
 AC_SUBST([HAVE_OPENSSL],[1])
 
-
-
+# ------------------------------------------------------------------------------
+# Embedded dependencies
 
 m4_include([deps/libev/libev.m4])
 m4_include([deps/libeio/libeio.m4])
@@ -58,7 +127,6 @@ AC_CONFIG_HEADERS([build/deps/libeio/config.h:deps/libeio/config.h.in])
 
 AC_CONFIG_FILES(["${config_file}":"${config_in}"])
 
-
 mkdir -p build/debug/src                build/release/src 
 mkdir -p build/debug/deps/libev         build/release/deps/libev 
 mkdir -p build/debug/deps/libeio        build/release/deps/libeio
@@ -67,10 +135,10 @@ mkdir -p build/debug/deps/http_parser   build/release/deps/http_parser
 mkdir -p build/debug/deps/v8            build/release/deps/v8
 mkdir -p build/debug/lib/pkgconfig      build/release/lib/pkgconfig
 
-
-## Output files
+# ------------------------------------------------------------------------------
+# Output files
 AC_OUTPUT
 
-
-## Cleanup
+# ------------------------------------------------------------------------------
+# Cleanup
 rm -f "${config_append}"

install-sh

@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End: