Mercurial > gftp.yaz
changeset 202:7d7d8299610d
2003-6-25 Brian Masney <masneyb@gftp.org>
* acinclude.m4 - added AC_TYPE_SOCKLEN_T. Thanks to
Nathan Robertson <nathanr@nathanr.net> for pointing this out
* configure.in - call AC_TYPE_SOCKLEN_T. Updates to AC_OUTPUT
* lib/gftp.h - remove check for HAVE_SOCKLEN_T
* Makefile.am - formatting fixes
| author | masneyb |
|---|---|
| date | Thu, 26 Jun 2003 01:21:53 +0000 |
| parents | 0098dae654a5 |
| children | 95e669973a84 |
| files | ChangeLog Makefile.am acinclude.m4 configure.in lib/gftp.h |
| diffstat | 5 files changed, 31 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 26 01:04:12 2003 +0000 +++ b/ChangeLog Thu Jun 26 01:21:53 2003 +0000 @@ -1,3 +1,13 @@ +2003-6-25 Brian Masney <masneyb@gftp.org> + * acinclude.m4 - added AC_TYPE_SOCKLEN_T. Thanks to + Nathan Robertson <nathanr@nathanr.net> for pointing this out + + * configure.in - call AC_TYPE_SOCKLEN_T. Updates to AC_OUTPUT + + * lib/gftp.h - remove check for HAVE_SOCKLEN_T + + * Makefile.am - formatting fixes + 2003-6-25 Brian Masney <masneyb@gftp.org> * configure.in - added mk to ALL_LINGUAS @@ -1111,7 +1121,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.100 2003/06/26 01:04:08 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.101 2003/06/26 01:21:52 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/Makefile.am Thu Jun 26 01:04:12 2003 +0000 +++ b/Makefile.am Thu Jun 26 01:21:53 2003 +0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS= intl docs intl lib po src -EXTRA_DIST= config.rpath mkinstalldirs ChangeLog-old README THANKS TODO \ +SUBDIRS= docs intl lib po src +EXTRA_DIST= config.rpath mkinstalldirs ChangeLog-old README THANKS TODO \ gftp.spec.in debian/changelog debian/control debian/copyright \ debian/dirs debian/docs debian/menu debian/rules
--- a/acinclude.m4 Thu Jun 26 01:04:12 2003 +0000 +++ b/acinclude.m4 Thu Jun 26 01:21:53 2003 +0000 @@ -113,3 +113,19 @@ esac]) fi ]) + +# serial 1 + +# This function is derived from +# http://savannah.gnu.org/cgi-bin/viewcvs/gcc/gcc/libjava/configure.in?rev=1.142.2.7&content-type=text/vnd.viewcvs-markup + +AC_DEFUN(AC_TYPE_SOCKLEN_T, + [AC_MSG_CHECKING([for socklen_t in sys/socket.h]) + AC_TRY_COMPILE([#define _POSIX_PII_SOCKET + #include <sys/types.h> + #include <sys/socket.h>], [socklen_t x = 5;], + [AC_MSG_RESULT(yes)], + [AC_DEFINE(socklen_t,int) + AC_MSG_RESULT(no)]) + ]) +
--- a/configure.in Thu Jun 26 01:04:12 2003 +0000 +++ b/configure.in Thu Jun 26 01:21:53 2003 +0000 @@ -52,6 +52,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h) +AC_TYPE_SOCKLEN_T AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_SIZE_T @@ -261,4 +262,4 @@ AM_GNU_GETTEXT -AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile src/gftp src/Makefile src/gtk/Makefile src/text/Makefile gftp.spec) +AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile src/gftp src/Makefile src/gtk/Makefile src/text/Makefile gftp.spec intl/Makefile po/Makefile.in intl/Makefile po/Makefile.in)
--- a/lib/gftp.h Thu Jun 26 01:04:12 2003 +0000 +++ b/lib/gftp.h Thu Jun 26 01:21:53 2003 +0000 @@ -103,10 +103,6 @@ #define GFTP_GET_AI_FAMILY(request) AF_INET #endif -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif - /* We need the major() and minor() macros in the user interface. If they aren't defined by the system, we'll just define them here. */ #ifndef major