Merge from trunk, configury not fixed yet.

[gnu-emacs] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c72e0904221b796c9f130e1b498c78526099678b..f76d0d3928d28261a3fed159f1ad37aa88947168 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,6 +9,10 @@ SUFFIXES =
 AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
 
+if BUILDING_FOR_WINDOWSNT
+include ../nt/gnulib.mk
+else
 include gnulib.mk
 
 libgnu_a_SOURCES += openat-die.c save-cwd.c
+endif