diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2006-09-18 20:20:42 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-09-18 20:20:42 +0000 |
| commit | 6e26f51398dbcaee25c248a069050f6798a15ed1 (patch) | |
| tree | f78bb4019ac061813291e652faf34a9bbf7d8e19 | |
| parent | f3e6bfce782dc30116cd095c76b2825010c131cb (diff) | |
| download | vte-6e26f51398dbcaee25c248a069050f6798a15ed1.tar.gz | |
Bug 356616 – libvte broken with new autotools
2006-09-18 Ryan Lortie <desrt@desrt.ca>
Bug 356616 – libvte broken with new autotools
* configure.in:
* src/Makefile.am: Fix broken variable substitution for newer
versions of automake.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 24 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
3 files changed, 13 insertions, 25 deletions
@@ -1,3 +1,11 @@ +2006-09-18 Ryan Lortie <desrt@desrt.ca> + + Bug 356616 – libvte broken with new autotools + + * configure.in: + * src/Makefile.am: Fix broken variable substitution for newer + versions of automake. + 2006-09-13 Behdad Esfahbod <behdad@gnome.org> Bug 354024 – Suppress multiple warnings for missing control sequence diff --git a/configure.in b/configure.in index 644521cb..b5f185dc 100644 --- a/configure.in +++ b/configure.in @@ -398,30 +398,6 @@ AC_SUBST(PYTHONREV) AC_SUBST(PYTHONMODULES) AM_CONDITIONAL(BUILD_PYTHON_MODULES, $BUILD_PYTHON) -mylibdir=`eval echo $libdir` -mylibexecdir=`eval echo $libexecdir` -mydatadir=`eval echo $datadir` -if test x$exec_prefix = xNONE ; then - if test x$prefix = xNONE ; then - mylibdir=` echo $mylibdir | sed s,NONE,$ac_default_prefix,g` - mylibexecdir=` echo $mylibexecdir | sed s,NONE,$ac_default_prefix,g` - else - mylibdir=` echo $mylibdir | sed s,NONE,$prefix,g` - mylibexecdir=` echo $mylibexecdir | sed s,NONE,$prefix,g` - fi -fi -if test x$prefix = xNONE ; then - mydatadir=`echo $mydatadir | sed s,NONE,$ac_default_prefix,g` -fi -AC_DEFINE_UNQUOTED(PKGLIBDIR,"$mylibdir/$PACKAGE", - [The location where package-specific helpers can be found.]) -AC_DEFINE_UNQUOTED(LIBEXECDIR,"$mylibexecdir", - [The location where package-specific helpers can be found.]) -AC_DEFINE_UNQUOTED(DATADIR,"$mydatadir", - [The location where arch-independent package-specific data can be found.]) -AC_DEFINE_UNQUOTED(LOCALEDIR,"$mydatadir/locale", - [The location where locale data can be found.]) - AC_ARG_ENABLE(gnome-pty-helper, [AS_HELP_STRING(--enable-gnome-pty-helper,Build a setuid helper for opening ptys [default=yes])], enable_gnome_pty_helper="$enableval", enable_gnome_pty_helper=yes) if test "$enable_gnome_pty_helper" != no; then AC_DEFINE(VTE_USE_GNOME_PTY_HELPER,1,[Define if you intend to use gnome-pty-helper.]) diff --git a/src/Makefile.am b/src/Makefile.am index d90f6237..cda383bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,11 @@ EXTRA_DIST = \ unitable.JIS0212 \ unitable.KSX1001 -AM_CFLAGS = $(VTE_CFLAGS) $(FT2_CFLAGS) $(X_CFLAGS) -DG_DISABLE_ASSERT -DG_LOG_DOMAIN=\"Vte\" +AM_CFLAGS = $(VTE_CFLAGS) $(FT2_CFLAGS) $(X_CFLAGS) \ + -DG_DISABLE_ASSERT -DG_LOG_DOMAIN=\"Vte\" +AM_CPPFLAGS = -DDATADIR='"$(datadir)"' \ + -DLIBEXECDIR='"$(libexecdir)"' \ + -DLOCALEDIR='"$(localedir)"' AM_LDFLAGS = $(LDFLAGS) EXTRA_libvte_la_SOURCES = keysyms.c |