@@ -1,3 +1,8 @@

+Thu Oct  7 03:03:26 CEST 2004 (tk)

+----------------------------------

+  * configure: disable support for readdir_r by default (can be enabled with

+	       --enable-readdir_r)

+

 Wed Oct  6 21:36:59 CEST 2004 (tk)

 ----------------------------------

   * configure: improve --disable-dns behaviour (patch by Tom G. Christensen

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20041006

+	echo devel-20041007

 	exit 0

 	;;

@@ -1029,7 +1029,7 @@ Optional Features:

   --enable-debug	  enable debug code

   --enable-bigstack	  increase thread stack size

   --disable-gethostbyname_r	  disable support for gethostbyname_r

-  --disable-readdir_r		  disable support for readdir_r

+  --enable-gethostbyname_r	  enable support for readdir_r

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

@@ -11407,7 +11407,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

 _ACEOF

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 openbsd3.3*)

     if test "$have_pthreads" = "yes"; then

@@ -11433,7 +11433,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

 _ACEOF

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 openbsd*)

     if test "$have_pthreads" = "yes"; then

@@ -11462,7 +11462,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

 _ACEOF

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 netbsd*)

      if test "$have_pthreads" = "yes"; then

@@ -11486,7 +11486,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

 _ACEOF

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 bsd*)

     echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5

@@ -11497,7 +11497,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_BSD 1

 _ACEOF

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 beos*)

     echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5

@@ -11526,7 +11526,7 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

     use_netinfo="yes"

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 sco*)

                     ;;

@@ -12622,10 +12622,13 @@ fi

 # Check whether --enable-gethostbyname_r or --disable-gethostbyname_r was given.

 if test "${enable_gethostbyname_r+set}" = set; then

   enableval="$enable_gethostbyname_r"

-  ac_cv_gethostbyname_args=""

+  disable_gethostbyname_r="yes"

 fi;

-if test -z "$ac_cv_gethostbyname_args" || test "$bad_gethostbyname_r" = "yes"; then

+if test "$disable_gethostbyname_r" = "yes"; then

+    echo "$as_me:$LINENO: result: support disabled" >&5

+echo "${ECHO_T}support disabled" >&6

+elif test -z "$ac_cv_gethostbyname_args"; then

     echo "$as_me:$LINENO: result: no" >&5

 echo "${ECHO_T}no" >&6

 else

@@ -12764,10 +12767,15 @@ fi

 # Check whether --enable-readdir_r or --disable-readdir_r was given.

 if test "${enable_readdir_r+set}" = set; then

   enableval="$enable_readdir_r"

-  ac_cv_readdir_args=""

+

+else

+  disable_readdir_r="yes"

 fi;

-if test -z "$ac_cv_readdir_args"; then

+if test "$disable_readdir_r" = "yes"; then

+    echo "$as_me:$LINENO: result: support disabled" >&5

+echo "${ECHO_T}support disabled" >&6

+elif test -z "$ac_cv_readdir_args"; then

     echo "$as_me:$LINENO: result: no" >&5

 echo "${ECHO_T}no" >&6

 else

@@ -292,7 +292,7 @@ freebsd*)

 	fi

     fi

     AC_DEFINE(C_BSD,1,[os is freebsd])

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 openbsd3.3*)

     if test "$have_pthreads" = "yes"; then

@@ -306,7 +306,7 @@ openbsd3.3*)

 	AC_DEFINE(_REENTRANT,1,[thread safe])

     fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 openbsd*)

     if test "$have_pthreads" = "yes"; then

@@ -323,7 +323,7 @@ openbsd*)

 	AC_DEFINE(_REENTRANT,1,[thread safe])

     fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 netbsd*)

      if test "$have_pthreads" = "yes"; then

@@ -335,13 +335,13 @@ netbsd*)

 	ADDITIONAL_LIBS="$LIBS -lpthread"

      fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 bsd*)

     AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.)

     have_pthreads="no"

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 beos*)

     AC_MSG_RESULT(BeOS detected. Disabling thread support.)

@@ -353,7 +353,7 @@ darwin*)

     AC_DEFINE(C_DARWIN,1,[os is darwin])

     AC_DEFINE(BIND_8_COMPAT,1,[enable bind8 compatibility])

     use_netinfo="yes"

-    bad_gethostbyname_r="yes"

+    disable_gethostbyname_r="yes"

     ;;

 sco*)

     dnl njh@bandsman.sco.uk: SCO Unix port

@@ -561,9 +561,11 @@ fi

 AC_ARG_ENABLE(gethostbyname_r,

 [  --disable-gethostbyname_r	  disable support for gethostbyname_r],

-ac_cv_gethostbyname_args="",)

+disable_gethostbyname_r="yes", )

-if test -z "$ac_cv_gethostbyname_args" || test "$bad_gethostbyname_r" = "yes"; then

+if test "$disable_gethostbyname_r" = "yes"; then

+    AC_MSG_RESULT(support disabled)

+elif test -z "$ac_cv_gethostbyname_args"; then

     AC_MSG_RESULT(no)

 else

     if test "$ac_cv_gethostbyname_args" = 3; then

@@ -607,10 +609,12 @@ if test -z "$ac_cv_readdir_args"; then

 fi

 AC_ARG_ENABLE(readdir_r,

-[  --disable-readdir_r		  disable support for readdir_r],

-ac_cv_readdir_args="",)

+[  --enable-gethostbyname_r	  enable support for readdir_r],,

+disable_readdir_r="yes")

-if test -z "$ac_cv_readdir_args"; then

+if test "$disable_readdir_r" = "yes"; then

+    AC_MSG_RESULT(support disabled)

+elif test -z "$ac_cv_readdir_args"; then

     AC_MSG_RESULT(no)

 else

     if test "$ac_cv_readdir_args" = 2; then