191 lines
6.1 KiB
Plaintext
191 lines
6.1 KiB
Plaintext
--- configure.orig Sun Jan 17 23:35:47 1999
|
|
+++ configure Thu Jan 21 18:58:35 1999
|
|
@@ -3609,7 +3609,7 @@
|
|
|
|
|
|
# Check for some functions
|
|
-for ac_func in localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
|
|
+for ac_func in localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
|
|
do
|
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
echo "configure:3616: checking for $ac_func" >&5
|
|
@@ -5168,11 +5168,14 @@
|
|
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
|
fi
|
|
;;
|
|
- *-freebsd2.2*)
|
|
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
|
|
-
|
|
- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
|
|
- # -mthreads flag.
|
|
+ *-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*)
|
|
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
|
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
|
|
+ G_THREAD_LIBS=""
|
|
+ have_poll=no
|
|
+ else
|
|
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
|
+ fi
|
|
;;
|
|
esac
|
|
|
|
@@ -5181,7 +5184,7 @@
|
|
old_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5185 "configure"
|
|
+#line 5188 "configure"
|
|
#include "confdefs.h"
|
|
#include <time.h>
|
|
EOF
|
|
@@ -5198,7 +5201,7 @@
|
|
CPPFLAGS=$old_CPPFLAGS
|
|
|
|
echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
|
|
-echo "configure:5202: checking necessary compiler options" >&5
|
|
+echo "configure:5205: checking necessary compiler options" >&5
|
|
|
|
echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
|
|
else
|
|
@@ -5218,7 +5221,7 @@
|
|
case "$mutex_has_default" in
|
|
"yes")
|
|
echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
|
|
-echo "configure:5222: checking size of $mutex_default_type" >&5
|
|
+echo "configure:5225: checking size of $mutex_default_type" >&5
|
|
if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -5226,7 +5229,7 @@
|
|
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5230 "configure"
|
|
+#line 5233 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <$mutex_header_file>
|
|
@@ -5238,7 +5241,7 @@
|
|
exit(0);
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:5242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
then
|
|
glib_cv_sizeof_gmutex=`cat conftestval`
|
|
else
|
|
@@ -5258,7 +5261,7 @@
|
|
|
|
|
|
echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
|
|
-echo "configure:5262: checking byte contents of $mutex_default_type" >&5
|
|
+echo "configure:5265: checking byte contents of $mutex_default_type" >&5
|
|
if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -5266,7 +5269,7 @@
|
|
glib_cv_byte_contents_gmutex=0
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5270 "configure"
|
|
+#line 5273 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdio.h>
|
|
#include <$mutex_header_file>
|
|
@@ -5283,7 +5286,7 @@
|
|
exit(0);
|
|
}
|
|
EOF
|
|
-if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
then
|
|
glib_cv_byte_contents_gmutex=`cat conftestval`
|
|
else
|
|
@@ -5311,6 +5314,63 @@
|
|
|
|
|
|
|
|
+if test x"$have_poll" != xno; then
|
|
+ for ac_func in poll
|
|
+do
|
|
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
|
+echo "configure:5322: checking for $ac_func" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
|
+else
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 5327 "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. */
|
|
+/* 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();
|
|
+
|
|
+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; }
|
|
+EOF
|
|
+if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_$ac_func=yes"
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -rf conftest*
|
|
+ eval "ac_cv_func_$ac_func=no"
|
|
+fi
|
|
+rm -f conftest*
|
|
+fi
|
|
+
|
|
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+ cat >> confdefs.h <<EOF
|
|
+#define $ac_tr_func 1
|
|
+EOF
|
|
+
|
|
+else
|
|
+ echo "$ac_t""no" 1>&6
|
|
+fi
|
|
+done
|
|
+
|
|
+fi
|
|
glib_sysdefso="glibconfig-sysdefs.h"
|
|
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
|
|
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
|
|
@@ -5319,7 +5379,7 @@
|
|
glib_nl='\n'
|
|
fi
|
|
echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
|
|
-echo "configure:5323: checking system definitions for $glib_sysdef_msg" >&5
|
|
+echo "configure:5383: checking system definitions for $glib_sysdef_msg" >&5
|
|
cat >confrun.c <<_______EOF
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
@@ -5346,11 +5406,11 @@
|
|
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5350 "configure"
|
|
+#line 5410 "configure"
|
|
#include "confdefs.h"
|
|
`cat confrun.c`
|
|
EOF
|
|
-if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
+if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
then
|
|
echo "$ac_t""done" 1>&6
|
|
else
|