From: Wichert Akkerman <wakkerma@debian.org>
Date: Wed, 15 Dec 1999 15:25:23 +0000 (+0000)
Subject: autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/ systems without... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a4b312f194a06d8b2581d1ddb9dfd0b7f463fc;p=dpkg

autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/ systems without gettext installed
Makefile.in: remove the gettext-macros in distclean
utils/Makefile.in: fix clean target, link md5sum and start-stop-daemon optlib
optlib/*: getopt implementation for systems without GNU getopt.
---

diff --git a/ChangeLog b/ChangeLog
index 65e3b220..32885486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 15 16:08:47 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * autogen.sh: copy gettextm4, lcmessage.m4 and progtest.m4 to automake/
+    for systems without gettext installed
+  * Makefile.in: remove the gettext-macros in distclean
+  * utils/Makefile.in: fix clean target, link md5sum and start-stop-daemon
+    with optlib
+  * optlib/*: getopt implementation for systems without GNU getopt.
+
 Wed Dec 15 00:18:30 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * configure.in: Add option to disable building dselect
diff --git a/Makefile.in b/Makefile.in
index d496a2a1..446c852f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-
 VPATH		= @srcdir@
 srcdir		= @srcdir@
+top_srcdir	= @top_srcdir@
 
 VERSION		= $(shell cat verion-nr)
 
@@ -8,8 +8,8 @@ GENFILES	= version.h
 
 include Makefile.conf
 
-SUBDIRS		= include lib dpkg-deb split scripts utils main \
-		  utils doc @DSELECTDIR@ po methods
+SUBDIRS		= include lib optlib dpkg-deb split scripts utils main \
+		  utils @DSELECTDIR@ po methods doc
 
 all: version.h all-recursive
 
@@ -20,6 +20,7 @@ clean: clean-recursive
 
 distclean: clean distclean-recursive
 	rm -f Makefile.conf Makefile config.cache config.h config.log config.status
+	rm -f automake/gettext.m4 automake/progtest.m4 automake/lcmessage.m4
 
 version.h: version-nr
 	echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h
diff --git a/configure.in b/configure.in
index b1e15115..ab00fcdf 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_PREREQ([2.12])
 
 AC_INIT(include/dpkg.h.in)
 AC_CONFIG_HEADER(config.h)
+
 DSELECTDIR="dselect"
 AC_ARG_WITH(dselect,
 [  --with-dselect          the dselect package-management frontend],
@@ -135,6 +136,7 @@ include/Makefile
 dpkg-deb/Makefile
 split/Makefile
 lib/Makefile
+optlib/Makefile
 doc/Makefile
 doc/ja/Makefile
 scripts/Makefile
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 362c0190..99a7342f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -13,7 +13,8 @@ MD5_SOURCES		= md5sum.c md5.c
 MD5_OBJECTS		= $(patsubst %.c, %.o, $(MD5_SOURCES))
 MD5_MANPAGES		= md5sum.1
 
-GENFILES		= $(SSD_OBJECTS) start-stop-daemon
+GENFILES		= $(SSD_OBJECTS) start-stop-daemon \
+			  $(MD5_OBJECTS) md5sum
 
 .PHONY: all
 all:: start-stop-daemon md5sum
@@ -46,7 +47,7 @@ install-doc:
 	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
 	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
 
-start-stop-daemon: $(SSD_OBJECTS)
+start-stop-daemon: $(SSD_OBJECTS) ../optlib/libopt.a
 
-md5sum: $(MD5_OBJECTS)
+md5sum: $(MD5_OBJECTS) ../optlib/libopt.a