diff options
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 28 | ||||
| -rw-r--r-- | source4/heimdal_build/config.m4 | 9 | ||||
| -rw-r--r-- | source4/lib/replace/win32.m4 | 2 | ||||
| -rwxr-xr-x | source4/script/configure_check_unused.pl | 8 |
4 files changed, 21 insertions, 26 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index 53010bef5a..275c001fdd 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -60,16 +60,14 @@ AC_CHECK_HEADERS(compat.h) AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/mode.h) AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h sys/socket.h) AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h) -AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h) +AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/statvfs.h stdarg.h sys/sockio.h) AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h dlfcn.h) AC_CHECK_HEADERS(sys/syslog.h syslog.h) AC_CHECK_HEADERS(stdint.h locale.h) AC_CHECK_HEADERS(shadow.h netdb.h netinet/in.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h) -AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h) -AC_CHECK_HEADERS(stropts.h) +AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h) AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h) AC_CHECK_HEADERS(sys/acl.h) -AC_CHECK_HEADERS(windows.h winsock2.h ws2tcpip.h) AC_TYPE_SIGNAL AC_TYPE_UID_T @@ -187,23 +185,19 @@ if test x"$ac_cv_func_connect" = x"no"; then fi fi -AC_CHECK_FUNCS(dlopen dlclose dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strtoull strtouq strerror chown fchown chmod fchmod chroot link mknod mknod64) -AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync bzero memset strlcpy strlcat setpgid) -AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid) -AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent) -AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf realpath) -AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate chsize) -AC_CHECK_FUNCS(setluid getpwanam setlinebuf) -AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink) -AC_CHECK_FUNCS(syslog vsyslog getgrouplist timegm backtrace) +AC_CHECK_FUNCS(dlopen dlsym dlerror waitpid getcwd strdup strndup strnlen strtoul strtoull strtouq strerror chroot) +AC_CHECK_FUNCS(bzero memset strlcpy strlcat) +AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid pipe crypt16 getauthuid) +AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent) +AC_CHECK_FUNCS(initgroups) +AC_CHECK_FUNCS(setgroups sysconf mktime rename ftruncate chsize) +AC_CHECK_FUNCS(getpwanam setlinebuf) +AC_CHECK_FUNCS(srandom random srand rand setenv usleep) +AC_CHECK_FUNCS(syslog vsyslog timegm backtrace) AC_CHECK_FUNCS(setbuffer) -AC_CHECK_FUNCS(getdents) AC_CHECK_FUNCS(pread pwrite) -# needed for lib/charcnv.c -AC_CHECK_FUNCS(setlocale) - ##################################### # we might need the resolv library on some systems AC_CHECK_LIB(resolv, dn_expand) diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4 index b4aa1f65cb..30c6ceff76 100644 --- a/source4/heimdal_build/config.m4 +++ b/source4/heimdal_build/config.m4 @@ -1,9 +1,8 @@ -AC_CHECK_HEADERS(sys/file.h signal.h errno.h crypt.h curses.h sys/bittypes.h) -AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h) -AC_CHECK_HEADERS(sys/utsname.h termcap.h term.h timezone.h time.h ttyname.h) +AC_CHECK_HEADERS(sys/file.h crypt.h curses.h) +AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/un.h) +AC_CHECK_HEADERS(sys/utsname.h termcap.h timezone.h ttyname.h) -AC_CHECK_FUNCS(setitimer uname umask unsetenv socket sendmsg putenv atexit strsep) -AC_CHECK_FUNCS(strlwr strncasecmp strptime strsep_copy strtok_r strupr swab) +AC_CHECK_FUNCS(strupr) # these are disabled unless heimdal is found below SMB_MODULE_DEFAULT(KERBEROS_LIB, NOT) diff --git a/source4/lib/replace/win32.m4 b/source4/lib/replace/win32.m4 index 6b9c4e6b13..9ac84cdf2a 100644 --- a/source4/lib/replace/win32.m4 +++ b/source4/lib/replace/win32.m4 @@ -1,4 +1,4 @@ -AC_CHECK_HEADERS(direct.h) +AC_CHECK_HEADERS(direct.h windows.h winsock2.h ws2tcpip.h) ####################################### # Check for mkdir mode diff --git a/source4/script/configure_check_unused.pl b/source4/script/configure_check_unused.pl index 1bf433aafd..52d8deeb27 100755 --- a/source4/script/configure_check_unused.pl +++ b/source4/script/configure_check_unused.pl @@ -63,13 +63,15 @@ sub cfile_parse($$$) open(FI, $in) or die("Can't open $in"); my $ln = 0; my $line; - foreach($line = <FI>) { + while($line = <FI>) { $ln++; - if ($line =~ /\#([ \t]*)include ["<]([^">]+)/) { + $_ = $line; + if (/\#([ \t]*)include ["<]([^">]+)/) { $headers->{$2} = "$in:$ln"; } - foreach($line =~ /([A-Za-z0-9_]+)/g) { + $_ = $line; + while(/([A-Za-z0-9_]+)/g) { $symbols->{$1} = "$in:$ln"; } } |