From: Joakim Verona Date: Sun, 15 Feb 2015 00:27:04 +0000 (+0100) Subject: configury fixes X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4b785b688af69da962ef18f07713ed44e6b28a5;p=emacs.git configury fixes --- diff --git a/configure.ac b/configure.ac index f3b22338323..80f521382ec 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 1493e891607..f92849f31b6 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@ + LIB_EXECINFO=@LIB_EXECINFO@ SETTINGS_CFLAGS = @SETTINGS_CFLAGS@