grim/guifications3

updated gflib-autogen.sh to work better on osx, but still has issues with the aclocal update...

2009-11-08, Gary Kramlich
f37dc8fa8e08
Parents 32b04b894f57
Children 49d147c7565c
updated gflib-autogen.sh to work better on osx, but still has issues with the aclocal update...
1 files changed, 80 insertions(+), 68 deletions(-)
  • +80 -68
    gflib/gflib-autogen.sh
    • --- a/gflib/gflib-autogen.sh Tue Nov 03 22:24:11 2009 -0600
    +++ b/gflib/gflib-autogen.sh Sun Nov 08 16:02:11 2009 -0600
    @@ -23,18 +23,61 @@
    ###############################################################################
    # A list library similar to the lists in TCL
    # Copyright (C) 2009 Ethan Blanton
    +# Heavily modified by Gary Kramlich
    ###############################################################################
    +linsert() {
    + __list=${1}
    + __index=${2}
    + shift 2
    + __item=${@}
    +
    + # dirty hack to make sure we handle empty item. Basically we just turn
    + # them into a space
    + if [ -z "${__item}" ] ; then
    + __item=" "
    + fi
    +
    + eval "${__list}=\`catlist ${__list} | sed -e '${__index}i\\\\
    +${__item}'\`"
    +}
    +
    lappend() {
    - __list=$1
    + __list=${1}
    + shift
    + __item=${@}
    - if lempty $__list; then
    - eval "$__list=$2"
    + # dirty hack to make sure we handle empty item. Basically we just turn
    + # them into a space
    + if [ -z "${__item}" ] ; then
    + __item=" "
    + fi
    +
    + if lempty ${__list} ; then
    + eval "${__list}='${__item}'"
    else
    - eval "$__list=\"\$$__list
    -\"$2\"\""
    + __index=`llength ${__list}`
    +
    + eval "${__list}=\`catlist ${__list} | sed -e '${__index}a\\\\
    +${__item}'\`"
    fi
    }
    +lreplace() {
    + __list=${1}
    + __index=${2}
    + shift 2
    + __item=${@}
    +
    + # dirty hack to make sure we handle empty item. Basically we just turn
    + # them into a space
    + if [ -z "${__item}" ] ; then
    + __item=" "
    + fi
    +
    + eval "${__list}=\`catlist ${__list} | sed -e '${__index}c\\\\
    +${__item}'\`"
    +}
    +
    lindex() {
    eval __list=\$$1
    cat <<EOF | sed -e "$2!d"
    @@ -64,31 +107,14 @@
    EOF
    }
    -echolist() {
    - __list=$1
    +debuglist() {
    + i=1
    catlist $1 | while read ITEM; do
    - echo ${ITEM}
    + echo $1[$i] ${ITEM}
    + i=$(( ${i} + 1 ))
    done
    }
    -lreplace() {
    - set -x
    - __listname=$1
    - __listindex=$2
    - __listvalue=$3
    - eval "$__listname=\`catlist $__listname | sed -e '${__listindex}c\\\\
    -$__listvalue'\`"
    - set +x
    -}
    -
    -linsert() {
    - __listname=$1
    - __listindex=$2
    - __listvalue=$3
    - eval "$__listname=\`catlist $__listname | sed -e '${__listindex}i\\\\
    -$__listvalue'\`"
    -}
    -
    lsearch() {
    catlist $1 | sed -n "/$2/{
    =
    @@ -102,21 +128,35 @@
    add_command () {
    CMD=${1}
    shift
    - ARGS="${@}"
    + ARGS=${@}
    lappend COMMANDS ${CMD}
    - lappend FLAGS "\"${ARGS}\""
    + lappend FLAGS ${ARGS}
    }
    insert_command () {
    INSERT_POINT=${1}
    COMMAND=${2}
    shift 2
    - ARGS="${@}"
    + ARGS=${@}
    INDEX=`lsearch COMMANDS ${INSERT_POINT}`
    linsert COMMANDS ${INDEX} ${COMMAND}
    - linsert FLAGS ${INDEX} "${ARGS}"
    + linsert FLAGS ${INDEX} ${ARGS}
    +}
    +
    +update_command () {
    + OLD_COMMAND=$1
    + NEW_COMMAND=$2
    + shift 2
    + ARGS=${@}
    +
    + INDEX=`lsearch COMMANDS ${OLD_COMMAND}`
    + test ${INDEX} -ne 0 || return
    +
    + lreplace COMMANDS ${INDEX} ${NEW_COMMAND}
    +
    + test -z "${ARGS}" || lreplace FLAGS ${INDEX} ${ARGS}
    }
    check_config_file() {
    @@ -213,53 +253,25 @@
    }
    add_default_commands () {
    - add_command "libtoolize" " -c -f --automake"
    - add_command "intltoolize" " -c -f --automake"
    - add_command "aclocal"
    - add_command "autoheader"
    - add_command "automake" "-a -c -f --gnu"
    - add_command "autoconf" "-f"
    + add_command libtoolize -c -f --automake
    + add_command intltoolize -c -f --automake
    + add_command aclocal
    + add_command autoheader
    + add_command automake -a -c -f --gnu
    + add_command autoconf -f
    }
    add_default_library_commands () {
    add_default_commands
    # gtkdocize needs be to run before aclocal, so we insert it before aclocal
    - insert_command "aclocal" "gtkdocize" "--copy"
    - #INDEX=`lsearch COMMANDS aclocal`
    - #linsert COMMANDS ${INDEX} " gtkdocize"
    - #linsert FLAGS ${INDEX} " --copy"
    + insert_command aclocal gtkdocize --copy
    }
    find_command () {
    echo `lsearch COMMANDS ${1}`
    }
    -update_command () {
    - OLD_COMMAND=$1
    - NEW_COMMAND=$2
    - shift 2
    - ARGS=${@}
    -
    - echo
    - echo "%%%%"
    - echo "Updating ${OLD_COMMAND} to ${NEW_COMMAND} with args '${ARGS}'"
    - echo
    -
    - INDEX=`lsearch COMMANDS ${OLD_COMMAND}`
    - test ${INDEX} || return
    -
    - lreplace COMMANDS ${INDEX} ${NEW_COMMAND}
    -
    - test -z "${ARGS}" || lreplace FLAGS ${INDEX} "${ARGS}"
    - echo "index: ${INDEX}"
    - catlist COMMANDS
    - echo "----"
    - catlist FLAGS
    - echo "----"
    -
    -}
    -
    cleanup () {
    rm -f autogen-??????
    echo
    @@ -278,15 +290,15 @@
    platform_bsd
    # change libtoolize to glibtoolize
    - update_command "libtoolize" "glibtoolize"
    + update_command libtoolize glibtoolize
    # look for fink and add it's aclocal dir to the aclocal flags
    FLAGS=""
    if [ -d /sw/share/aclocal ] ; then
    - FLAGS="-I /sw/share/aclocal"
    + FLAGS='-I /sw/share/aclocal'
    fi
    - update_command "aclocal" "aclocal" "${FLAGS}"
    + update_command aclocal aclocal ${FLAGS}
    }
    check_platform () {