Commit 6c6d1a69 authored by Leigh Stoller's avatar Leigh Stoller

Add some initial configure stuff for the pelab subdir, so I get my

GNUmakefile auto generated.
parent 89581705
......@@ -1372,6 +1372,7 @@ done
#
......@@ -1436,6 +1437,7 @@ FRISEBEEMCASTPORT=3564
MIN_UNIX_UID=10000
MIN_UNIX_GID=6000
DELAYTHRESH=2
PELABSUPPORT=0
#
# Okay, I know this is improper usage of --with. Too bad.
......@@ -1895,6 +1897,15 @@ else
fi
#
# Quickie pelab support.
#
if test $PELABSUPPORT -eq 0; then
pelabfiles="";
else
pelabfiles="pelab/GNUmakefile pelab/db/GNUmakefile ";
fi
#
# Enable Windows support.
# Right now this means NTFS support in imagezip, maybe more things later.
......@@ -1936,17 +1947,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1940: checking for $ac_hdr" >&5
echo "configure:1951: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1945 "configure"
#line 1956 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -1985,17 +1996,17 @@ for ac_hdr in linux/videodev.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1989: checking for $ac_hdr" >&5
echo "configure:2000: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1994 "configure"
#line 2005 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -2028,7 +2039,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2032: checking for $ac_word" >&5
echo "configure:2043: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2107,7 +2118,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:2111: checking for a BSD compatible install" >&5
echo "configure:2122: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2168,7 +2179,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2172: checking for $ac_word" >&5
echo "configure:2183: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2342,6 +2353,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tools/selectapplet/GNUmakefile \
$eventfiles \
$winfiles \
$pelabfiles \
apache/GNUmakefile apache/httpd.conf \
xmlrpc/GNUmakefile xmlrpc/emulabclient.py xmlrpc/emulabserver.py \
xmlrpc/sshxmlrpc_client.py xmlrpc/sshxmlrpc_server.py \
......@@ -2636,6 +2648,7 @@ s%@CHATSUPPORT@%$CHATSUPPORT%g
s%@MIN_UNIX_UID@%$MIN_UNIX_UID%g
s%@MIN_UNIX_GID@%$MIN_UNIX_GID%g
s%@DELAYTHRESH@%$DELAYTHRESH%g
s%@PELABSUPPORT@%$PELABSUPPORT%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
......
......@@ -154,6 +154,7 @@ AC_SUBST(CHATSUPPORT)
AC_SUBST(MIN_UNIX_UID)
AC_SUBST(MIN_UNIX_GID)
AC_SUBST(DELAYTHRESH)
AC_SUBST(PELABSUPPORT)
#
# Offer both versions of the email addresses that have the @ escaped
......@@ -217,6 +218,7 @@ FRISEBEEMCASTPORT=3564
MIN_UNIX_UID=10000
MIN_UNIX_GID=6000
DELAYTHRESH=2
PELABSUPPORT=0
#
# Okay, I know this is improper usage of --with. Too bad.
......@@ -558,6 +560,15 @@ else
fi
AC_SUBST(EVENTSYS)
#
# Quickie pelab support.
#
if test $PELABSUPPORT -eq 0; then
pelabfiles="";
else
pelabfiles="pelab/GNUmakefile pelab/db/GNUmakefile ";
fi
#
# Enable Windows support.
# Right now this means NTFS support in imagezip, maybe more things later.
......@@ -780,6 +791,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tools/selectapplet/GNUmakefile \
$eventfiles \
$winfiles \
$pelabfiles \
apache/GNUmakefile apache/httpd.conf \
xmlrpc/GNUmakefile xmlrpc/emulabclient.py xmlrpc/emulabserver.py \
xmlrpc/sshxmlrpc_client.py xmlrpc/sshxmlrpc_server.py \
......
......@@ -37,6 +37,8 @@ PLAB_ROOTBALL="plabroot-12.tar.bz2"
MIN_UNIX_UID=10000
MIN_UNIX_GID=6000
WINSUPPORT=1
PELABSUPPORT=1
#
# These next six will not work outside of Utah (yet).
#
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ..
SUBDIR = pelab
include $(OBJDIR)/Makeconf
all:
include $(TESTBED_SRCDIR)/GNUmakerules
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = pelab/db
include $(OBJDIR)/Makeconf
SBIN_SCRIPTS = pelab_dbpush
all: $(SBIN_SCRIPTS)
include $(TESTBED_SRCDIR)/GNUmakerules
install: $(addprefix $(INSTALL_DIR)/opsdir/sbin, $(SBIN_SCRIPTS))
boss-install: install
clean:
$(INSTALL_DIR)/opsdir/sbin/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/opsdir/sbin
$(INSTALL) $< $@
$(INSTALL_DIR)/opsdir/libexec/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_DIR)/opsdir/libexec
$(INSTALL_DATA) $< $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment