From e64d01d199a043923a767e0a42856caa11b59729 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 27 Sep 2001 12:43:13 +0000 Subject: Fix the bad GETOPT_LONG patch. svn path=/trunk/; revision=3495 --- NEWS | 2 ++ acconfig.h | 2 +- configure.in | 3 ++- options.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 8b3890b5..800743ee 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ (The `lines' figures total .c, .h, .l, and .y files under version control.) +* Fix configuration error in handling of long options. + fetchmail-5.9.2 (Wed Sep 26 12:47:00 EDT 2001), 21118 lines: * Enable code to build on Solaris again (long options won't work). diff --git a/acconfig.h b/acconfig.h index 5a3d2e82..1c0a046d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -19,7 +19,7 @@ #undef HAVE_CATGETS /* Define if you have GNU's getopt family of functions. */ -#undef HAVE_GETOPTLONG +#undef HAVE_GETOPT_LONG /* Define as 1 if you have gettext and don't want to use GNU gettext. */ #undef HAVE_GETTEXT diff --git a/configure.in b/configure.in index 710a93fc..de4ddffc 100644 --- a/configure.in +++ b/configure.in @@ -129,7 +129,8 @@ AC_SUBST(EXTRAOBJ) AC_CHECK_FUNCS(tcsetattr stty setsid geteuid seteuid gethostbyname \ res_search herror strrchr strerror setlinebuf syslog \ snprintf vprintf vsnprintf vsyslog \ - atexit inet_aton strftime setrlimit socketpair sigprocmask sigaction) + atexit inet_aton strftime setrlimit socketpair sigprocmask sigaction \ + getopt_long) # Under Red Hat 4.0 (and many other Linuxes) -lresolv is seriously flaky # and breaks gethostbyname(2). It's better to use the bind stuff in the C diff --git a/options.c b/options.c index c51e9d72..ee320d95 100644 --- a/options.c +++ b/options.c @@ -276,7 +276,7 @@ struct query *ctl; /* option record to be initialized */ ctl->smtp_socket = -1; while (!errflag && -#ifdef HAVE_GETOPTLONG +#ifdef HAVE_GETOPT_LONG (c = getopt_long(argc,argv,shortoptions, longoptions, &option_index)) != -1) #else -- cgit v1.2.3