Date: Fri, 2 Apr 1999 16:28:46 -0700 (MST) From: Brett Taylor <brett@peloton.physics.montana.edu> To: "David L. Hays, Jr." <elfkinz@elfland.net> Cc: freebsd-questions@FreeBSD.ORG Subject: Re: gtk-1.2.1 install problem Message-ID: <Pine.BSF.4.05.9904021627001.9063-300000@peloton.physics.montana.edu> In-Reply-To: <Pine.BSF.4.05.9904021518590.25234-100000@shell2.ba.best.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
On Fri, 2 Apr 1999, David L. Hays, Jr. wrote:
> Thanks for the help, but I'm starting to feel stupid ... do I delete these
> three lines?:
No - don't delete those lines or the patch will barf. I've attached the
modified patches to this message - replace the patches I've sent w/ the
patch-ad and patch-ae in the glib patches directories and give this a
shot. It works fine on my 2.2.8 system at work.
Brett
***********************************************************
Brett Taylor brett@peloton.physics.montana.edu *
brett@daemonnews.org *
*
http://www.daemonnews.org/ *
***********************************************************
[-- Attachment #2 --]
--- configure.in.orig Thu Jan 28 09:59:01 1999
+++ configure.in Thu Jan 28 23:13:01 1999
@@ -268,7 +268,7 @@
AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
# Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp)
# Check for sys_errlist
AC_MSG_CHECKING(for sys_errlist)
@@ -507,6 +507,9 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
+ freebsd*)
+ G_MODULE_LDFLAGS='-E'
+ ;;
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -716,11 +719,13 @@
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.
+ *-*-freebsd*)
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ have_poll=no
+ else
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
@@ -834,6 +839,9 @@
dnl ****************************************
dnl *** GLib POLL* compatibility defines ***
dnl ****************************************
+if test x"$have_poll" != xno; then
+ AC_CHECK_FUNCS(poll)
+fi
GLIB_SYSDEFS(
[#include <sys/types.h>
#include <sys/poll.h>],
[-- Attachment #3 --]
--- configure.orig Wed Feb 17 04:14:07 1999
+++ configure Wed Feb 17 21:11:29 1999
@@ -3758,7 +3758,7 @@
# Check for some functions
-for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
+for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3765: checking for $ac_func" >&5
@@ -4610,6 +4610,9 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
+ freebsd*)
+ G_MODULE_LDFLAGS='-E'
+ ;;
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -5302,11 +5305,13 @@
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"
+ have_poll=no
+ else
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
@@ -5623,6 +5628,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:5636: 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 5641 "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:5664: \"$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"
+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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.05.9904021627001.9063-300000>