162 lines
4.7 KiB
Text
162 lines
4.7 KiB
Text
$NetBSD: patch-ab,v 1.2 2007/02/02 01:13:57 joerg Exp $
|
|
|
|
--- configure.orig 2005-01-02 19:10:05.000000000 +0000
|
|
+++ configure
|
|
@@ -1283,9 +1283,10 @@ if test "$ac_x_libraries" = NO; then
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 1285 "configure"
|
|
#include "confdefs.h"
|
|
+#include <X11/Intrinsic.h>
|
|
|
|
int main() {
|
|
-${x_direct_test_function}()
|
|
+XtMalloc(0)
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
@@ -2236,31 +2237,11 @@ if eval "test \"`echo '$''{'ac_cv_func_$
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2240 "configure"
|
|
-#include "confdefs.h"
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func(); below. */
|
|
-#include <assert.h>
|
|
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-/* We use char because int might match the return type of a gcc2
|
|
- builtin and then its argument prototype would still apply. */
|
|
-char $ac_func();
|
|
+#include <sys/time.h>
|
|
|
|
int main() {
|
|
-
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
-choke me
|
|
-#else
|
|
-$ac_func();
|
|
-#endif
|
|
-
|
|
-; return 0; }
|
|
+return gettimeofday(NULL, NULL);
|
|
+}
|
|
EOF
|
|
if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
@@ -2354,55 +2335,71 @@ fi
|
|
done
|
|
|
|
|
|
-for ac_func in random srandom
|
|
-do
|
|
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
-echo "configure:2361: checking for $ac_func" >&5
|
|
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
|
+echo $ac_n "checking for random""... $ac_c" 1>&6
|
|
+echo "configure:2361: checking for random" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2366 "configure"
|
|
-#include "confdefs.h"
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char $ac_func(); below. */
|
|
-#include <assert.h>
|
|
-/* Override any gcc2 internal prototype to avoid an error. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-/* We use char because int might match the return type of a gcc2
|
|
- builtin and then its argument prototype would still apply. */
|
|
-char $ac_func();
|
|
+#include <stdlib.h>
|
|
|
|
int main() {
|
|
+ return random();
|
|
+}
|
|
+EOF
|
|
+if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_random=yes"
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_random=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
|
|
-/* The GNU C library defines this for functions which it implements
|
|
- to always fail with ENOSYS. Some functions are actually named
|
|
- something starting with __ and the normal name is an alias. */
|
|
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
|
-choke me
|
|
-#else
|
|
-$ac_func();
|
|
-#endif
|
|
+if eval "test \"`echo '$ac_cv_func_'random`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ ac_tr_func=HAVE_`echo random | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+ cat >> confdefs.h <<EOF
|
|
+#define $ac_tr_func 1
|
|
+EOF
|
|
+ true
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+false
|
|
+fi
|
|
|
|
-; return 0; }
|
|
+
|
|
+echo $ac_n "checking for srandom""... $ac_c" 1>&6
|
|
+echo "configure:2361: checking for srandom" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#include <stdlib.h>
|
|
+
|
|
+int main(int argc, char **argv) {
|
|
+ srandom(argc);
|
|
+
|
|
+ return 0; }
|
|
EOF
|
|
if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
- eval "ac_cv_func_$ac_func=yes"
|
|
+ eval "ac_cv_func_srandom=yes"
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
- eval "ac_cv_func_$ac_func=no"
|
|
+ eval "ac_cv_func_srandom=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
|
|
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
|
|
+if eval "test \"`echo '$ac_cv_func_'srandom`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+ ac_tr_func=HAVE_`echo srandom | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
cat >> confdefs.h <<EOF
|
|
#define $ac_tr_func 1
|
|
EOF
|
|
@@ -2411,8 +2408,6 @@ else
|
|
echo "$ac_t""no" 1>&6
|
|
false
|
|
fi
|
|
-done
|
|
-
|
|
|
|
trap '' 1 2 15
|
|
cat > confcache <<\EOF
|