[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget_mvp d4b785b: configury fixes
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget_mvp d4b785b: configury fixes |
Date: |
Sun, 15 Feb 2015 00:27:21 +0000 |
branch: xwidget_mvp
commit d4b785b688af69da962ef18f07713ed44e6b28a5
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
configury fixes
---
configure.ac | 5 +++--
src/Makefile.in | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index f3b2233..80f5213 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2529,7 +2529,7 @@ fi
HAVE_XWIDGETS=no
HAVE_WEBKIT=no
HAVE_GIR=no
-XWDIGETS_OBJ=
+XWIDGETS_OBJ=
if test "$with_xwidgets" != "no" && test "$USE_GTK_TOOLKIT" = "GTK3" &&
test "$window_system" != "none"
then
@@ -2557,8 +2557,9 @@ then
if test $HAVE_GIR = yes; then
AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.])
fi
- XWDIGETS_OBJ=xwidget.o
+ XWIDGETS_OBJ=xwidget.o
fi
+AC_SUBST(XWIDGETS_OBJ)
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
diff --git a/src/Makefile.in b/src/Makefile.in
index 1493e89..f92849f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -151,6 +151,9 @@ DBUS_LIBS = @DBUS_LIBS@
## dbusbind.o if HAVE_DBUS, else empty.
DBUS_OBJ = @DBUS_OBJ@
+## xwidgets.o if HAVE_XWIDGETS, else empty.
+XWIDGETS_OBJ = @XWIDGETS_OBJ@
+
address@hidden@
SETTINGS_CFLAGS = @SETTINGS_CFLAGS@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] xwidget_mvp d4b785b: configury fixes,
Joakim Verona <=