diff options
| author | bviktor <bviktor@outlook.com> | 2012-09-22 07:12:44 -0700 |
|---|---|---|
| committer | bviktor <bviktor@outlook.com> | 2012-09-22 07:12:44 -0700 |
| commit | 0515aabc668d713f6e96e823121896f9d14434e7 (patch) | |
| tree | d8fbef63445fd403427f6f656e4193047c4a7522 | |
| parent | 241e3bf56678758fdf11d82438886a793f68064c (diff) | |
| parent | e6a0532fc26a83e126907fbd7a16889873cceb89 (diff) | |
Merge pull request #96 from Arnavion/fix-broken-defines
Broken #defines after autoconf + configure due to misbehaving AS_AC_EXPAND macro
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0c711739..334c0dfa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -26,7 +26,7 @@ AC_DEFUN([AS_AC_EXPAND], dnl loop until it doesn't change anymore while true; do new_full_var="`eval echo $full_var`" - if test "x$new_full_var"="x$full_var"; then break; fi + if test "x$new_full_var" = "x$full_var"; then break; fi full_var=$new_full_var done diff --git a/configure.in b/configure.in index 4d09df6c..03fe1188 100644 --- a/configure.in +++ b/configure.in @@ -592,9 +592,8 @@ if test "x$dbus" = "xyes" ; then COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS" COMMON_CFLAGS="$COMMON_CFLAGS $DBUS_CFLAGS" AC_DEFINE(USE_DBUS) - AS_AC_EXPAND(DATADIR, $datadir) - DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" + AS_AC_EXPAND(DBUS_SERVICES_DIR, "$datadir/dbus-1/services") AC_SUBST(DBUS_SERVICES_DIR) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) fi @@ -911,10 +910,10 @@ test "x$exec_prefix" = xNONE && exec_prefix="$prefix" AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") -HEXCHATLIBDIR=`eval echo ${libdir}/hexchat` +AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat") AC_DEFINE_UNQUOTED(HEXCHATLIBDIR, "$HEXCHATLIBDIR") -HEXCHATSHAREDIR=`eval echo ${datadir}` +AS_AC_EXPAND(HEXCHATSHAREDIR, "$datadir") AC_DEFINE_UNQUOTED(HEXCHATSHAREDIR, "$HEXCHATSHAREDIR") dnl for plugins/xxx/Makefile.am |