diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 04:50:00 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-25 04:50:00 +0000 |
commit | d96e5fd0c14c16317b52c246126240dd38f70760 (patch) | |
tree | 12209bd676defd0966efde966f4582866c93a932 | |
parent | 101af7f914a4c2a8ded573514343f01c6bca9037 (diff) |
System call ioperm is non-portable, so check for its existence in autoconf.
(Closes issue #13863)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@159025 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_rpt.c | 6 | ||||
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | include/asterisk/autoconfig.h.in | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 305161df4..b7dc13fdc 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -273,7 +273,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> #include <sys/file.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_IO_H #include <sys/io.h> +#endif #include <sys/vfs.h> #include <math.h> #include <netinet/in.h> @@ -3362,6 +3364,7 @@ struct dahdi_params par; { res = set_ic706(myrpt); } +#ifdef HAVE_IOPERM else if(!strcmp(myrpt->remote, remote_rig_rbi)) { if (ioperm(myrpt->p.iobase,1,1) == -1) @@ -3372,6 +3375,7 @@ struct dahdi_params par; } else res = setrbi(myrpt); } +#endif else if(!strcmp(myrpt->remote, remote_rig_kenwood)) { res = setkenwood(myrpt); @@ -10987,6 +10991,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) } rpt_mutex_lock(&myrpt->lock); } +#ifdef HAVE_IOPERM if ((!strcmp(myrpt->remote, remote_rig_rbi)) && (ioperm(myrpt->p.iobase,1,1) == -1)) { @@ -10994,6 +10999,7 @@ static int rpt_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "Cant get io permission on IO port %x hex\n",myrpt->p.iobase); return -1; } +#endif myrpt->remoteon = 1; #ifdef OLD_ASTERISK LOCAL_USER_ADD(u); @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 150557 . +# From configure.ac Revision: 151241 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -9767,7 +9767,8 @@ fi -for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h + +for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -14475,7 +14476,8 @@ done -for ac_func in asprintf atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf + +for ac_func in asprintf atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf ioperm do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/configure.ac b/configure.ac index 15ad83031..01b2c4058 100644 --- a/configure.ac +++ b/configure.ac @@ -223,7 +223,7 @@ AC_FUNC_ALLOCA AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h]) AC_SYS_LARGEFILE @@ -265,7 +265,7 @@ AC_FUNC_STRNLEN AC_FUNC_STRTOD AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF -AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf]) +AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf ioperm]) # some systems already have gethostbyname_r so we don't need to build ours in main/utils.c AC_SEARCH_LIBS(gethostbyname_r, [socket nsl]) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 4b41b921f..163d132df 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -178,6 +178,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `ioperm' function. */ +#undef HAVE_IOPERM + /* Define to 1 if your system has PMTU discovery on UDP sockets. */ #undef HAVE_IP_MTU_DISCOVER @@ -461,6 +464,9 @@ /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H +/* Define to 1 if you have the <sys/io.h> header file. */ +#undef HAVE_SYS_IO_H + /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_NDIR_H |