157c157
< 	$(top_srcdir)/gl/m4/realloc.m4 \
---
> 	$(top_srcdir)/gl/m4/realloc.m4 $(top_srcdir)/gl/m4/regex.m4 \
207,212c207,214
< 	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
< 	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
< 	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
< 	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
< 	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
< 	$(top_srcdir)/configure.ac
---
> 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/longlong.m4 \
> 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
> 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
> 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
> 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
> 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/wchar_t.m4 \
> 	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
> 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
667d668
< 	/mingw/lib/libregex.la \
746,748c747,749
< 	src/libpspp/integer-format.$(OBJEXT) \
< 	src/libpspp/float-format.$(OBJEXT) \
< 	tests/dissect-sysfile.$(OBJEXT)
---
> 	src/libpspp/tests_dissect_sysfile-integer-format.$(OBJEXT) \
> 	src/libpspp/tests_dissect_sysfile-float-format.$(OBJEXT) \
> 	tests/tests_dissect_sysfile-dissect-sysfile.$(OBJEXT)
994,997d994
< CXX = g++
< CXXCPP = g++ -E
< CXXDEPMODE = depmode=gcc3
< CXXFLAGS = -g -O2
1003c1000
< ECHO = echo
---
> DUMPBIN = 
1017,1018c1014
< F77 = 
< FFLAGS = 
---
> FGREP = /bin/grep -F
1033a1030
> GNULIB_CLOSE = 0
1036a1034
> GNULIB_FCLOSE = 0
1056a1055
> GNULIB_GETDTABLESIZE = 0
1180a1180
> HAVE_GETDTABLESIZE = 1
1245a1246
> LD = /mingw/bin/ld
1256a1258
> LTALLOCA = 
1285a1288
> NM = /mingw/bin/nm
1315a1319
> REPLACE_CLOSE = 0
1316a1321
> REPLACE_FCLOSE = 0
1392a1398
> UNISTD_H_HAVE_WINSOCK2_H = 0
1413,1414c1419
< ac_ct_CXX = g++
< ac_ct_F77 = 
---
> ac_ct_DUMPBIN = 
1432,1433c1437,1438
< gl_LIBOBJS =  asnprintf.o asprintf.o basename.o c-strtod.o canonicalize-lgpl.o dirname.o error.o exitfail.o fprintf.o frexp.o frexpl.o fseeko.o ftello.o getdelim.o gethostname.o getline.o getlogin_r.o imaxtostr.o isfinite.o isnand.o isnanf.o isnanl.o lseek.o malloc.o md4.o memcasecmp.o mempcpy.o mkstemp.o offtostr.o printf.o printf-args.o printf-parse.o readlink.o realloc.o safe-read.o safe-write.o sigaction.o signbitd.o signbitf.o signbitl.o sigprocmask.o snprintf.o sprintf.o stpcpy.o strerror.o strftime.o stripslash.o strndup.o strnlen.o strsep.o strtod.o strtok_r.o tempname.o time_r.o tmpfile.o uinttostr.o umaxtostr.o vasnprintf.o vasprintf.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o wcwidth.o xmalloc.o
< gl_LTLIBOBJS =  asnprintf.lo asprintf.lo basename.lo c-strtod.lo canonicalize-lgpl.lo dirname.lo error.lo exitfail.lo fprintf.lo frexp.lo frexpl.lo fseeko.lo ftello.lo getdelim.lo gethostname.lo getline.lo getlogin_r.lo imaxtostr.lo isfinite.lo isnand.lo isnanf.lo isnanl.lo lseek.lo malloc.lo md4.lo memcasecmp.lo mempcpy.lo mkstemp.lo offtostr.lo printf.lo printf-args.lo printf-parse.lo readlink.lo realloc.lo safe-read.lo safe-write.lo sigaction.lo signbitd.lo signbitf.lo signbitl.lo sigprocmask.lo snprintf.lo sprintf.lo stpcpy.lo strerror.lo strftime.lo stripslash.lo strndup.lo strnlen.lo strsep.lo strtod.lo strtok_r.lo tempname.lo time_r.lo tmpfile.lo uinttostr.lo umaxtostr.lo vasnprintf.lo vasprintf.lo vfprintf.lo vprintf.lo vsnprintf.lo vsprintf.lo wcwidth.lo xmalloc.lo
---
> gl_LIBOBJS =  asnprintf.o asprintf.o basename.o c-strtod.o canonicalize-lgpl.o dirname.o error.o exitfail.o fprintf.o frexp.o frexpl.o fseeko.o ftello.o getdelim.o gethostname.o getline.o getlogin_r.o imaxtostr.o isfinite.o isnand.o isnanf.o isnanl.o lseek.o malloc.o md4.o memcasecmp.o mempcpy.o mkstemp.o offtostr.o printf.o printf-args.o printf-parse.o readlink.o realloc.o regex.o safe-read.o safe-write.o sigaction.o signbitd.o signbitf.o signbitl.o sigprocmask.o snprintf.o sprintf.o stpcpy.o strerror.o strftime.o stripslash.o strndup.o strnlen.o strsep.o strtod.o strtok_r.o tempname.o time_r.o tmpfile.o uinttostr.o umaxtostr.o vasnprintf.o vasprintf.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o wcwidth.o xmalloc.o
> gl_LTLIBOBJS =  asnprintf.lo asprintf.lo basename.lo c-strtod.lo canonicalize-lgpl.lo dirname.lo error.lo exitfail.lo fprintf.lo frexp.lo frexpl.lo fseeko.lo ftello.lo getdelim.lo gethostname.lo getline.lo getlogin_r.lo imaxtostr.lo isfinite.lo isnand.lo isnanf.lo isnanl.lo lseek.lo malloc.lo md4.lo memcasecmp.lo mempcpy.lo mkstemp.lo offtostr.lo printf.lo printf-args.lo printf-parse.lo readlink.lo realloc.lo regex.lo safe-read.lo safe-write.lo sigaction.lo signbitd.lo signbitf.lo signbitl.lo sigprocmask.lo snprintf.lo sprintf.lo stpcpy.lo strerror.lo strftime.lo stripslash.lo strndup.lo strnlen.lo strsep.lo strtod.lo strtok_r.lo tempname.lo time_r.lo tmpfile.lo uinttostr.lo umaxtostr.lo vasnprintf.lo vasprintf.lo vfprintf.lo vprintf.lo vsnprintf.lo vsprintf.lo wcwidth.lo xmalloc.lo
1448a1454
> lt_ECHO = echo
2455a2462
> tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
3610c3617,3618
< src/libpspp/integer-format.$(OBJEXT): src/libpspp/$(am__dirstamp) \
---
> src/libpspp/tests_dissect_sysfile-integer-format.$(OBJEXT):  \
> 	src/libpspp/$(am__dirstamp) \
3612c3620,3621
< src/libpspp/float-format.$(OBJEXT): src/libpspp/$(am__dirstamp) \
---
> src/libpspp/tests_dissect_sysfile-float-format.$(OBJEXT):  \
> 	src/libpspp/$(am__dirstamp) \
3620,3621c3629,3630
< tests/dissect-sysfile.$(OBJEXT): tests/$(am__dirstamp) \
< 	tests/$(DEPDIR)/$(am__dirstamp)
---
> tests/tests_dissect_sysfile-dissect-sysfile.$(OBJEXT):  \
> 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
3900,3901d3908
< 	-rm -f src/libpspp/float-format.$(OBJEXT)
< 	-rm -f src/libpspp/integer-format.$(OBJEXT)
3932a3940,3941
> 	-rm -f src/libpspp/tests_dissect_sysfile-float-format.$(OBJEXT)
> 	-rm -f src/libpspp/tests_dissect_sysfile-integer-format.$(OBJEXT)
4066d4074
< 	-rm -f tests/dissect-sysfile.$(OBJEXT)
4077a4086
> 	-rm -f tests/tests_dissect_sysfile-dissect-sysfile.$(OBJEXT)
4230,4231d4238
< include src/libpspp/$(DEPDIR)/float-format.Po
< include src/libpspp/$(DEPDIR)/integer-format.Po
4262a4270,4271
> include src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Po
> include src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Po
4381c4390
< include tests/$(DEPDIR)/dissect-sysfile.Po
---
> include tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Po
6524a6534,6575
> src/libpspp/tests_dissect_sysfile-integer-format.o: src/libpspp/integer-format.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libpspp/tests_dissect_sysfile-integer-format.o -MD -MP -MF src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Tpo -c -o src/libpspp/tests_dissect_sysfile-integer-format.o `test -f 'src/libpspp/integer-format.c' || echo '$(srcdir)/'`src/libpspp/integer-format.c
> 	mv -f src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Tpo src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Po
> #	source='src/libpspp/integer-format.c' object='src/libpspp/tests_dissect_sysfile-integer-format.o' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libpspp/tests_dissect_sysfile-integer-format.o `test -f 'src/libpspp/integer-format.c' || echo '$(srcdir)/'`src/libpspp/integer-format.c
> 
> src/libpspp/tests_dissect_sysfile-integer-format.obj: src/libpspp/integer-format.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libpspp/tests_dissect_sysfile-integer-format.obj -MD -MP -MF src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Tpo -c -o src/libpspp/tests_dissect_sysfile-integer-format.obj `if test -f 'src/libpspp/integer-format.c'; then $(CYGPATH_W) 'src/libpspp/integer-format.c'; else $(CYGPATH_W) '$(srcdir)/src/libpspp/integer-format.c'; fi`
> 	mv -f src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Tpo src/libpspp/$(DEPDIR)/tests_dissect_sysfile-integer-format.Po
> #	source='src/libpspp/integer-format.c' object='src/libpspp/tests_dissect_sysfile-integer-format.obj' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libpspp/tests_dissect_sysfile-integer-format.obj `if test -f 'src/libpspp/integer-format.c'; then $(CYGPATH_W) 'src/libpspp/integer-format.c'; else $(CYGPATH_W) '$(srcdir)/src/libpspp/integer-format.c'; fi`
> 
> src/libpspp/tests_dissect_sysfile-float-format.o: src/libpspp/float-format.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libpspp/tests_dissect_sysfile-float-format.o -MD -MP -MF src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Tpo -c -o src/libpspp/tests_dissect_sysfile-float-format.o `test -f 'src/libpspp/float-format.c' || echo '$(srcdir)/'`src/libpspp/float-format.c
> 	mv -f src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Tpo src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Po
> #	source='src/libpspp/float-format.c' object='src/libpspp/tests_dissect_sysfile-float-format.o' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libpspp/tests_dissect_sysfile-float-format.o `test -f 'src/libpspp/float-format.c' || echo '$(srcdir)/'`src/libpspp/float-format.c
> 
> src/libpspp/tests_dissect_sysfile-float-format.obj: src/libpspp/float-format.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libpspp/tests_dissect_sysfile-float-format.obj -MD -MP -MF src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Tpo -c -o src/libpspp/tests_dissect_sysfile-float-format.obj `if test -f 'src/libpspp/float-format.c'; then $(CYGPATH_W) 'src/libpspp/float-format.c'; else $(CYGPATH_W) '$(srcdir)/src/libpspp/float-format.c'; fi`
> 	mv -f src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Tpo src/libpspp/$(DEPDIR)/tests_dissect_sysfile-float-format.Po
> #	source='src/libpspp/float-format.c' object='src/libpspp/tests_dissect_sysfile-float-format.obj' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libpspp/tests_dissect_sysfile-float-format.obj `if test -f 'src/libpspp/float-format.c'; then $(CYGPATH_W) 'src/libpspp/float-format.c'; else $(CYGPATH_W) '$(srcdir)/src/libpspp/float-format.c'; fi`
> 
> tests/tests_dissect_sysfile-dissect-sysfile.o: tests/dissect-sysfile.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_dissect_sysfile-dissect-sysfile.o -MD -MP -MF tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Tpo -c -o tests/tests_dissect_sysfile-dissect-sysfile.o `test -f 'tests/dissect-sysfile.c' || echo '$(srcdir)/'`tests/dissect-sysfile.c
> 	mv -f tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Tpo tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Po
> #	source='tests/dissect-sysfile.c' object='tests/tests_dissect_sysfile-dissect-sysfile.o' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_dissect_sysfile-dissect-sysfile.o `test -f 'tests/dissect-sysfile.c' || echo '$(srcdir)/'`tests/dissect-sysfile.c
> 
> tests/tests_dissect_sysfile-dissect-sysfile.obj: tests/dissect-sysfile.c
> 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_dissect_sysfile-dissect-sysfile.obj -MD -MP -MF tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Tpo -c -o tests/tests_dissect_sysfile-dissect-sysfile.obj `if test -f 'tests/dissect-sysfile.c'; then $(CYGPATH_W) 'tests/dissect-sysfile.c'; else $(CYGPATH_W) '$(srcdir)/tests/dissect-sysfile.c'; fi`
> 	mv -f tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Tpo tests/$(DEPDIR)/tests_dissect_sysfile-dissect-sysfile.Po
> #	source='tests/dissect-sysfile.c' object='tests/tests_dissect_sysfile-dissect-sysfile.obj' libtool=no \
> #	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
> #	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_dissect_sysfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_dissect_sysfile-dissect-sysfile.obj `if test -f 'tests/dissect-sysfile.c'; then $(CYGPATH_W) 'tests/dissect-sysfile.c'; else $(CYGPATH_W) '$(srcdir)/tests/dissect-sysfile.c'; fi`
>