diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-11-10 10:23:49 +0000 |
|---|---|---|
| committer | Mark McLoughlin <mark@skynet.ie> | 2004-11-10 10:23:49 +0000 |
| commit | d5afc330fb82c6f55c0e5bbfd40d46d3cb8745af (patch) | |
| tree | 38455b5fdfa0aed4e6c3ebf8ce61639fb32bc2bd | |
| parent | 5fb8be50dd361f8de4ea3529ed101dad0f0596e7 (diff) | |
| download | startup-notification-d5afc330fb82c6f55c0e5bbfd40d46d3cb8745af.tar.gz | |
use and require automake 1.7.
modernise a bit.
remove, not needed anymore.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | acconfig.h | 10 | ||||
| -rwxr-xr-x | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.in | 17 |
4 files changed, 22 insertions, 21 deletions
@@ -1,3 +1,11 @@ +2004-11-10 Mark McLoughlin <mark@skynet.ie> + + * autogen.sh: use and require automake 1.7. + + * configure.in: modernise a bit. + + * acconfig.h: remove, not needed anymore. + 2004-10-27 Havoc Pennington <hp@redhat.com> * patch from Elijah Newren diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index e100ec2..0000000 --- a/acconfig.h +++ /dev/null @@ -1,10 +0,0 @@ -#undef PACKAGE -#undef VERSION -#undef HAVE_CATGETS -#undef HAVE_GETTEXT -#undef HAVE_LC_MESSAGES -#undef HAVE_STPCPY -#undef ENABLE_NLS -#undef HAVE_PTHREAD_H -#undef GETTEXT_PACKAGE -#undef SANE_MALLOC_PROTOS @@ -21,8 +21,8 @@ DIE=0 DIE=1 } -AUTOMAKE=automake-1.4 -ACLOCAL=aclocal-1.4 +AUTOMAKE=automake-1.7 +ACLOCAL=aclocal-1.7 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { AUTOMAKE=automake @@ -32,7 +32,7 @@ ACLOCAL=aclocal-1.4 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" + echo "Get http://ftp.gnu.org/pub/gnu/automake/automake-1.7.9.tar.gz" echo "(or a newer version if it is available)" DIE=1 } @@ -59,7 +59,7 @@ $ACLOCAL $ACLOCAL_FLAGS # optionally feature autoheader (autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader -$AUTOMAKE -a $am_opt +$AUTOMAKE --gnu --add-missing autoconf || echo "autoconf failed - version 2.5x is probably required" cd $ORIGDIR diff --git a/configure.in b/configure.in index ad0b0ee..b9fe3ba 100644 --- a/configure.in +++ b/configure.in @@ -1,18 +1,18 @@ -AC_INIT(libsn/sn-launchee.c) +AC_INIT([startup-notification], [0.8], + [http://www.freedesktop.org/Software/startup-notification]) +AC_CONFIG_SRCDIR(libsn/sn-launchee.c) +AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(startup-notification, 0.8) - # Honor aclocal flags -ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") AM_MAINTAINER_MODE AC_PROG_CC AC_ISC_POSIX AC_HEADER_STDC -AC_ARG_PROGRAM AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL @@ -53,7 +53,8 @@ if test "x$GCC" = "xyes"; then my_free_p = 0; my_realloc_p = 0; ], - AC_DEFINE(SANE_MALLOC_PROTOS) + AC_DEFINE(SANE_MALLOC_PROTOS, 1, + [Define if you have correct malloc prototypes]) SANE_MALLOC_PROTOS=yes) fi AC_MSG_RESULT($SANE_MALLOC_PROTOS) @@ -82,10 +83,12 @@ LIBSN_LIBS=" $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" AC_SUBST(LIBSN_CFLAGS) AC_SUBST(LIBSN_LIBS) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile libsn/Makefile test/Makefile doc/Makefile libstartup-notification-1.0.pc ]) + +AC_OUTPUT |