Commit 7bb03240 authored by Leigh B Stoller's avatar Leigh B Stoller

Checkpoint clientside branch.

parent 54d318a8
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
SRCDIR = @srcdir@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@ OBJDIR = @top_builddir@
SUBDIR = clientside SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = event SUBDIRS = lib event
all: all-subdirs all: all-subdirs
...@@ -19,13 +19,8 @@ include $(TESTBED_SRCDIR)/GNUmakerules ...@@ -19,13 +19,8 @@ include $(TESTBED_SRCDIR)/GNUmakerules
client: client-subdirs client: client-subdirs
client-install: client client-install-subdirs client-install: client client-install-subdirs
control-install: control-install-subdirs
control-install: post-install: post-install-subdirs
@$(MAKE) -C event control-install
post-install:
@$(MAKE) -C event post-install
clean: clean-subdirs clean: clean-subdirs
distclean: distclean-subdirs distclean: distclean-subdirs
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# Get rid of a bunch of nasty built-in implicit rules, # Get rid of a bunch of nasty built-in implicit rules,
...@@ -118,24 +118,3 @@ check: $(TESTS) ...@@ -118,24 +118,3 @@ check: $(TESTS)
done done
endif endif
ifeq ($(MERGE_BUILD),1)
.PRECIOUS: ${SRCDIR}/*
#
# I really want to say something like:
# ${TESTBED_SRCDIR}/.merged: $(wildcard ${OBJDIR}/${MERGE_BUILD_SANDBOX}/${SUBDIR}/*)
# but that causes problems if one the prereq. has a rule for it (such
# as when both GNUmakefile and GNUmakefile.in exist in the source tree),
# thus I do the equivalent manually
#
newest=$(shell ls -rtd "${OBJDIR}/${MERGE_BUILD_SANDBOX}/${SUBDIR}/"* "${TESTBED_SRCDIR}/.merged" | tail -n 1)
ifneq ($(newest),${TESTBED_SRCDIR}/.merged)
${TESTBED_SRCDIR}/.merged:
cd ${TESTBED_SRCDIR} && utils/merge-build sync
.PHONY: ${TESTBED_SRCDIR}/.merged
else
${TESTBED_SRCDIR}/.merged:
endif
${SRCDIR}/*: ${TESTBED_SRCDIR}/.merged
endif
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group. # Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
# Most of the configure-substitution magic is done here. # Most of the configure-substitution magic is done here.
...@@ -21,37 +21,11 @@ export AR = @AR@ ...@@ -21,37 +21,11 @@ export AR = @AR@
export ELVIN_CONFIG = @ELVIN_CONFIG@ export ELVIN_CONFIG = @ELVIN_CONFIG@
export JAVAC = @JAVAC@
export JAR = @JAR@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
host_cpu = @host_cpu@
TBROOT = @prefix@ TBROOT = @prefix@
TBDEFS = @TBDEFS@
TBDBNAME = @TBDBNAME@
TBADMINGROUP = @TBADMINGROUP@
TBOPSEMAIL = @TBOPSEMAIL@
TBROBOCOPSEMAIL = @TBROBOCOPSEMAIL@
TBLOGSEMAIL = @TBLOGSEMAIL@
TBAUDITEMAIL = @TBAUDITEMAIL@
TBACTIVEARCHIVE = @TBACTIVEARCHIVE@
TBUSERSARCHIVE = @TBUSERSARCHIVE@
TBERRORSEMAIL = @TBERRORSEMAIL@
TBAPPROVALEMAIL = @TBAPPROVALEMAIL@
BOSSNODE = @BOSSNODE@
USERNODE = @USERNODE@
FSNODE = @FSNODE@
WWW = @WWW@
OURDOMAIN = @OURDOMAIN@
FSDIR_PROJ = @FSDIR_PROJ@
FSDIR_GROUPS = @FSDIR_GROUPS@
FSDIR_USERS = @FSDIR_USERS@
CPPFLAGS = @CPPFLAGS@
CFLAGS += @CFLAGS@
CXXFLAGS += @CXXFLAGS@
LDFLAGS = @LDFLAGS@
OPT_CFLAGS = @OPT_CFLAGS@
INSTALL_TOPDIR = @exec_prefix@ INSTALL_TOPDIR = @exec_prefix@
INSTALL_DIR = @exec_prefix@ INSTALL_DIR = @exec_prefix@
...@@ -63,7 +37,6 @@ INSTALL_ETCDIR = @sysconfdir@ ...@@ -63,7 +37,6 @@ INSTALL_ETCDIR = @sysconfdir@
INSTALL_INCDIR = @includedir@ INSTALL_INCDIR = @includedir@
INSTALL_WWWDIR = @exec_prefix@/www INSTALL_WWWDIR = @exec_prefix@/www
INSTALL_RCDIR = @INSTALL_RCDIR@ INSTALL_RCDIR = @INSTALL_RCDIR@
INSTALL_APACHE_CONFIG = @INSTALL_APACHE_CONFIG@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL@ -m 755 INSTALL_PROGRAM = @INSTALL@ -m 755
...@@ -80,18 +53,5 @@ LOG_TESTBED = @LOG_TESTBED@ ...@@ -80,18 +53,5 @@ LOG_TESTBED = @LOG_TESTBED@
EVENTSYS = @EVENTSYS@ EVENTSYS = @EVENTSYS@
ELVIN_COMPAT = @ELVIN_COMPAT@ ELVIN_COMPAT = @ELVIN_COMPAT@
HAVE_MEZZANINE = @HAVE_MEZZANINE@ EMULAB_CLIENTSIDE = @EMULAB_CLIENTSIDE@
GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@
host_cpu = @host_cpu@
HAVE_ULXMLRPCPP = @HAVE_ULXMLRPCPP@
STANDALONE_CLEARINGHOUSE = @STANDALONE_CLEARINGHOUSE@
NODE_USAGE_SUPPORT = @NODE_USAGE_SUPPORT@
MERGE_BUILD = @MERGE_BUILD@
MERGE_BUILD_SANDBOX = @MERGE_BUILD_SANDBOX@
EXP_VIS_SUPPORT = @EXP_VIS_SUPPORT@
...@@ -598,7 +598,7 @@ PACKAGE_VERSION= ...@@ -598,7 +598,7 @@ PACKAGE_VERSION=
PACKAGE_STRING= PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
ac_unique_file="Makefile.in" ac_unique_file="Makeconf.in"
ac_subst_vars='SHELL ac_subst_vars='SHELL
PATH_SEPARATOR PATH_SEPARATOR
PACKAGE_NAME PACKAGE_NAME
...@@ -654,13 +654,22 @@ INSTALL_PROGRAM ...@@ -654,13 +654,22 @@ INSTALL_PROGRAM
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_DATA INSTALL_DATA
AR AR
STRIP
RM RM
CP CP
YACC YACC
TAR TAR
LIBTOOL
RPM RPM
PATH
EMULAB_CLIENTSIDE
ELVIN_COMPAT ELVIN_COMPAT
CLIENT_ETCDIR
CLIENT_BINDIR
CLIENT_VARDIR
CLIENT_MANDIR
LOG_TESTBED
TBLOGFACIL
DISTCLEAN_FILES
LIB@&t@OBJS LIB@&t@OBJS
LTLIBOBJS' LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
...@@ -1750,6 +1759,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ...@@ -1750,6 +1759,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in ${srcdir}/autoconf "$srcdir"/${srcdir}/autoconf; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
{ { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ${srcdir}/autoconf \"$srcdir\"/${srcdir}/autoconf" >&5
$as_echo "$as_me: error: cannot find install-sh or install.sh in ${srcdir}/autoconf \"$srcdir\"/${srcdir}/autoconf" >&2;}
{ (exit 1); exit 1; }; }
fi
# These three variables are undocumented and unsupported,
# and are intended to be withdrawn in a future Autoconf release.
# They can cause serious problems if a builder's source tree is in a directory
# whose full name contains unusual characters.
ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
ac_config_headers="$ac_config_headers config.h"
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
...@@ -3398,37 +3441,6 @@ else ...@@ -3398,37 +3441,6 @@ else
RANLIB="$ac_cv_prog_RANLIB" RANLIB="$ac_cv_prog_RANLIB"
fi fi
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
elif test -f "$ac_dir/install.sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
elif test -f "$ac_dir/shtool"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
{ { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
# These three variables are undocumented and unsupported,
# and are intended to be withdrawn in a future Autoconf release.
# They can cause serious problems if a builder's source tree is in a directory
# whose full name contains unusual characters.
ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then if test -z "$MKDIR_P"; then
...@@ -3609,6 +3621,51 @@ if test -z "$AR" ; then ...@@ -3609,6 +3621,51 @@ if test -z "$AR" ; then
$as_echo "$as_me: error: no acceptable ar found in \$PATH" >&2;} $as_echo "$as_me: error: no acceptable ar found in \$PATH" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_STRIP+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $STRIP in
[\\/]* | ?:[\\/]*)
ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
STRIP=$ac_cv_path_STRIP
if test -n "$STRIP"; then
{ $as_echo "$as_me:$LINENO: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$STRIP" ; then
{ { $as_echo "$as_me:$LINENO: error: no acceptable strip found in \$PATH" >&5
$as_echo "$as_me: error: no acceptable strip found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "rm", so it can be a program name with args. # Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2 set dummy rm; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
...@@ -3789,51 +3846,6 @@ if test -z "$TAR" ; then ...@@ -3789,51 +3846,6 @@ if test -z "$TAR" ; then
$as_echo "$as_me: error: no tar found in \$PATH" >&2;} $as_echo "$as_me: error: no tar found in \$PATH" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# Extract the first word of "libtool", so it can be a program name with args.
set dummy libtool; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_LIBTOOL+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $LIBTOOL in
[\\/]* | ?:[\\/]*)
ac_cv_path_LIBTOOL="$LIBTOOL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LIBTOOL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
LIBTOOL=$ac_cv_path_LIBTOOL
if test -n "$LIBTOOL"; then
{ $as_echo "$as_me:$LINENO: result: $LIBTOOL" >&5
$as_echo "$LIBTOOL" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$LIBTOOL" ; then
{ { $as_echo "$as_me:$LINENO: error: no libtool found in \$PATH" >&5
$as_echo "$as_me: error: no libtool found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "rpm", so it can be a program name with args. # Extract the first word of "rpm", so it can be a program name with args.
set dummy rpm; ac_word=$2 set dummy rpm; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
...@@ -3881,6 +3893,13 @@ $as_echo "$as_me: error: no rpm found in \$PATH" >&2;} ...@@ -3881,6 +3893,13 @@ $as_echo "$as_me: error: no rpm found in \$PATH" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# Need this for Makeconf.
# Tell build it is the clientside.
EMULAB_CLIENTSIDE=1
# #
# The only option is if we build in elvin compat support. # The only option is if we build in elvin compat support.
# #
...@@ -3896,8 +3915,45 @@ fi ...@@ -3896,8 +3915,45 @@ fi
if test "$enable_elvin_compat" = "yes"; then if test "$enable_elvin_compat" = "yes"; then
ELVIN_COMPAT=1 ELVIN_COMPAT=1
fi fi
if test $ELVIN_COMPAT -eq 1; then
cat >>confdefs.h <<_ACEOF
@%:@define ELVIN_COMPAT 1
_ACEOF
fi
ac_config_files="$ac_config_files Makefile 2.pubsubd.sh linux-pubsubd.sh"
CLIENT_ETCDIR="/etc/emulab"
CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab"
CLIENT_MANDIR="/usr/local/man"
TBLOGFACIL="local5"
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
cat >>confdefs.h <<_ACEOF
@%:@define LOG_TESTBED $LOG_TESTBED
_ACEOF
outfiles="Makeconf GNUmakefile \
lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/event/GNUmakefile \
event/GNUmakefile \
event/program-agent/GNUmakefile"
#
# Do this for easy distclean.
#
DISTCLEAN_FILES="$outfiles"
ac_config_files="$ac_config_files $outfiles"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
...@@ -3978,43 +4034,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix ...@@ -3978,43 +4034,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix. # Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# Transform confdefs.h into DEFS. DEFS=-DHAVE_CONFIG_H
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
#
# If the first sed substitution is executed (which looks for macros that
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
:mline
/\\$/{
N
s,\\\n,,
b mline
}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
t quote
s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
t quote
b any
:quote
s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
s/\[/\\&/g
s/\]/\\&/g
s/\$/$$/g
H
:any
${
g
s/^\n//
s/\n/ /g
p
}
'
DEFS=`sed -n "$ac_script" confdefs.h`
ac_libobjs= ac_libobjs=
ac_ltlibobjs= ac_ltlibobjs=
...@@ -4371,6 +4391,7 @@ _ACEOF ...@@ -4371,6 +4391,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for. # Files that config.status was made for.
config_files="$ac_config_files" config_files="$ac_config_files"
config_headers="$ac_config_headers"
_ACEOF _ACEOF
...@@ -4388,10 +4409,15 @@ Usage: $0 [OPTIONS] [FILE]... ...@@ -4388,10 +4409,15 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions --recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE] --file=FILE[:TEMPLATE]
instantiate the configuration file FILE instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
instantiate the configuration header FILE
Configuration files: Configuration files:
$config_files $config_files
Configuration headers:
$config_headers
Report bugs to <bug-autoconf@gnu.org>." Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
...@@ -4445,7 +4471,19 @@ do ...@@ -4445,7 +4471,19 @@ do
esac esac
CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;; ac_need_defaults=false;;
--he | --h | --help | --hel | -h ) --header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
{ $as_echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;; $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s) | -silent | --silent | --silen | --sile | --sil | --si | --s)
...@@ -4502,9 +4540,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -4502,9 +4540,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets for ac_config_target in $ac_config_targets
do do
case $ac_config_target in case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"2.pubsubd.sh") CONFIG_FILES="$CONFIG_FILES 2.pubsubd.sh" ;; "$outfiles") CONFIG_FILES="$CONFIG_FILES $outfiles" ;;
"linux-pubsubd.sh") CONFIG_FILES="$CONFIG_FILES linux-pubsubd.sh" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
...@@ -4519,6 +4556,7 @@ done ...@@ -4519,6 +4556,7 @@ done
# bizarre bug on SunOS 4.1.3. # bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
fi fi
# Have a temporary directory for convenience. Make it in the build tree # Have a temporary directory for convenience. Make it in the build tree
...@@ -4701,8 +4739,120 @@ fi ...@@ -4701,8 +4739,120 @@ fi
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES" fi # test -n "$CONFIG_FILES"
# Set up the scripts for CONFIG_HEADERS section.
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
# Transform confdefs.h into an awk script `defines.awk', embedded as
# here-document in config.status, that substitutes the proper values into
# config.h.in to produce config.h.
# Create a delimiter string that does not exist in confdefs.h, to ease
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
ac_t=`sed -n "/$ac_delim/p" confdefs.h`
if test -z "$ac_t"; then
break
elif $ac_last_try; then
{ { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
# For the awk script, D is an array of macro values keyed by name,
# likewise P contains macro parameters if any. Preserve backslash
# newline sequences.
eval set X " :F $CONFIG_FILES " ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
sed -n '
s/.\{148\}/&'"$ac_delim"'/g
t rset
:rset
s/^[ ]*#[ ]*define[ ][ ]*/ /
t def
d
:def