Menu
▾
▴
[Bobs-cvs] CVS: bobs configure,1.2,1.3 configure.in,1.4,1.5
|
From: Joe Z. <jz...@us...> - 2002-12-01 03:10:32
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv31428
Modified Files:
configure configure.in
Log Message:
Changes to install dirs and more.
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure 25 Jun 2002 03:31:59 -0000 1.2
--- configure 1 Dec 2002 03:10:29 -0000 1.3
***************
*** 1,29 ****
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13
! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
! # Defaults:
[...3814 lines suppressed...]
! # need to make the FD available again.
! if test "$no_create" != yes; then
! ac_cs_success=:
! exec 5>/dev/null
! $SHELL $CONFIG_STATUS || ac_cs_success=false
! exec 5>>config.log
! # Use ||, not &&, to avoid exiting from the if with $? = 1, which
! # would make configure fail if this is the last instruction.
! $ac_cs_success || { (exit 1); exit 1; }
! fi
***************
*** 1536,1539 ****
--- 2440,2444 ----
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ admin password = $myPASS
*** $WARNCOUNT warning(s)
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in 24 Jun 2002 03:55:15 -0000 1.4
--- configure.in 1 Dec 2002 03:10:29 -0000 1.5
***************
*** 2,87 ****
dnl> Author: Joe Zacky, June 2002
-
- dnl>
- dnl> Verify we're in the right directory by looking for a unique file.
dnl>
!
! AC_INIT(admin.php)
PACKAGE=bobs
VERSION=0.5.1
- WARNCOUNT=0
-
- echo
- echo "Welcome to $PACKAGE, Version $VERSION"
- echo
-
- dnl>
- dnl> make the system type available to `configure' scripts.
- dnl>
-
- AC_CANONICAL_SYSTEM
-
- dnl>
- dnl> Perform program name transformation
- dnl>
- dnl AC_ARG_PROGRAM
-
dnl>
! dnl> Need AC_PROG_MAKE_SET because package dir is not flat
! dnl>
!
! AC_PROG_MAKE_SET
!
! dnl **
! dnl ** Checks for programs.
! dnl **
!
! AC_PROG_INSTALL
!
! dnl>
! dnl> Determine if an http server is installed
! dnl>
!
! AC_PATH_PROG(myHTTPD, httpd, , $PATH:/sbin:/usr/sbin)
! if test -z "$myHTTPD"; then
! AC_MSG_WARN("*** httpd is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find your web server.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if php is installed
! dnl>
!
! AC_PATH_PROG(myPHP, php, , $PATH)
! if test -z "$myPHP"; then
! AC_MSG_WARN("*** php is not in path $PATH")
! AC_MSG_WARN("*** I can\'t find php.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if portmap is installed.
dnl>
! AC_PATH_PROG(myPORTMAP, portmap, , $PATH:/sbin:/usr/sbin)
! if test -z "$myPORTMAP"; then
! AC_MSG_WARN("*** portmap is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find portmap.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
!
! dnl>
! dnl> Determine if rsync is installed.
! dnl>
! AC_PATH_PROG(myRSYNC, rsync, , $PATH:/sbin:/usr/sbin)
! if test -z "$myRSYNC"; then
! AC_MSG_WARN("*** rsync is not in path $PATH:/sbin:/usr/sbin")
! AC_MSG_WARN("*** I can\'t find rsync.")
! WARNCOUNT=$(($WARNCOUNT + 1))
! fi
dnl>
--- 2,21 ----
dnl> Author: Joe Zacky, June 2002
dnl>
! dnl> 11-30-2002 Remove program checks. They no longer work right.
! dnl> They should be done in 'make check' anyway.
! dnl> 11-30-2002 Default admin password to 'admin'.
PACKAGE=bobs
VERSION=0.5.1
dnl>
! dnl> Verify we're in the right directory by looking for a unique file.
dnl>
! AC_INIT(admin.php)
! AM_INIT_AUTOMAKE(bobs, 0.5.1)
! WARNCOUNT=0
dnl>
***************
*** 91,95 ****
AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
! myWEBDIR=$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
--- 25,29 ----
AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
! myWEBDIR=${DESTDIR}$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
***************
*** 99,103 ****
AC_MSG_ERROR("*** Please use the --with-webdir=DIR configuration option.")
else
! myWEBDIR=${myDOCUMENTROOT}/bobs
fi
]
--- 33,37 ----
AC_MSG_ERROR("*** Please use the --with-webdir=DIR configuration option.")
else
! myWEBDIR=${DESTDIR}${myDOCUMENTROOT}/bobs
fi
]
***************
*** 107,115 ****
dnl> Set the location to store bobs data.
dnl> If not specified with '--with-bobsdata=DIR',
! dnl> then default to /usr/local/share/bobsdata.
dnl>
AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
! myBOBSDATA=${with_bobsdata}/bobsdata, myBOBSDATA=/usr/local/share/bobsdata )
dnl>
--- 41,49 ----
dnl> Set the location to store bobs data.
dnl> If not specified with '--with-bobsdata=DIR',
! dnl> then default to /var/bobsdata.
dnl>
AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
! myBOBSDATA=${DESTDIR}${with_bobsdata}/bobsdata, myBOBSDATA=${DESTDIR}/var/bobsdata )
dnl>
***************
*** 117,121 ****
dnl>
! AC_MSG_CHECKING("for web server user id")
if PSOUTPUT=$(ps -C httpd -o user,rgroup,pid,ucomm --sort pid); then
--- 51,55 ----
dnl>
! AC_MSG_CHECKING(for web server user id)
if PSOUTPUT=$(ps -C httpd -o user,rgroup,pid,ucomm --sort pid); then
***************
*** 133,140 ****
dnl>
! echo ""
! echo "Now you need to set a password for bobs adminstrator."
! while test -z "$myPASS"; do read -s -p "bobs admin password: " myPASS; done
! echo ""
dnl>
--- 67,71 ----
dnl>
! myPASS=admin
dnl>
***************
*** 156,159 ****
--- 87,91 ----
inc/config.php
cron/backup.php
+ cron/check_loop
])
***************
*** 167,170 ****
--- 99,103 ----
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ admin password = $myPASS
*** $WARNCOUNT warning(s)
|
