diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-21 17:37:08 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-21 17:37:08 +0000 |
| commit | 3f7b619b44ebdf4d89f8faff212240445ba31637 (patch) | |
| tree | c8a28b35ef9013709903ffeed1e876b8adafe612 /configure.in | |
| parent | 6b4bd7d2e930b1d57ee1e863ddc81a2b0b752a65 (diff) | |
acinclude.m4, configure.in: In recent autotools, ${datadir} is
defined in terms of ${datarootdir}, so EXPANDED_DATADIR needs to be
expanded recursively. Rather than fixing configure.in to do this, I
grabbed the AS_AC_EXPAND macro from autostars.sf.net, which seems to be
commonly used.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 51 |
1 files changed, 6 insertions, 45 deletions
diff --git a/configure.in b/configure.in index 811e2f20..bfeb90a7 100644 --- a/configure.in +++ b/configure.in @@ -1003,55 +1003,16 @@ fi AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes) AC_MSG_RESULT(yes) -#### Have to go $localstatedir->$prefix/var->/usr/local/var -#### someone please fix this a better way... +#### Have to go $localstatedir->$prefix/var->/usr/local/var #### find the actual value for $prefix that we'll end up with ## (I know this is broken and should be done in the Makefile, but ## that's a major pain and almost nobody actually seems to care) -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -## temporarily change prefix and exec_prefix -old_prefix=$prefix -prefix=$REAL_PREFIX - -if test "x$exec_prefix" = xNONE ; then - REAL_EXEC_PREFIX=$REAL_PREFIX -else - REAL_EXEC_PREFIX=$exec_prefix -fi -old_exec_prefix=$exec_prefix -exec_prefix=$REAL_EXEC_PREFIX - -## eval everything -LOCALSTATEDIR_TMP="$localstatedir" -EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` -AC_SUBST(EXPANDED_LOCALSTATEDIR) - -SYSCONFDIR_TMP="$sysconfdir" -EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` -AC_SUBST(EXPANDED_SYSCONFDIR) - -BINDIR_TMP="$bindir" -EXPANDED_BINDIR=`eval echo $BINDIR_TMP` -AC_SUBST(EXPANDED_BINDIR) - -LIBDIR_TMP="$libdir" -EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` -AC_SUBST(EXPANDED_LIBDIR) - -DATADIR_TMP="$datadir" -EXPANDED_DATADIR=`eval echo $DATADIR_TMP` -AC_SUBST(EXPANDED_DATADIR) - -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix +AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir") +AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir") +AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir") +AS_AC_EXPAND(EXPANDED_LIBDIR, "$libdir") +AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") #### Check our operating system operating_system=unknown |