[naviserver-commits] naviserver configure.in,1.11,1.12

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30802

Modified Files:
	configure.in 
Log Message:
Added checking for sin_len in sockaddr_in


Index: configure.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure.in	9 Oct 2005 23:43:57 -0000	1.11
--- configure.in	15 Oct 2005 13:57:45 -0000	1.12
***************
*** 80,86 ****
  TEA_TIME_HANDLER
  
  #
! # Modify SHLIB_LD from tclConfig.sh as we specifically name
! # shared library _init functions.
  #
  
--- 80,87 ----
  TEA_TIME_HANDLER
  
+ 
  #
! # Modify SHLIB_LD from tclConfig.sh as we specifically
! # name shared library _init functions.
  #
  
***************
*** 88,131 ****
  system=`uname`
  case "$system" in
!     Darwin)
! 	LDLIB="cc -dynamiclib -install_name \$(INSTLIB)/\$(LIBFILE)"
! 	LDSO="cc -bundle"
! 	CCRFLAG=
! 	LDRFLAG=
! 	CCRPATHS=
! 	LDRPATHS=
! 	;;
!     *)
! 	LDLIB="$SHLIB_LD"
! 	case "$LDLIB" in
! 	    *gcc*)
! 		LDLIB="$LDLIB -nostartfiles"
! 		;;
! 	esac
! 	CCRPATH="\$(CCRFLAG)\$(INSTLIB)"
! 	LDRPATH="\$(LDRFLAG)\$(INSTLIB)"
! 	if test "$TCL_EXEC_PREFIX" != "$prefix"
! 	then
! 		CCRPATH="$CCRPATH \$(CCRFLAG)\$(TCL_EXEC_PREFIX)/lib"
! 		LDRPATH="$LDRPATH \$(LDRFLAG)\$(TCL_EXEC_PREFIX)/lib"
  	fi
! 	if test -d /usr/lib/lwp
! 	then
! 		CCRPATH="$CCRPATH \$(CCRFLAG)/usr/lib/lwp"
! 		LDRPATH="$LDRPATH \$(LDRFLAG)/usr/lib/lwp"
  	fi
! 	LDSO="\$(LDLIB)"
! 	CCRPATHS="\$(CCRPATH)"
! 	LDRPATHS="\$(LDRPATH)"
! 	CCRFLAG=$TCL_CC_SEARCH_FLAGS
! 	LDRFLAG=$TCL_LD_SEARCH_FLAGS
!         if test "$CCRFLAG" = "" ; then
!             CCRPATH=
!         fi
!         if test "$LDRFLAG" = "" ; then
!             LDRPATH=
!         fi
! 	;;
  esac
  SRCDIR=`cd $srcdir; pwd`
  NAVISERVER=$prefix
--- 89,131 ----
  system=`uname`
  case "$system" in
!   Darwin)
!     LDLIB="cc -dynamiclib -install_name \$(INSTLIB)/\$(LIBFILE)"
!     LDSO="cc -bundle"
!     CCRFLAG=
!     LDRFLAG=
!     CCRPATHS=
!     LDRPATHS=
!   ;;
!   *)
!     LDLIB="$SHLIB_LD"
!     case "$LDLIB" in
!       *gcc*)
!         LDLIB="$LDLIB -nostartfiles"
!       ;;
!     esac
!     CCRPATH="\$(CCRFLAG)\$(INSTLIB)"
!     LDRPATH="\$(LDRFLAG)\$(INSTLIB)"
!     if test "$TCL_EXEC_PREFIX" != "$prefix"; then
!       CCRPATH="$CCRPATH \$(CCRFLAG)\$(TCL_EXEC_PREFIX)/lib"
!       LDRPATH="$LDRPATH \$(LDRFLAG)\$(TCL_EXEC_PREFIX)/lib"
  	fi
! 	if test -d /usr/lib/lwp; then
!       CCRPATH="$CCRPATH \$(CCRFLAG)/usr/lib/lwp"
!       LDRPATH="$LDRPATH \$(LDRFLAG)/usr/lib/lwp"
  	fi
!     LDSO="\$(LDLIB)"
!     CCRPATHS="\$(CCRPATH)"
!     LDRPATHS="\$(LDRPATH)"
!     CCRFLAG=$TCL_CC_SEARCH_FLAGS
!     LDRFLAG=$TCL_LD_SEARCH_FLAGS
!     if test "$CCRFLAG" = "" ; then
!       CCRPATH=
!     fi
!     if test "$LDRFLAG" = "" ; then
!       LDRPATH=
!     fi
!   ;;
  esac
+ 
  SRCDIR=`cd $srcdir; pwd`
  NAVISERVER=$prefix
***************
*** 141,144 ****
--- 141,145 ----
  AC_SUBST(NAVISERVER)
  
+ 
  #
  # Additional checks.
***************
*** 147,165 ****
  AC_CHECK_HEADERS(inttypes.h)
  AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron)
! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD,1,[Define to 1 if the <mach-o/dyld.h> header should be used.]),)
! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL,1,[Define to 1 if the <dl.h> header should be used.]),)
  AC_MSG_CHECKING([need for dup high])
  AC_TRY_RUN([
! #include <stdio.h>
! int
! main(int argc, char **argv)
! {
      return (sizeof(stdout->_file) == 1) ? 0 : 1;
! }], AC_DEFINE(USE_DUPHIGH,1,[need for dup high]) as_ok=yes, as_ok=no, as_ok=no)
  AC_MSG_RESULT($as_ok)
  
  #
  # Normally, we'd link the resulting server image
! # dynamically.  In some cases it is however more
  # appropriate to build it as a monolithic image.
  #
--- 148,165 ----
  AC_CHECK_HEADERS(inttypes.h)
  AC_CHECK_FUNCS(timegm fork1 poll drand48 random _NSGetEnviron)
! AC_CHECK_HEADER(mach-o/dyld.h, AC_DEFINE(USE_DYLD, 1, [Define to 1 if the <mach-o/dyld.h> header should be used.]),)
! AC_CHECK_HEADER(dl.h, AC_DEFINE(USE_DLSHL, 1, [Define to 1 if the <dl.h> header should be used.]),)
  AC_MSG_CHECKING([need for dup high])
  AC_TRY_RUN([
!   #include <stdio.h>
!   int main(int argc, char **argv) {
      return (sizeof(stdout->_file) == 1) ? 0 : 1;
!   }
! ], AC_DEFINE(USE_DUPHIGH, 1, [need for dup high]) as_ok=yes, as_ok=no, as_ok=no)
  AC_MSG_RESULT($as_ok)
  
  #
  # Normally, we'd link the resulting server image
! # dynamically. In some cases it is however more
  # appropriate to build it as a monolithic image.
  #
***************
*** 167,237 ****
  AC_MSG_CHECKING([how to build server image])
  AC_ARG_ENABLE(shared,
!     [  --enable-shared         build and link with shared libraries [--enable-shared]],
!     shared_ok=$enable_shared, shared_ok=yes)
  if test "$shared_ok" = "yes" ; then
!     if test "${TCL_SHARED_BUILD}" != "1" ; then
!         AC_MSG_ERROR([must build tcl with --enable-shared])
!     fi
!     STATIC_BUILD=0
!     AC_MSG_RESULT([shared])
  else
!     if test "${TCL_SHARED_BUILD}" != "0" ; then
!         AC_MSG_ERROR([must build tcl with --disable-shared])
!     fi
!     STATIC_BUILD=1
!     AC_MSG_RESULT([static])
  fi
  AC_SUBST(STATIC_BUILD)
  
  AC_CACHE_CHECK([for shared libgcc], ac_cv_shared_libgcc, [
!     ac_save_LIBS="$LIBS"
!     LIBS="-lgcc_s $LIBS"
!     AC_TRY_LINK(, [return 0], ac_cv_shared_libgcc=yes, ac_cv_shared_libgcc=no)
!     LIBS="$ac_save_LIBS"
  ])
  if test "$ac_cv_shared_libgcc" = "yes" ; then
!     LIBS="-lgcc_s $LIBS"
  fi
  
! has_threadsafe_dns=no
  AC_CHECK_LIB(socket, getaddrinfo)
  AC_CHECK_LIB(socket, getnameinfo)
  AC_CHECK_FUNCS(getaddrinfo getnameinfo)
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!     -a "${ac_cv_func_getnameinfo}" = "yes"  \
!     -a "`uname -s`" != "Darwin"; then
!         has_threadsafe_dns=yes
  fi
! if test "${has_threadsafe_dns}" != "yes" ; then
!     AC_HAVE_GETHOSTBYNAME_R
!     AC_HAVE_GETHOSTBYADDR_R
!     if test "${ac_cv_func_gethostbyname_r}" = "yes" \
!         -a "${ac_cv_func_gethostbyaddr_r}" = "yes" ; then
!         has_threadsafe_dns=yes
!     fi
  fi
! if test "${has_threadsafe_dns}" != "yes" ; then
!   AC_MSG_WARN([DNS queries will use MT-unsafe calls which could result in server instability])
  fi
  
  AC_MSG_CHECKING([whether to include zlib compression support])
  AC_ARG_WITH(zlib,
!     [  --with-zlib[=DIR]       build and link with Zlib [--with-zlib]],
!     [
!         ac_zlib=$withval
!         if test "${ac_zlib}" != "no" ; then
!             ac_zlib=yes
!             if test -d "$withval" ; then
!                 CPPFLAGS="$CPPFLAGS -I$withval/include"
!                 LDFLAGS="$LDFLAGS -L$withval/lib"
!             fi
!         fi
!     ], [ac_zlib=yes])
  AC_MSG_RESULT($ac_zlib)
  if test "${ac_zlib}" = "yes" ; then
!     AC_CHECK_HEADERS(zlib.h)
!     AC_CHECK_LIB(z, compress2)
  fi
  
  
  #
--- 167,260 ----
  AC_MSG_CHECKING([how to build server image])
  AC_ARG_ENABLE(shared,
!   [  --enable-shared         build and link with shared libraries [--enable-shared]],
!    shared_ok=$enable_shared, shared_ok=yes)
  if test "$shared_ok" = "yes" ; then
!   if test "${TCL_SHARED_BUILD}" != "1" ; then
!     AC_MSG_ERROR([must build tcl with --enable-shared])
!   fi
!   STATIC_BUILD=0
!   AC_MSG_RESULT([shared])
  else
!   if test "${TCL_SHARED_BUILD}" != "0" ; then
!     AC_MSG_ERROR([must build tcl with --disable-shared])
!   fi
!   STATIC_BUILD=1
!   AC_MSG_RESULT([static])
  fi
  AC_SUBST(STATIC_BUILD)
  
  AC_CACHE_CHECK([for shared libgcc], ac_cv_shared_libgcc, [
!   ac_save_LIBS="$LIBS"
!   LIBS="-lgcc_s $LIBS"
!   AC_TRY_LINK(, [return 0], ac_cv_shared_libgcc=yes, ac_cv_shared_libgcc=no)
!   LIBS="$ac_save_LIBS"
  ])
  if test "$ac_cv_shared_libgcc" = "yes" ; then
!   LIBS="-lgcc_s $LIBS"
  fi
  
! have_mtsafe_dns=no
  AC_CHECK_LIB(socket, getaddrinfo)
  AC_CHECK_LIB(socket, getnameinfo)
  AC_CHECK_FUNCS(getaddrinfo getnameinfo)
  if test "${ac_cv_func_getaddrinfo}" = "yes" \
!      -a "${ac_cv_func_getnameinfo}" = "yes" \
!      -a "`uname -s`" != "Darwin"; then
!   have_mtsafe_dns=yes
  fi
! if test "${have_mtsafe_dns}" != "yes"
!      -a "`uname -s`" != "Darwin"; then
!   AC_HAVE_GETHOSTBYNAME_R
!   AC_HAVE_GETHOSTBYADDR_R
!   if test "${ac_cv_func_gethostbyname_r}" = "yes" \
!        -a "${ac_cv_func_gethostbyaddr_r}" = "yes" ; then
!     have_mtsafe_dns=yes
!   fi
  fi
! if test "${have_mtsafe_dns}" != "yes" ; then
!   AC_MSG_WARN([DNS queries use MT-unsafe calls which could result in server instability])
! else
!   AC_DEFINE(HAVE_MTSAFE_DNS, 1, [Define to 1 if DNS calls are MT-safe])
  fi
  
  AC_MSG_CHECKING([whether to include zlib compression support])
  AC_ARG_WITH(zlib,
!   [  --with-zlib[=DIR]       build and link with Zlib [--with-zlib]],
!   [ 
!     ac_zlib=$withval
!     if test "${ac_zlib}" != "no" ; then
!       ac_zlib=yes
!       if test -d "$withval" ; then
!         CPPFLAGS="$CPPFLAGS -I$withval/include"
!         LDFLAGS="$LDFLAGS -L$withval/lib"
!       fi
!     fi
!   ], [ac_zlib=yes])
  AC_MSG_RESULT($ac_zlib)
  if test "${ac_zlib}" = "yes" ; then
!   AC_CHECK_HEADERS(zlib.h)
!   AC_CHECK_LIB(z, compress2)
  fi
  
+ #
+ # Darwin version of getnameinfo will not work correctly
+ # if we do not explicitly set sin_len element of the
+ # struct sockaddr_in to the total size of the structure.
+ # Some OS variants however do not have the sin_len member
+ # so test if this is the case.
+ #
+ 
+ AC_MSG_CHECKING([sin_len in struct sockaddr_in])
+ AC_TRY_COMPILE([
+     #include <netinet/in.h>
+ ], [
+     struct sockaddr_in sa;
+     sa.sin_len;
+ ], [
+     AC_DEFINE(HAVE_SOCKADDRIN_SIN_LEN, 1, [Should we use the sin_len field of struct sockaddr_in?])
+     AC_MSG_RESULT(yes)
+ ], [
+     AC_MSG_RESULT(no)
+ ])
  
  #