diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rwxr-xr-x | autogen.sh | 152 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/yelp-main.c | 8 |
6 files changed, 166 insertions, 18 deletions
@@ -1,3 +1,12 @@ +2002-10-04 Mikael Hallendal <micke@codefactory.se> + + * NEWS: updated for 2.1.0 + + * configure.in: bumped version to 2.1.0, did a large jump here to + reach GNOME version numbers. + + * autogen.sh: don't use gnome-common + 2002-09-23 Mikael Hallendal <micke@codefactory.se> * src/yelp-db2html.c: Don't include libgnome and gnome-vfs stuff. @@ -1,3 +1,12 @@ +Changes in 2.1.0: +----------------- + +* Added pregeneration of HTML cache. (Narayana Pattipati) +* Stylesheet updates (sander Vesik) +* Internal cleanups (Mikael Hallendal) +* a11y fix (Padraig O'Briain) +* Linking error (Mikael Hallendal) + Changes in 1.0.6: ----------------- @@ -4,19 +4,147 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="Yelp" - -(test -f $srcdir/configure.in \ - && test -f $srcdir/src/yelp-main.c \ - && test -f $srcdir/README) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level yelp directory" - exit 1 +ORIGDIR=`pwd` +cd $srcdir +PROJECT=Yelp +TEST_TYPE=-f +FILE=src/yelp-main.c + +DIE=0 + +AUTOMAKE=automake-1.4 +ACLOCAL=aclocal-1.4 + +($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { + AUTOMAKE=automake + ACLOCAL=aclocal +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $PROJECT." + echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4-p6.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 +} + +(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && { + (libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed to compile $PROJECT." + echo "Get ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.4.2.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } +} + +grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null && { + grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ + (gettext --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`gettext' installed to compile $PROJECT." + echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } +} + +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { + (intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME." + echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.15.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 + } } +if test "$DIE" -eq 1; then + exit 1 +fi -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 +test $TEST_TYPE $FILE || { + echo "You must run this script in the top-level $PROJECT directory" + exit 1 } -USE_GNOME2_MACROS=1 . gnome-autogen.sh + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +case $CC in +*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;; +esac + +for coin in . +do + dr=`dirname $coin` + if test -f $dr/NO-AUTO-GEN; then + echo skipping $dr -- flagged as no auto-gen + else + echo processing $dr + macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` + ( cd $dr + aclocalinclude="$ACLOCAL_FLAGS" + for k in $macrodirs; do + if test -d $k; then + aclocalinclude="$aclocalinclude -I $k" + ##else + ## echo "**Warning**: No such directory \`$k'. Ignored." + fi + done + if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then + if grep "sed.*POTFILES" configure.in >/dev/null; then + : do nothing -- we still have an old unmodified configure.in + else + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running glib-gettextize... Ignore non-fatal messages." + echo "no" | glib-gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi + if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + echo "Running aclocal $aclocalinclude ..." + $ACLOCAL $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu $am_opt ..." + $AUTOMAKE --add-missing --gnu $am_opt + echo "Running autoconf ..." + autoconf + ) + fi +done + +conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c + +cd "$ORIGDIR" + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type \`make\' to compile $PROJECT || exit 1 +else + echo Skipping configure process. +fi + diff --git a/configure.in b/configure.in index fb07ad90..584935d4 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,12 @@ AC_INIT(src/yelp-main.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(yelp, 1.0.6) +AM_INIT_AUTOMAKE(yelp, 2.1.0) AC_PROG_INTLTOOL AC_ARG_WITH(html-widget, [ --with-html-widget=[gtkhtml1/gtkhtml2] html widget to use]) AM_MAINTAINER_MODE -GNOME_COMMON_INIT -GNOME_COMPILE_WARNINGS(error) AC_PROG_CC AC_ISC_POSIX diff --git a/src/Makefile.am b/src/Makefile.am index fe14ec2d..3ed344c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,6 +49,7 @@ test_reader_LDADD = \ install-exec-local: rm -f $(DESTDIR)$(bindir)/gnome-help ln -s yelp $(DESTDIR)$(bindir)/gnome-help + ln -sf yelp $(DESTDIR)$(bindir)/gman yelp-marshal.h: yelp-marshal.list cd $(srcdir) && \ @@ -106,7 +107,6 @@ yelp_LDADD = \ gnome_yelp_idl_sources = \ GNOME_Yelp-stubs.c \ GNOME_Yelp-skels.c \ - GNOME_Yelp.in \ GNOME_Yelp-common.c \ GNOME_Yelp.h diff --git a/src/yelp-main.c b/src/yelp-main.c index cefa2d8b..461584ed 100644 --- a/src/yelp-main.c +++ b/src/yelp-main.c @@ -265,13 +265,17 @@ main (int argc, char **argv) gchar *url = NULL; GnomeClient *client; gboolean flag = FALSE; + gboolean gman = FALSE; bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); g_thread_init (NULL); - - if (argc >= 2) { + + if (strcmp (argv[0], "gman") == 0) { + url = g_strdup ("toc:man"); + } + else if (argc >= 2) { url = g_strdup (argv[1]); } else { url = g_strdup (""); |