Skip to content

S
sofia-sip
Commit 58eab12a authored by Pekka Pessi's avatar Pekka Pessi
Browse files
Options

Cleaned AC_DEFINE comments in configure.ac and m4 files. 

darcs-hash:20060426174112-65a35-afdb723a27ac6c8468e1c945defc5ce2d8a9d1dd.gz
parent c0de240a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
configure.ac
View file @ 58eab12a
......@@ -62,9 +62,9 @@ SAC_SU
### internal modules
### ----------------
AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define as 1 always])
AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define as 1 if we use DNS library])
AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define as 1 if we use S/MIME library])
AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always])
AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define to 1 if we use DNS library])
AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define to 1 if we use S/MIME library])
dnl Disable stun by default while it is broken
AC_ARG_ENABLE(stun,
......@@ -76,9 +76,9 @@ if test x$enable_stun = xno ; then
elif test x${HAVE_OPENSSL} != x1 ; then
dnl compile STUN only if OPENSSL is available
AC_MSG_WARN([** TLS support for STUN disabled as OpenSSL headers and/or libraries were not found **])
AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define as 1 if we use STUN library])
AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library])
else
AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define as 1 if we use STUN library])
AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library])
fi
dnl Disable NTLM support by default
......@@ -87,13 +87,13 @@ AC_ARG_ENABLE(ntlm,
, enable_ntlm=no)
if test x$enable_ntlm = xyes ; then
AC_DEFINE([HAVE_SOFIA_NTLM], 1, [Define as 1 if we use NTLM library])
AC_DEFINE([HAVE_SOFIA_NTLM], 1, [Define to 1 if we use NTLM library])
fi
AM_CONDITIONAL([HAVE_NTLM], [test "x$enable_ntlm" = xyes])
AC_DEFINE([HAVE_SRTP], 0, [Define as 1 if we use SRTP])
AC_DEFINE([HAVE_UPNP], 0, [Define as 1 if we use UPnP])
AC_DEFINE([HAVE_SRTP], 0, [Define to 1 if we use SRTP])
AC_DEFINE([HAVE_UPNP], 0, [Define to 1 if we use UPnP])
### checks for header files
### -----------------------
......@@ -102,7 +102,7 @@ AC_HEADER_STDC
### checks for declarations
### -----------------------
AC_CHECK_DECL([SIGPIPE], [
AC_DEFINE([HAVE_SIGPIPE], 1, [Define as 1 if you have SIGPIPE])],,[
AC_DEFINE([HAVE_SIGPIPE], 1, [Define to 1 if you have SIGPIPE])],,[
#include <signal.h>
])
......@@ -111,9 +111,9 @@ AC_DEFINE([HAVE_SIGPIPE], 1, [Define as 1 if you have SIGPIPE])],,[
AC_TYPE_SIGNAL
AC_TYPE_LONGLONG([
AC_DEFINE([LLU], ["%llu"], [Define as format (%llu) for unsigned long long])dnl
AC_DEFINE([LLI], ["%lli"], [Define as format (%lli) for long long])dnl
AC_DEFINE([LLX], ["%llx"], [Define as format (%llx) for long long hex])dnl
AC_DEFINE([LLU], ["%llu"], [Define to format (%llu) for unsigned long long])dnl
AC_DEFINE([LLI], ["%lli"], [Define to format (%lli) for long long])dnl
AC_DEFINE([LLX], ["%llx"], [Define to format (%llx) for long long hex])dnl
])
### checks for structures
......
m4/sac-general.m4
View file @ 58eab12a
......@@ -165,7 +165,7 @@ AC_CACHE_CHECK([for sockaddr_in6],
ac_cv_sin6=yes, ac_cv_sin6=no)])
if test $ac_cv_sin6 = yes ;then
AC_DEFINE([HAVE_SIN6], 1,
[Define this as 1 if you have IPv6 structures and constants])
[Define to 1 if you have IPv6 structures and constants])
fi
])
......@@ -181,7 +181,7 @@ AC_CACHE_CHECK([for sa_len],
ac_cv_sa_len=yes,ac_cv_sa_len=no)])
if test "$ac_cv_sa_len" = yes ;then
AC_DEFINE([HAVE_SA_LEN], 1,
[Define this as 1 if you have sa_len in struct sockaddr])
[Define to 1 if you have sa_len in struct sockaddr])
fi
])
......@@ -201,7 +201,7 @@ int main() {
], ac_cv_flag_msg_nosignal=yes, ac_cv_flag_msg_nosignal=no)])
if test "$ac_cv_flag_msg_nosignal" = yes ; then
AC_DEFINE([HAVE_MSG_NOSIGNAL], 1,
[Define this as 1 if you have MSG_NOSIGNAL flag for send()])
[Define to 1 if you have MSG_NOSIGNAL flag for send()])
fi
])dnl
......@@ -221,7 +221,7 @@ int main() {
], ac_cv_flag_msg_errqueue=yes, ac_cv_flag_msg_errqueue=no)])
if test "$ac_cv_flag_msg_errqueue" = yes; then
AC_DEFINE([HAVE_MSG_ERRQUEUE], 1,
[Define this as 1 if you have MSG_ERRQUEUE flag for send()])
[Define to 1 if you have MSG_ERRQUEUE flag for send()])
fi
])dnl
......@@ -244,7 +244,7 @@ AC_TRY_COMPILE([
ac_cv_sys_ip_recverr=no)])
if test "$ac_cv_sys_ip_recverr" = yes ; then
AC_DEFINE([HAVE_IP_RECVERR], 1,
[Define this as 1 if you have IP_RECVERR in <netinet/in.h>])
[Define to 1 if you have IP_RECVERR in <netinet/in.h>])
fi
])dnl
......@@ -266,7 +266,7 @@ AC_TRY_COMPILE([
], ac_cv_sys_ipv6_recverr=yes, ac_cv_sys_ipv6_recverr=no)])
if test "$ac_cv_sys_ipv6_recverr" = yes ; then
AC_DEFINE([HAVE_IPV6_RECVERR], 1,
[Define this as 1 if you have IPV6_RECVERR in <netinet/in6.h>])
[Define to 1 if you have IPV6_RECVERR in <netinet/in6.h>])
fi
])dnl
......@@ -316,7 +316,7 @@ AC_DEFUN([AX_CHECK_HEADERS_IN],
do
AX_CHECK_HEADER_IN($ax_hdr, $2,
[ ax_tr_hdr=HAVE_`echo $ax_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
AC_DEFINE_UNQUOTED($ax_tr_hdr, 1, [Define 1 if you have the <$ax_hdr> header file])
AC_DEFINE_UNQUOTED($ax_tr_hdr, 1, [Define to 1 if you have the <$ax_hdr> header file])
$3], $4)dnl
done
])
......@@ -350,7 +350,7 @@ char *s = __func__;
}],
ac_cv_c_var_func=yes, ac_cv_c_var_func=no))
if test $ac_cv_c_var_func = "yes"; then
AC_DEFINE([HAVE_FUNC], 1, [Define as 1 if the C compiler supports __func__])
AC_DEFINE([HAVE_FUNC], 1, [Define to 1 if the C compiler supports __func__])
fi
])dnl
......@@ -362,7 +362,7 @@ AC_TRY_COMPILE(,
char *s = __FUNCTION__;
}], ac_cv_c_macro_function=yes, ac_cv_c_macro_function=no))
if test $ac_cv_c_macro_function = "yes"; then
AC_DEFINE([HAVE_FUNCTION], 1, [Define as 1 if the C compiler supports __FUNCTION__])
AC_DEFINE([HAVE_FUNCTION], 1, [Define to 1 if the C compiler supports __FUNCTION__])
fi
])dnl
......@@ -372,7 +372,7 @@ dnl ======================================================================
AC_DEFUN([AC_C_INLINE_DEFINE], [
AC_C_INLINE
case "$ac_cv_c_inline" in *inline* | yes)
AC_DEFINE([HAVE_INLINE], 1, [Define this as 1 if you have inlining compiler]) ;;
AC_DEFINE([HAVE_INLINE], 1, [Define to 1 if you have inlining compiler]) ;;
esac
])
......@@ -390,7 +390,7 @@ AC_TRY_COMPILE(,
ac_cv_c_keyword_struct=yes, ac_cv_c_keyword_struct=no))
if test $ac_cv_c_keyword_struct = "yes"; then
AC_DEFINE([HAVE_STRUCT_KEYWORDS], 1, [
Define this as 1 if your CC supports C99 struct initialization])
Define to 1 if your CC supports C99 struct initialization])
fi
])
......@@ -456,8 +456,8 @@ LIBS="-L\$(top_srcdir)/win32/pthread -lpthread -lws2_32 \
-lwsock32"
MINGW_ENVIRONMENT=1
AC_SUBST(MINGW_ENVIRONMENT)
AC_DEFINE([HAVE_MINGW], [1], [Define this as 1 if you are compiling in MinGW environment])
AC_DEFINE([HAVE_WIN32], [1], [Define this as 1 if you have WIN32])
AC_DEFINE([HAVE_MINGW], [1], [Define to 1 if you are compiling in MinGW environment])
AC_DEFINE([HAVE_WIN32], [1], [Define to 1 if you have WIN32])
fi
AM_CONDITIONAL([HAVE_MINGW32], [test "x$ac_cc_environment" != x])
])dnl
......@@ -469,7 +469,7 @@ dnl ======================================================================
AC_DEFUN([AC_TYPE_LONGLONG],[dnl
AC_CHECK_TYPE([long long],[dnl
AC_DEFINE([longlong], [long long], [Define as at least 64-bit int type])dnl
AC_DEFINE([longlong], [long long], [Define to a at least 64-bit int type])dnl
ifelse([$1], ,:, [$1])],[ifelse([$2], ,:, [$2])])])
dnl ======================================================================
......@@ -482,8 +482,8 @@ AC_CACHE_CHECK([/dev/urandom], [ac_cv_dev_urandom],
if test -r /dev/urandom; then ac_cv_dev_urandom=yes; fi])
if test $ac_cv_dev_urandom = yes; then
AC_DEFINE([HAVE_DEV_URANDOM], 1,
[Define this as 1 if you have /dev/urandom.])
[Define to 1 if you have /dev/urandom.])
AC_DEFINE([DEV_URANDOM], 1,
[Define this as the random number source name.])
[Define to the random number source name.])
fi
])
m4/sac-openssl.m4
View file @ 58eab12a
......@@ -22,11 +22,11 @@ if test "$with_openssl" != no ;then
AC_MSG_WARN(OpenSSL protocol library was not found))
if test x$HAVE_OPENSSL = x1; then
AC_DEFINE([HAVE_OPENSSL], 1, [Define this as 1 if you have OpenSSL])
AC_DEFINE([HAVE_OPENSSL], 1, [Define to 1 if you have OpenSSL])
fi
if test x$HAVE_TLS = x1; then
AC_DEFINE([HAVE_TLS], 1, [Define this as 1 if you have TLS])
AC_DEFINE([HAVE_TLS], 1, [Define to 1 if you have TLS])
fi
],
AC_MSG_WARN(OpenSSL include files were not found))
......
m4/sac-su2.m4
View file @ 58eab12a
......@@ -20,30 +20,30 @@ dnl Define compilation options for su_configure.h
case "$target" in
*-*-solaris?.* )
SAC_SU_DEFINE(__EXTENSIONS__, 1, [Define this in Solaris in order to get POSIX extensions.])
SAC_SU_DEFINE(__EXTENSIONS__, 1, [Define to 1 in Solaris in order to get POSIX extensions.])
;;
esac
case "$target" in
i?86-*-* )
SAC_SU_DEFINE(SU_HAVE_TAGSTACK, 1, [Define this as 1 if we can use tags directly from stack.])
SAC_SU_DEFINE(SU_HAVE_TAGSTACK, 1, [Define to 1 if we can use tags directly from stack.])
;;
esac
# Check includes used by su includes
AC_CHECK_HEADER(sys/types.h,
SAC_SU_DEFINE([SU_HAVE_SYS_TYPES], 1,
[Define as 1 if Sofia uses sys/types.h]))
[Define to 1 if Sofia uses sys/types.h]))
ax_inttypes=false
AC_CHECK_HEADER(stdint.h, [
ax_inttypes=true
SAC_SU_DEFINE([SU_HAVE_STDINT], 1,
[Define as 1 if Sofia uses stdint.h])])
[Define to 1 if Sofia uses stdint.h])])
AC_CHECK_HEADER(inttypes.h,[
ax_inttypes=true
SAC_SU_DEFINE([SU_HAVE_INTTYPES], 1,
[Define as 1 if Sofia uses inttypes.h])])
[Define to 1 if Sofia uses inttypes.h])])
if $ax_inttypes; then : ; else
AC_MSG_ERROR("No <stdint.h> or <inttypes.h> found.")
......@@ -72,13 +72,13 @@ AC_REQUIRE([AC_C_INLINE])
case "$ac_cv_c_inline" in
yes) SAC_SU_DEFINE(su_inline, static inline, [
Define this as declarator for static inline functions.
Define to declarator for static inline functions.
])dnl
SAC_SU_DEFINE(SU_INLINE, inline, [
Define this as declarator for inline functions.
Define to declarator for inline functions.
])dnl
SAC_SU_DEFINE(SU_HAVE_INLINE, 1, [
Define this as 1 if you have inline functions.
Define to 1 if you have inline functions.
])dnl
;;
no) SAC_SU_DEFINE(su_inline, static)dnl
......@@ -94,13 +94,13 @@ esac
AC_REQUIRE([AC_SYS_SA_LEN])
if test "$ac_cv_sa_len" = yes ;then
SAC_SU_DEFINE([SU_HAVE_SOCKADDR_SA_LEN], 1,
[Define this as 1 if you have sa_len in struct sockaddr])
[Define to 1 if you have sa_len in struct sockaddr])
fi
AC_REQUIRE([AC_STRUCT_SIN6])
case $ac_cv_sin6 in
yes) SAC_SU_DEFINE(SU_HAVE_IN6, 1, [
Define this as 1 if you have struct sockaddr_in6]) ;;
Define to 1 if you have struct sockaddr_in6]) ;;
no) ;;
*) AC_MSG_ERROR([Inconsistent struct sockaddr_sin6 test]) ;;
esac
......@@ -108,36 +108,36 @@ esac
AC_CHECK_HEADERS([unistd.h sys/time.h])
AC_CHECK_HEADERS([winsock2.h ws2tcpip.h], [
AC_DEFINE([HAVE_WIN32], 1, [Define as 1 you have WIN32])
SAC_SU_DEFINE([SU_HAVE_WINSOCK], 1, [Define as 1 you have WinSock])
SAC_SU_DEFINE([SU_HAVE_WINSOCK2], 1, [Define as 1 you have WinSock2])
AC_DEFINE([HAVE_WIN32], 1, [Define to 1 you have WIN32])
SAC_SU_DEFINE([SU_HAVE_WINSOCK], 1, [Define to 1 you have WinSock])
SAC_SU_DEFINE([SU_HAVE_WINSOCK2], 1, [Define to 1 you have WinSock2])
SAC_SU_DEFINE([SU_HAVE_SOCKADDR_STORAGE], 1,
[Define this as 1 if you have struct sockaddr_storage])
[Define to 1 if you have struct sockaddr_storage])
AC_DEFINE([HAVE_ADDRINFO], 1,
[Define this as 1 if you have addrinfo structure.])
[Define to 1 if you have addrinfo structure.])
AC_DEFINE([HAVE_GETADDRINFO], 1,
[Define this as 1 if you have addrinfo structure.])
[Define to 1 if you have addrinfo structure.])
AC_DEFINE([HAVE_FREEADDRINFO], 1,
[Define this as 1 if you have addrinfo structure.])
[Define to 1 if you have addrinfo structure.])
SAC_SU_DEFINE([SU_HAVE_ADDRINFO], 1,
[Define this as 1 if you have addrinfo structure.])
[Define to 1 if you have addrinfo structure.])
AC_CHECK_HEADERS([windef.h])
AC_CHECK_HEADERS([iphlpapi.h], [
AC_DEFINE([HAVE_INTERFACE_INFO_EX], 1, [
Define this as 1 if you have WIN32 INTERFACE_INFO_EX type.])
Define to 1 if you have WIN32 INTERFACE_INFO_EX type.])
AC_DEFINE([HAVE_SIO_ADDRESS_LIST_QUERY], 1, [
Define this as 1 if you have WIN32 WSAIoctl SIO_ADDRESS_LIST_QUERY.])
Define to 1 if you have WIN32 WSAIoctl SIO_ADDRESS_LIST_QUERY.])
], [], [#if HAVE_WINDEF_H
#include <windef.h>
#include <winbase.h>
#endif
])
AC_DEFINE([HAVE_FILETIME], 1, [
Define this as 1 if you have WIN32 FILETIME type and
Define to 1 if you have WIN32 FILETIME type and
GetSystemTimeAsFileTime().])
],[
dnl no winsock2
SAC_SU_DEFINE([SU_HAVE_BSDSOCK], 1, [Define as 1 if you have BSD socket interface])
SAC_SU_DEFINE([SU_HAVE_BSDSOCK], 1, [Define to 1 if you have BSD socket interface])
AC_CHECK_HEADERS([sys/socket.h sys/ioctl.h sys/filio.h sys/sockio.h \
sys/select.h])
AC_CHECK_HEADERS([netinet/in.h arpa/inet.h netdb.h \
......@@ -163,7 +163,7 @@ fi])
if test "$ac_cv_struct_addrinfo" = yes; then
SAC_SU_DEFINE([SU_HAVE_ADDRINFO], 1,
[Define as 1 if you have struct addrinfo.])
[Define to 1 if you have struct addrinfo.])
fi
AC_CACHE_CHECK([for struct sockaddr_storage],
......@@ -177,7 +177,7 @@ else
fi])
if test "$ac_cv_struct_sockaddr_storage" = yes; then
SAC_SU_DEFINE(SU_HAVE_SOCKADDR_STORAGE, 1,
[Define this as 1 if you have struct sockaddr_storage])
[Define to 1 if you have struct sockaddr_storage])
fi
AC_CACHE_CHECK([for field ifr_index in struct ifreq],
......@@ -197,7 +197,7 @@ fi # arpa/inet.h && netdb.h && sys/socket.h && net/if.h
])
if test "$ac_cv_struct_ifreq_ifr_index" = yes ; then
:
AC_DEFINE(HAVE_IFR_INDEX, 1, [Define this as 1 if you have ifr_index in <net/if.h>])
AC_DEFINE(HAVE_IFR_INDEX, 1, [Define to 1 if you have ifr_index in <net/if.h>])
else
AC_CACHE_CHECK([for field ifr_ifindex in struct ifreq],
[ac_cv_struct_ifreq_ifr_ifindex],[
......@@ -216,7 +216,7 @@ fi # arpa/inet.h && netdb.h && sys/socket.h && net/if.h
])
if test "$ac_cv_struct_ifreq_ifr_ifindex" = yes; then
:
AC_DEFINE(HAVE_IFR_IFINDEX, 1, [Define this as 1 if you have ifr_ifindex in <net/if.h>])
AC_DEFINE(HAVE_IFR_IFINDEX, 1, [Define to 1 if you have ifr_ifindex in <net/if.h>])
fi
fi # ifr_index in struct ifreq
......@@ -231,7 +231,7 @@ else
ac_cv_struct_ifconf='net/if.h missing'
fi])
if test "$ac_cv_struct_ifconf" = yes; then
AC_DEFINE(HAVE_IFCONF, 1, [Define this as 1 if you have SIOCGIFCONF])
AC_DEFINE(HAVE_IFCONF, 1, [Define to 1 if you have SIOCGIFCONF])
fi
AC_CACHE_CHECK([for ioctl SIOCGIFNUM],
......@@ -249,7 +249,7 @@ else
fi])
if test "$ac_cv_ioctl_siocgifnum" = yes; then
HAVE_IFNUM=1
AC_DEFINE(HAVE_IFNUM, 1, [Define this as 1 if you have SIOCGIFNUM ioctl])
AC_DEFINE(HAVE_IFNUM, 1, [Define to 1 if you have SIOCGIFNUM ioctl])
else
HAVE_IFNUM=0
fi
......@@ -349,12 +349,12 @@ AC_CHECK_FUNCS([gettimeofday strerror random initstate tcsetattr flock alarm \
getline getdelim getpass])
# getline getdelim getpass are _GNU_SOURCE stuff
if test $ac_cv_func_poll = yes ; then
SAC_SU_DEFINE([SU_HAVE_POLL], 1, [Define this as 1 if you have poll().])
SAC_SU_DEFINE([SU_HAVE_POLL], 1, [Define to 1 if you have poll().])
fi
if test $ac_cv_func_if_nameindex = yes ; then
SAC_SU_DEFINE([SU_HAVE_IF_NAMEINDEX], 1,
[Define this as 1 if you have if_nameindex().])
[Define to 1 if you have if_nameindex().])
fi
AC_REQUIRE([SAC_WITH_RT])
......@@ -372,7 +372,7 @@ SAC_REPLACE_FUNCS([memmem memccpy memspn memcspn strcasestr strtoull \
AC_DEFUN([AC_DEFINE_HAVE_PTHREAD_RWLOCK],[dnl
AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,[
Define this as 1 if you have working pthread_rwlock_t implementation.
Define to 1 if you have working pthread_rwlock_t implementation.
A thread may hold multiple concurrent read locks on rwlock - that is,
successfully call the pthread_rwlock_rdlock() function n times. If
......@@ -410,7 +410,7 @@ fi
# ===========================================================================
case "$target" in
*-*-linux*) AC_DEFINE([HAVE_PROC_NET_IF_INET6], 1,
[Define this as 1 if you have /proc/net/if_inet6 control file]) ;;
[Define to 1 if you have /proc/net/if_inet6 control file]) ;;
esac
AM_CONFIG_HEADER([libsofia-sip-ua/su/sofia-sip/su_configure.h])
......
m4/sac-tport.m4
View file @ 58eab12a
......@@ -18,8 +18,8 @@ if test -n "${with_sigcomp}" && test "${with_sigcomp}" != no ; then
AC_CHECK_HEADERS(sigcomp.h,,AC_MSG_ERROR([cannot find Sofia SigComp includes]))
AC_CHECK_FUNC(sigcomp_library_2_5,
[AC_DEFINE([HAVE_SIGCOMP], 1, [Define this as 1 if you have Sofia sigcomp >= 2.5])
AC_DEFINE([HAVE_SOFIA_SIGCOMP], 1, [Define this as 1 if you have Sofia sigcomp >= 2.5])],
[AC_DEFINE([HAVE_SIGCOMP], 1, [Define to 1 if you have Sofia sigcomp >= 2.5])
AC_DEFINE([HAVE_SOFIA_SIGCOMP], 1, [Define to 1 if you have Sofia sigcomp >= 2.5])],
AC_MSG_ERROR(Sofia SigComp API >= 2.5 was not found))
fi
......@@ -34,6 +34,6 @@ AC_ARG_WITH(sctp,
enable_sigcomp=no)
if test x$enable_sctp = xyes; then
AC_DEFINE(HAVE_SCTP, 1, [Define this a 1 if you have SCTP])
AC_DEFINE(HAVE_SCTP, 1, [Define to 1 if you have SCTP])
fi
])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment