]> git.eshelyaron.com Git - emacs.git/commitdiff
configury fixes
authorJoakim Verona <joakim@verona.se>
Sun, 15 Feb 2015 00:27:04 +0000 (01:27 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 15 Feb 2015 00:27:04 +0000 (01:27 +0100)
configure.ac
src/Makefile.in

index f3b22338323eaaa7ed8d1f06628a316c29dd6e31..80f521382ecada11f98dd29bb5d29ea101a6c822 100644 (file)
@@ -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
index 1493e891607771fd17a5ff7dedf9e26cd210117d..f92849f31b6ff48ddf9ee417e2c6536711fc665c 100644 (file)
@@ -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@