summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m42
-rw-r--r--configure.in19
2 files changed, 8 insertions, 13 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..89484f98 100644
--- a/configure.in
+++ b/configure.in
@@ -463,7 +463,6 @@ dnl ** LIBPROXY *********************************************************
 dnl *********************************************************************
 
 PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [libproxy=yes], [
-	AC_MSG_RESULT(no)
 	libproxy=no
 ])
 if test "x$libproxy" = "xyes" ; then
@@ -581,7 +580,6 @@ dnl #######################################################################
 
 if test "x$dbus" = "xyes" ; then
 	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0], dbus=yes, [
-		AC_MSG_RESULT(no)
 		dbus=no
 	])
 	AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
@@ -592,9 +590,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
@@ -606,7 +603,6 @@ dnl *********************************************************************
 
 if test "x$libnotify" = "xyes" ; then
 	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
-		AC_MSG_RESULT(no)
 		libnotify=no
 	])
 	if test "$libnotify" != "no" ; then
@@ -622,7 +618,6 @@ dnl *********************************************************************
 
 if test "$spell" = "gtkspell" ; then
 	PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [
-		AC_MSG_RESULT(no)
 		spell=no
 	])
 	if test "$spell" != "no" ; then
@@ -633,15 +628,15 @@ if test "$spell" = "gtkspell" ; then
 fi
 
 if test "$spell" = "libsexy" ; then
-	PKG_CHECK_MODULES([LIBSEXY], [libsexy >= 0.1.8], libsexy=yes, AC_MSG_RESULT(no))
-	if test "$libsexy" = "yes" ; then
+	PKG_CHECK_MODULES([LIBSEXY], [libsexy >= 0.1.8], [
+		libsexy=yes
 		GUI_LIBS="$GUI_LIBS $LIBSEXY_LIBS"
 		GUI_CFLAGS="$GUI_CFLAGS $LIBSEXY_CFLAGS"
 		AC_DEFINE(USE_LIBSEXY)
-	else
+	], [
 		dnl use builtin static one
 		spell="static"
-	fi
+	])
 fi
 
 if test "$spell" = "static" ; then
@@ -911,10 +906,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