grim/gplate

bring these up to gflib's standard
template_cleanup
2008-12-31, grim
83675dc8c4fb
Parents d1ea96c06756
Children 01a3a67bdb80
bring these up to gflib's standard
2 files changed, 19 insertions(+), 10 deletions(-)
  • +10 -5
    autogen.sh
  • +9 -5
    configure.ac
    • --- a/autogen.sh Fri Oct 10 01:20:41 2008 -0500
    +++ b/autogen.sh Wed Dec 31 20:47:11 2008 -0600
    @@ -1,5 +1,4 @@
    #!/bin/sh
    -# rapture - the final apt mirror
    # Copyright (C) 2008 Gary Kramlich <grim@reaperworld.com>
    #
    # This program is free software; you can redistribute it and/or modify it
    @@ -33,6 +32,7 @@
    # AUTOHEADER_FLAGS - command line arguments to pass to autoheader
    # AUTOMAKE_FLAGS - command line arguments to pass to automake flags
    # CONFIGURE_FLAGS - command line arguments to pass to configure
    +# GTKDOCIZE_FLAGS - command line arguments to pass to gtkdocize
    # INTLTOOLIZE_FLAGS - command line arguments to pass to intltoolize
    # LIBTOOLIZE_FLAGS - command line arguments to pass to libtoolize
    #
    @@ -59,6 +59,9 @@
    INTLTOOLIZE_CMD="intltoolize"
    INTLTOOLIZE_FLAGS="-c -f --automake"
    +GTKDOCIZE_CMD="gtkdocize"
    +GTKDOCIZE_FLAGS="--copy"
    +
    ACLOCAL_CMD="aclocal"
    ACLOCAL_FLAGS=""
    @@ -93,7 +96,7 @@
    BIN=`which ${CMD}`
    if [ x"${BIN}" = x"" ] ; then
    - echo "not found.\n"
    + echo "not found."
    echo "${CMD} is required to build ${PACKAGE}!"
    exit 1;
    fi
    @@ -105,7 +108,7 @@
    CMD=$1
    shift
    - OUTPUT=`mktemp .autogen-XXXXXX`
    + OUTPUT=`mktemp autogen-XXXXXX`
    # we have to stash ${@} into a variable, otherwise printf has "issues" if
    # ${@} was expanded from a variable. Fortunately, this let's us clean up
    @@ -160,6 +163,7 @@
    ###############################################################################
    check "${LIBTOOLIZE_CMD}"; LIBTOOLIZE=${BIN};
    check "${INTLTOOLIZE_CMD}"; INTLTOOLIZE=${BIN};
    +check "${GTKDOCIZE_CMD}"; GTKDOCIZE=${BIN};
    check "${ACLOCAL_CMD}"; ACLOCAL=${BIN};
    check "${AUTOHEADER_CMD}"; AUTOHEADER=${BIN};
    check "${AUTOMAKE_CMD}"; AUTOMAKE=${BIN};
    @@ -170,6 +174,7 @@
    ###############################################################################
    run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS}
    run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS}
    +run_or_die ${GTKDOCIZE} ${GTKDOCIZE_FLAGS}
    run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS}
    run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
    run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS}
    @@ -178,6 +183,6 @@
    ###############################################################################
    # Run configure
    ###############################################################################
    -echo "running './configure ${CONFIGURE_FLAGS} $@'"
    -./configure ${CONFIGURE_FLAGS} $@
    +echo "running ./configure ${CONFIGURE_ARGS} $@"
    +./configure ${CONFIGURE_ARGS} $@
    --- a/configure.ac Fri Oct 10 01:20:41 2008 -0500
    +++ b/configure.ac Wed Dec 31 20:47:11 2008 -0600
    @@ -3,7 +3,7 @@
    dnl ################################################################
    dnl # Initialize autoconf
    dnl ################################################################
    -AC_INIT(gplate, 0.0.2, guifications-devel@lists.guifications.org)
    +AC_INIT(gplate, 0.0.3mtn, guifications-devel@lists.guifications.org)
    AC_PREREQ(2.50)
    AC_CANONICAL_SYSTEM
    AC_CONFIG_SRCDIR(config.h.in)
    @@ -14,7 +14,7 @@
    dnl ################################################################
    GPLATE_MAJOR_VERSION=0
    GPLATE_MINOR_VERSION=0
    -GPLATE_MICRO_VERSION=2
    +GPLATE_MICRO_VERSION=3
    GPLATE_DEVEL_VERSION=0
    GPLATE_VERSION=$GPLATE_MAJOR_VERSION.$GPLATE_MINOR_VERSION.$GPLATE_MICRO_VERSION
    @@ -108,13 +108,15 @@
    dnl #######################################################################
    dnl # Look for the C compiler
    dnl #######################################################################
    -AC_MSG_CHECKING([useful C based html templating library so I don't have to write one])
    +AC_MSG_CHECKING([useful C based templating library so I don't have to write one])
    AC_MSG_RESULT(no)
    CFLAGS_save="$CFLAGS"
    AC_PROG_CC
    CFLAGS="$CFLAGS_save"
    -AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no)
    +AC_ARG_ENABLE(debug,
    + AC_HELP_STRING([--enable-debug],[compile with debugging support])
    + ,,enable_debug=no)
    if test x"$enable_debug" = x"yes" ; then
    AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
    @@ -128,7 +130,9 @@
    dnl #######################################################################
    dnl # do we want to build the tests?
    dnl #######################################################################
    -AC_ARG_ENABLE(tests, [ --enable-tests build test programs],,enable_tests=no)
    +AC_ARG_ENABLE(tests,
    + AC_HELP_STRING([--enable-tests],[build test programs])
    + ,,enable_tests=no)
    CHECK_CFLAGS=
    CHECK_LIBS=