diff -r 30113bfbe723 -r b3afb9f1e801 lib/vpwentry/Makefile.in
--- a/lib/vpwentry/Makefile.in	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/vpwentry/Makefile.in	Sun Jan 20 00:22:09 2008 +0100
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,10 +46,9 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -58,12 +57,15 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 CC = @CC@
-CDBPROGS = @CDBPROGS@
-CDBSCRIPTS = @CDBSCRIPTS@
 CXX = @CXX@
+HAVE_LIB = @HAVE_LIB@
 HTML2TXT = @HTML2TXT@
+LIB = @LIB@
 LN = @LN@
+LTLIB = @LTLIB@
 LYNX = @LYNX@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
@@ -85,7 +87,7 @@
 INCLUDES = -I..
 EXTRA_DIST = vpwentry.h
 
-libvpwentry_a_SOURCES =  	auth.cc 	decode.cc 	defaults.cc 	export_env.cc 	from.cc 	from_old.cc 	from_ver1.cc 	from_ver2.cc 	to.cc 	vpwentry.cc
+libvpwentry_a_SOURCES =  	auth.cc 	decode.cc 	defaults.cc 	export_env.cc 	from.cc 	from_old.cc 	from_ver1.cc 	from_ver2.cc 	new.cc 	to.cc 	vpwentry.cc
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -99,7 +101,7 @@
 LIBS = @LIBS@
 libvpwentry_a_LIBADD = 
 libvpwentry_a_OBJECTS =  auth.o decode.o defaults.o export_env.o from.o \
-from_old.o from_ver1.o from_ver2.o to.o vpwentry.o
+from_old.o from_ver1.o from_ver2.o new.o to.o vpwentry.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -110,7 +112,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(libvpwentry_a_SOURCES)
 OBJECTS = $(libvpwentry_a_OBJECTS)
@@ -216,9 +218,6 @@
 defaults.o: defaults.cc ../../config.h vpwentry.h ../mystring/mystring.h \
 	../mystring/rep.h ../mystring/iter.h ../mystring/join.h \
 	../misc/strlist.h ../config/configrc.h
-disable.o: disable.cc ../../config.h vpwentry.h ../mystring/mystring.h \
-	../mystring/rep.h ../mystring/iter.h ../mystring/join.h \
-	../misc/strlist.h ../misc/stat_fns.h
 export_env.o: export_env.cc ../../config.h vpwentry.h \
 	../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \
 	../mystring/join.h ../misc/strlist.h ../misc/exec.h \
@@ -229,16 +228,15 @@
 from_old.o: from_old.cc ../../config.h vpwentry.h ../mystring/mystring.h \
 	../mystring/rep.h ../mystring/iter.h ../mystring/join.h \
 	../misc/strlist.h
-from_uint.o: from_uint.cc ../../config.h ../misc/strtou.h
 from_ver1.o: from_ver1.cc ../../config.h vpwentry.h \
 	../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \
 	../mystring/join.h ../misc/strlist.h
 from_ver2.o: from_ver2.cc ../../config.h vpwentry.h \
 	../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \
 	../mystring/join.h ../misc/strlist.h
-is_enabled.o: is_enabled.cc ../../config.h vpwentry.h \
-	../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \
-	../mystring/join.h ../misc/strlist.h ../misc/stat_fns.h
+new.o: new.cc ../../config.h vpwentry.h ../mystring/mystring.h \
+	../mystring/rep.h ../mystring/iter.h ../mystring/join.h \
+	../misc/strlist.h
 to.o: to.cc ../../config.h vpwentry.h ../mystring/mystring.h \
 	../mystring/rep.h ../mystring/iter.h ../mystring/join.h \
 	../misc/strlist.h ../misc/utoa.h ../vdomain/vdomain.h \
@@ -270,7 +268,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: