DU 4.0D fiddles (Shing-Gene Yung<shing@cz3.nus.edu.sg>)

CVS patchset: 2899
CVS date: 1999/03/19 16:39:15

diff --git a/CHANGES b/CHANGES
index f3d77de..03b44fc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 2.91 -> 2.92
+       - DU 4.0D fiddles (Shing-Gene Yung<shing@cz3.nus.edu.sg>)
        - change support@redhat.com to rpm-list@redhat.com.
        - fix: with --target=i686, pass macro %_arch=i386.
        - fix: rpm --target=arch ... resurrected.

diff --git a/configure.in b/configure.in
index 67f3eea..63ce2af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -596,7 +596,7 @@ AC_SUBST(RPMCANONVENDOR)
 AC_SUBST(RPMCANONOS)
 
 if test -n "$LIBOBJS" ; then
-    LIBMISC="$(top_builddir)/misc/libmisc.a"
+    LIBMISC='$(top_builddir)/misc/libmisc.a'
 fi
 
 LOCALEDIR="`echo ${prefix}/share/locale`"

diff --git a/ftp.c b/ftp.c
index 24326a3..17c2f5e 100644 (file)
--- a/ftp.c
+++ b/ftp.c
@@ -39,10 +39,6 @@ int inet_aton(const char *cp, struct in_addr *inp);
 #define TIMEOUT_SECS 60
 #define BUFFER_SIZE 4096
 
-#ifndef IPPORT_FTP
-# define IPPORT_FTP 21
-#endif
-
 #if defined(USE_ALT_DNS) && USE_ALT_DNS 
 #include "dns.h"
 #endif

diff --git a/ftp.h b/ftp.h
index 856adf9..a39a08f 100644 (file)
--- a/ftp.h
+++ b/ftp.h
@@ -16,6 +16,10 @@ const char * ftpStrerror(int ftpErrno);
 #define FTPERR_NIC_ABORT_IN_PROGRESS -11
 #define FTPERR_UNKNOWN               -100
 
+#ifndef IPPORT_FTP
+# define IPPORT_FTP 21
+#endif
+
 void   urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount);
 int    httpOpen(urlinfo *u);
 int    ftpOpen(urlinfo *u);