← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/avahi/jaunty-updates

« back to all changes in this revision

Viewing changes to common/acx_pthread.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-09-03 20:25:37 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20060903202537-syi99j0tijm9bldv
Tags: 0.6.13-2ubuntu1
* Merge with Debian, UVF Exception granted by Colin Watson
* debian/patches/03_foreground-console.patch:
  + Allow only foreground users access to the avahi-set-host-name utility as
    we don't use the "netdev" group anywhere. Thanks to Colin Watson for the
    hint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/acx_pthread.m4
43
43
dnl
44
44
dnl @category InstalledPackages
45
45
dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
46
 
dnl @version 2005-06-15
 
46
dnl @version 2006-05-29
47
47
dnl @license GPLWithACException
48
48
dnl 
49
49
dnl Checks for GCC shared/pthread inconsistency based on work by
219
219
 
220
220
        LIBS="$save_LIBS"
221
221
        CFLAGS="$save_CFLAGS"
222
 
 
223
 
        # More AIX lossage: must compile with cc_r
224
 
        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
 
222
        # More AIX lossage: must compile with xlc_r or cc_r
 
223
        if test x"$GCC" != xyes; then
 
224
          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
 
225
        else
 
226
          PTHREAD_CC=$CC
 
227
        fi
225
228
 
226
229
   # The next part tries to detect GCC inconsistency with -shared on some
227
230
   # architectures and systems. The problem is that in certain
228
231
   # configurations, when -shared is specified, GCC "forgets" to
229
232
   # internally use various flags which are still necessary.
230
233
   
231
 
   # First, check whether caller wants us to skip -shared checks
232
 
   # this is useful
233
234
   AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
234
 
   if test x"$GCC" != xyes; then
 
235
   check_inconsistencies=yes
 
236
   case "${host_cpu}-${host_os}" in
 
237
     *-darwin*) check_inconsistencies=no ;;
 
238
   esac
 
239
   if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
235
240
      AC_MSG_RESULT([no])
236
241
   else
237
242
      AC_MSG_RESULT([yes])