moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Don't compile getopt.c on systems that already have getopt_long.

Browse Source 
Published in <sxshersbs0w.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2001-11-17 20:52:18 -08:00
parent d408dec0bd
commit ee99e8998a
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com>
* configure.in: Check for getopt_long in libc.
2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com> 2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com>
* configure.in: Check for Solaris libmd5. * configure.in: Check for Solaris libmd5.

8
configure.in
View File

@ -177,6 +177,14 @@ AC_CHECK_FUNCS(gettimeofday mktime strptime)
AC_CHECK_FUNCS(strerror snprintf vsnprintf select signal symlink access isatty) AC_CHECK_FUNCS(strerror snprintf vsnprintf select signal symlink access isatty)
AC_CHECK_FUNCS(uname gethostname) AC_CHECK_FUNCS(uname gethostname)
dnl
dnl Check if we need to compile in getopt.c.
dnl
AC_CHECK_FUNC(getopt_long, [], [
GETOPT_OBJ='getopt$o'
])
AC_SUBST(GETOPT_OBJ)
dnl dnl
dnl Checks for libraries. dnl Checks for libraries.
dnl dnl

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com>
* Makefile.in: Conditionally compile getopt.o.
2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com> 2001-11-18 Hrvoje Niksic <hniksic@arsdigita.com>
* md5.h: Renamed to gnu-md5.h. * md5.h: Renamed to gnu-md5.h.

6
src/Makefile.in
View File

@ -60,9 +60,10 @@ ALLOCA = @ALLOCA@
MD5_OBJ = @MD5_OBJ@ MD5_OBJ = @MD5_OBJ@
OPIE_OBJ = @OPIE_OBJ@ OPIE_OBJ = @OPIE_OBJ@
SSL_OBJ = @SSL_OBJ@ SSL_OBJ = @SSL_OBJ@
GETOPT_OBJ = @GETOPT_OBJ@
OBJ = $(ALLOCA) cmpt$o connect$o cookies$o fnmatch$o ftp$o \ OBJ = $(ALLOCA) cmpt$o connect$o cookies$o fnmatch$o ftp$o \
ftp-basic$o ftp-ls$o $(OPIE_OBJ) getopt$o hash$o \ ftp-basic$o ftp-ls$o $(OPIE_OBJ) $(GETOPT_OBJ) hash$o \
headers$o host$o html-parse$o html-url$o http$o init$o \ headers$o host$o html-parse$o html-url$o http$o init$o \
log$o main$o $(MD5_OBJ) netrc$o rbuf$o recur$o res$o \ log$o main$o $(MD5_OBJ) netrc$o rbuf$o recur$o res$o \
retr$o safe-ctype$o snprintf$o $(SSL_OBJ) url$o \ retr$o safe-ctype$o snprintf$o $(SSL_OBJ) url$o \
@ -148,7 +149,6 @@ ftp-basic$o: wget.h utils.h rbuf.h connect.h host.h
ftp-ls$o: wget.h utils.h ftp.h url.h ftp-ls$o: wget.h utils.h ftp.h url.h
ftp-opie$o: wget.h ftp-opie$o: wget.h
ftp$o: wget.h utils.h url.h rbuf.h retr.h ftp.h connect.h host.h fnmatch.h netrc.h ftp$o: wget.h utils.h url.h rbuf.h retr.h ftp.h connect.h host.h fnmatch.h netrc.h
getopt$o: wget.h getopt.h
hash$o: wget.h utils.h hash.h hash$o: wget.h utils.h hash.h
headers$o: wget.h connect.h rbuf.h headers.h headers$o: wget.h connect.h rbuf.h headers.h
host$o: wget.h utils.h host.h url.h hash.h host$o: wget.h utils.h host.h url.h hash.h
@ -158,7 +158,7 @@ html$o: wget.h url.h utils.h ftp.h
http$o: wget.h utils.h url.h host.h rbuf.h retr.h headers.h cookies.h connect.h fnmatch.h netrc.h http$o: wget.h utils.h url.h host.h rbuf.h retr.h headers.h cookies.h connect.h fnmatch.h netrc.h
init$o: wget.h utils.h init.h host.h recur.h netrc.h init$o: wget.h utils.h init.h host.h recur.h netrc.h
log$o: wget.h utils.h log$o: wget.h utils.h
main$o: wget.h utils.h getopt.h init.h retr.h recur.h host.h cookies.h main$o: wget.h utils.h init.h retr.h recur.h host.h cookies.h
gnu-md5$o: wget.h gnu-md5.h gnu-md5$o: wget.h gnu-md5.h
mswindows$o: wget.h url.h mswindows$o: wget.h url.h
netrc$o: wget.h utils.h netrc.h init.h netrc$o: wget.h utils.h netrc.h init.h

4
src/main.c
View File

@ -45,13 +45,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "wget.h" #include "wget.h"
#include "utils.h" #include "utils.h"
#include "getopt.h"
#include "init.h" #include "init.h"
#include "retr.h" #include "retr.h"
#include "recur.h" #include "recur.h"
#include "host.h" #include "host.h"
#include "cookies.h" #include "cookies.h"
/* On GNU system this will include system-wide getopt.h. */
#include "getopt.h"
#ifndef PATH_SEPARATOR #ifndef PATH_SEPARATOR
# define PATH_SEPARATOR '/' # define PATH_SEPARATOR '/'
#endif #endif