diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-02-03 00:48:12 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-02-03 00:48:12 +0000 |
| commit | 70e30336d4bcdd5312a6ec654f9d767188a858d7 (patch) | |
| tree | 4aae6e036975c910913dfc83baa8c33054559fc0 /src/include | |
| parent | f7e44ca2cb06f20bded309bd5195e602c533867a (diff) | |
| download | krb5-70e30336d4bcdd5312a6ec654f9d767188a858d7.tar.gz krb5-70e30336d4bcdd5312a6ec654f9d767188a858d7.tar.xz krb5-70e30336d4bcdd5312a6ec654f9d767188a858d7.zip | |
* configure.in: Put #ifndef/#define/#endif wrapper into autoconf.h to protect
against multiple inclusions. Don't look for xom.h. Check for dlopen.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17079 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/configure.in | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 8c85be46dc..d6587b5593 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +2005-02-02 Ken Raeburn <raeburn@mit.edu> + + * configure.in: Put #ifndef/#define/#endif wrapper into + autoconf.h to protect against multiple inclusions. Don't look for + xom.h. Check for dlopen. + 2005-01-21 Ezra Peisach <epeisach@mit.edu> * k5-thread.h (k5_os_mutex_lock): Under Irix, invoke diff --git a/src/include/configure.in b/src/include/configure.in index f567d5f55c..d3ded13b6e 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -9,7 +9,7 @@ AC_PROG_INSTALL AC_PROG_AWK AC_PROG_LEX AC_C_CONST -AC_CHECK_FUNCS(strdup setvbuf inet_ntoa inet_aton seteuid setresuid setreuid setegid setresgid setregid setsid flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv gethostbyname2 getifaddrs getpwnam_r getpwuid_r gmtime_r localtime_r pthread_mutex_lock sched_yield) +AC_CHECK_FUNCS(strdup setvbuf inet_ntoa inet_aton seteuid setresuid setreuid setegid setresgid setregid setsid flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv gethostbyname2 getifaddrs getpwnam_r getpwuid_r gmtime_r localtime_r pthread_mutex_lock sched_yield dlopen) AC_CHECK_FUNCS( mkstemp) AC_HEADER_STDARG AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h sched.h) @@ -141,7 +141,7 @@ AC_CHECK_HEADER(termios.h,dnl AC_DEFINE(POSIX_TERMIOS,1,[Define if termios.h exists and tcsetattr exists]))]) dnl KRB5_SIGTYPE -AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h xom.h sys/uio.h sys/filio.h sys/select.h time.h paths.h) +AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h sys/types.h sys/file.h sys/param.h sys/stat.h sys/time.h netinet/in.h sys/uio.h sys/filio.h sys/select.h time.h paths.h) AC_HEADER_STDARG KRB5_AC_INET6 dnl @@ -283,11 +283,17 @@ fi AC_SUBST(maybe_kerberosIV) dnl AC_C_INLINE +AH_TOP([ +#ifndef KRB5_AUTOCONF_H +]) AH_BOTTOM([ #if defined(__GNUC__) && !defined(inline) /* Silence gcc pedantic warnings about ANSI C. */ # define inline __inline__ #endif + +#define KRB5_AUTOCONF_H +#endif ]) dnl dnl Not used yet, but let's find out what we've got on the platforms |