diff options
| author | Jody Goldberg <jody@src.gnome.org> | 2002-02-08 21:58:21 +0000 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2002-02-08 21:58:21 +0000 |
| commit | 81e47e13730febadf1ea3e3fdcae8e02d20d38a9 (patch) | |
| tree | 32cb6f4702fe446ea804947fa4479b5431a3d24a | |
| parent | 87531bf1b0e2564af10f7c98ee02b31cc0c9c4ff (diff) | |
| download | gnome-common-gal-2.tar.gz | |
Merge in changes between GAL_2_ANCHOR and GAL_2_ANCHOR_MERGE1gal-2
svn path=/branches/gal-2/; revision=2303
| -rw-r--r-- | macros/ChangeLog | 15 | ||||
| -rw-r--r-- | macros/aclocal-include.m4 | 2 | ||||
| -rw-r--r-- | macros/gnome-pilot.m4 | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 47ee610..33d4c57 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,18 @@ +2001-12-11 Israel Escalante <israel@ximian.com> + + * Release 0.10.0. + +2001-11-28 Sebastian Rittau <srittau@jroger.in-berlin.de> + + * gnome-pilot.m4 (PILOT_LINK_HOOK): + Fixed a typo: inlude -> include + +2001-10-24 jacob berkman <jacob@ximian.com> + + * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): do a test that is not + only always false, but works with autoconf 2.52 and isn't trying + to be too smart + 2001-10-02 Darin Adler <darin@bentspoon.com> * autogen.sh: Complete intltool support. diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4 index abf6533..43f9dbc 100644 --- a/macros/aclocal-include.m4 +++ b/macros/aclocal-include.m4 @@ -8,7 +8,7 @@ dnl AM_ACLOCAL_INCLUDE(macrodir) AC_DEFUN([AM_ACLOCAL_INCLUDE], [ - AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) + AM_CONDITIONAL(INSIDE_GNOME_COMMON, false) test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4 index dcf6bed..d8ce960 100644 --- a/macros/gnome-pilot.m4 +++ b/macros/gnome-pilot.m4 @@ -39,7 +39,7 @@ AC_DEFUN([PILOT_LINK_HOOK],[ AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock" piversion_include="libpisock/pi-version.h" - incdir="/usr/inlude/libpisock" + incdir="/usr/include/libpisock" ], [ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock" piversion_include="$prefix/include/pi-version.h" |