diff options
author | Guy Harris <guy@alum.mit.edu> | 1998-11-15 05:40:23 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 1998-11-15 05:40:23 +0000 |
commit | a2fe97acd2ac655bb7163f1b2feb41298f4d1058 (patch) | |
tree | 4436b1e50b0cc93e209b5e24096fa7b3e6c8f3a7 /aclocal.m4 | |
parent | 86bf1fc851b5564f5700a937de3213e8354aa52e (diff) | |
download | wireshark-a2fe97acd2ac655bb7163f1b2feb41298f4d1058.tar.gz wireshark-a2fe97acd2ac655bb7163f1b2feb41298f4d1058.tar.bz2 wireshark-a2fe97acd2ac655bb7163f1b2feb41298f4d1058.zip |
Back out some changes accidentally commited by the previous checkin - I
forgot that CVS, unlike Perforce, doesn't let you edit the list of files
it gives you in the editor and cause those files *not* to be committed,
it requires you to specify the files to be committed if you only want
some files committed.
svn path=/trunk/; revision=92
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index aa8e872e78..2052094092 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -10,76 +10,6 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. -dnl Macros that test for specific features. -dnl This file is part of Autoconf. -dnl Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception, the Free Software Foundation gives unlimited -dnl permission to copy, distribute and modify the configure scripts that -dnl are the output of Autoconf. You need not follow the terms of the GNU -dnl General Public License when using or distributing such scripts, even -dnl though portions of the text of Autoconf appear in them. The GNU -dnl General Public License (GPL) does govern all other use of the material -dnl that constitutes the Autoconf program. -dnl -dnl Certain portions of the Autoconf source text are designed to be copied -dnl (in certain cases, depending on the input) into the output of -dnl Autoconf. We call these the "data" portions. The rest of the Autoconf -dnl source text consists of comments plus executable code that decides which -dnl of the data portions to output in any given case. We call these -dnl comments and executable code the "non-data" portions. Autoconf never -dnl copies any of the non-data portions into its output. -dnl -dnl This special exception to the GPL applies to versions of Autoconf -dnl released by the Free Software Foundation. When you make and -dnl distribute a modified version of Autoconf, you may extend this special -dnl exception to the GPL to apply to your modified version as well, *unless* -dnl your modified version has the potential to copy into its output some -dnl of the text that was the non-data portion of the version that you started -dnl with. (In other words, unless your change moves or copies text from -dnl the non-data portions to the data portions.) If your modification has -dnl such potential, you must delete any notice of this special exception -dnl to the GPL from your modified version. -dnl -dnl Written by David MacKenzie, with help from -dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, -dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. - -dnl AC_STRUCT_ST_BLKSIZE extracted from the file in qustion, -dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into -dnl AC_ETHEREAL_STRUCT_SA_LEN, which checks if "struct sockaddr" -dnl has the 4.4BSD "sa_len" member, and defines HAVE_SA_LEN; that's -dnl what's in this file. -dnl Done by Guy Harris <guy@netapp.com> on 1998-11-14. - -dnl ### Checks for structure members - - -AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN, -[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len, -[AC_TRY_COMPILE([#include <sys/types.h> -#include <sys/socket.h>], [struct sockaddr s; s.sa_len;], -ac_cv_ethereal_struct_sa_len=yes, ac_cv_ethereal_struct_sa_len=no)]) -if test $ac_cv_ethereal_struct_sa_len = yes; then - AC_DEFINE(HAVE_SA_LEN) -fi -]) - # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. |