diff options
| -rw-r--r-- | Modules/pwdmodule.c | 4 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 8 | ||||
| -rw-r--r-- | config.h.in | 9 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 6 |
5 files changed, 24 insertions, 11 deletions
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c index 4b09312..b7e0c92 100644 --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -90,6 +90,7 @@ pwd_getpwnam(self, args) return mkpwent(p); } +#ifdef HAVE_GETPWENT static PyObject * pwd_getpwall(self, args) PyObject *self; @@ -113,11 +114,14 @@ pwd_getpwall(self, args) } return d; } +#endif static PyMethodDef pwd_methods[] = { {"getpwuid", pwd_getpwuid}, {"getpwnam", pwd_getpwnam}, +#ifdef HAVE_GETPWENT {"getpwall", pwd_getpwall}, +#endif {NULL, NULL} /* sentinel */ }; diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 3a49965..2b4e5c3 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -147,7 +147,7 @@ signal_handler(sig_num) -#ifndef DONT_HAVE_SIG_ALARM +#ifdef HAVE_ALARM static PyObject * signal_alarm(self, args) PyObject *self; /* Not used */ @@ -161,7 +161,7 @@ signal_alarm(self, args) } #endif -#ifndef DONT_HAVE_SIG_PAUSE +#ifdef HAVE_PAUSE static PyObject * signal_pause(self, args) PyObject *self; /* Not used */ @@ -254,12 +254,12 @@ signal_get_signal(self, args) /* List of functions defined in the module */ static PyMethodDef signal_methods[] = { -#ifndef DONT_HAVE_SIG_ALARM +#ifdef HAVE_ALARM {"alarm", signal_alarm}, #endif {"signal", signal_signal}, {"getsignal", signal_get_signal}, -#ifndef DONT_HAVE_SIG_PAUSE +#ifdef HAVE_PAUSE {"pause", signal_pause}, #endif {"default_int_handler", signal_default_int_handler}, diff --git a/config.h.in b/config.h.in index 30512ac..15c060b 100644 --- a/config.h.in +++ b/config.h.in @@ -151,6 +151,9 @@ /* The number of bytes in a long. */ #undef SIZEOF_LONG +/* Define if you have the alarm function. */ +#undef HAVE_ALARM + /* Define if you have the chown function. */ #undef HAVE_CHOWN @@ -193,6 +196,9 @@ /* Define if you have the getpid function. */ #undef HAVE_GETPID +/* Define if you have the getpwent function. */ +#undef HAVE_GETPWENT + /* Define if you have the gettimeofday function. */ #undef HAVE_GETTIMEOFDAY @@ -220,6 +226,9 @@ /* Define if you have the nice function. */ #undef HAVE_NICE +/* Define if you have the pause function. */ +#undef HAVE_PAUSE + /* Define if you have the plock function. */ #undef HAVE_PLOCK @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.61 +# From configure.in Revision: 1.63 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 @@ -2480,9 +2480,9 @@ fi # checks for library functions -for ac_func in chown clock dlopen execv flock fork ftime ftruncate \ - gethostname_r getpeername getpgrp getpid gettimeofday getwd \ - kill link lstat mkfifo nice plock putenv readlink \ +for ac_func in alarm chown clock dlopen execv flock fork ftime ftruncate \ + gethostname_r getpeername getpgrp getpid getpwent gettimeofday getwd \ + kill link lstat mkfifo nice pause plock putenv readlink \ select setgid setuid setsid setpgid setpgrp setvbuf \ sigaction siginterrupt sigrelse strftime symlink \ tcgetpgrp tcsetpgrp times truncate uname waitpid diff --git a/configure.in b/configure.in index 5e6e876..7acb9d5 100644 --- a/configure.in +++ b/configure.in @@ -379,9 +379,9 @@ DLINCLDIR=${dldir} LIBS="$LIBS -ldl -ldld"], AC_MSG_RESULT(no)) # checks for library functions -AC_CHECK_FUNCS(chown clock dlopen execv flock fork ftime ftruncate \ - gethostname_r getpeername getpgrp getpid gettimeofday getwd \ - kill link lstat mkfifo nice plock putenv readlink \ +AC_CHECK_FUNCS(alarm chown clock dlopen execv flock fork ftime ftruncate \ + gethostname_r getpeername getpgrp getpid getpwent gettimeofday getwd \ + kill link lstat mkfifo nice pause plock putenv readlink \ select setgid setuid setsid setpgid setpgrp setvbuf \ sigaction siginterrupt sigrelse strftime symlink \ tcgetpgrp tcsetpgrp times truncate uname waitpid) |