Browse Source

configure: cleanups.

tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
ab7cab34bd
2 changed files with 18 additions and 10 deletions
  1. +2
    -2
      configure
  2. +16
    -8
      scripts/config-funcs

+ 2
- 2
configure View File

@@ -9,8 +9,8 @@ begin


begin_options begin_options


ask "Install prefix" prefix /usr/local
ask "Require LASH" USE_LASH yes
ask "Installation prefix" prefix /usr/local
ask "Use the LASH Audio Session Handler" USE_LASH yes
ask "Build for debugging" USE_DEBUG no ask "Build for debugging" USE_DEBUG no


begin_tests begin_tests


+ 16
- 8
scripts/config-funcs View File

@@ -7,7 +7,6 @@


# support functions for 'configure' scripts. # support functions for 'configure' scripts.



fatal () fatal ()
{ {
echo "$BOLD$RED$*$SGR0" > /dev/stderr echo "$BOLD$RED$*$SGR0" > /dev/stderr
@@ -164,6 +163,11 @@ warn ()
echo " ${BOLD}${YELLOW}* ${SGR0}$*" echo " ${BOLD}${YELLOW}* ${SGR0}$*"
} }


info ()
{
echo "${BOLD}${CYAN}--- ${SGR0}$*"
}

begin_options () begin_options ()
{ {
# get the old values # get the old values
@@ -172,9 +176,9 @@ begin_options ()
if [ $HELP = yes ] if [ $HELP = yes ]
then then
echo echo
warn "This is not an autoconf script! Run without any arguments and you will be prompted."
warn "Alternatively, you may use the following autoconf style arguments for"
warn "non-interactive configuration."
warn "This is a ${BOLD}non-configure${SGR0} script. Run without any arguments and you will be prompted"
warn "with configuration choices. Alternatively, you may use the following autoconf style"
warn "arguments for non-interactive configuration."
echo echo
echo " Available options:" echo " Available options:"
echo echo
@@ -185,16 +189,20 @@ begin_options ()


if [ $UPDATE = yes ] if [ $UPDATE = yes ]
then then
echo "--- Updating configuration ---"
info "Updating configuration"
else else
echo "--- Configuration required ---"
info "Configuration required"
fi fi
fi fi
} }


begin_tests () begin_tests ()
{ {
[ $HELP = yes ] && exit 0
if [ $HELP = yes ]
then
echo
exit 0;
fi


append "## libs" append "## libs"
extract_options extract_options
@@ -207,7 +215,7 @@ append ()


end () end ()
{ {
echo "--- Configuration complete ---"
info "Configuration complete"
touch make.conf touch make.conf
} }




Loading…
Cancel
Save