michael@273: Index: configure
michael@273: --- configure.orig	2010-03-16 03:52:21.000000000 +0100
michael@273: +++ configure	2010-03-17 20:07:17.000000000 +0100
michael@273: @@ -25810,7 +25810,7 @@
michael@273:  	      add_thread_lib="-l$thread_lib"
michael@273:  	      IN=" in -l$thread_lib"
michael@273:  	    fi
michael@273: -	    LIBS="$add_thread_lib $glib_save_LIBS"
michael@273: +	    LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`"
michael@273:  
michael@273:              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5
michael@273:  $as_echo_n "checking for sched_get_priority_min$IN... " >&6; }
michael@273: Index: glib-2.0.pc.in
michael@273: --- glib-2.0.pc.in.orig	2009-04-01 01:04:20.000000000 +0200
michael@273: +++ glib-2.0.pc.in	2010-03-17 20:07:17.000000000 +0100
michael@273: @@ -9,6 +9,7 @@
michael@273:  
michael@273:  Name: GLib
michael@273:  Description: C Utility Library
michael@273: +Requires: libpcre
michael@273:  Version: @VERSION@
michael@273:  Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
michael@273:  Libs.private: @ICONV_LIBS@
michael@273: Index: gmodule/gmodule-dl.c
michael@273: --- gmodule/gmodule-dl.c.orig	2009-04-01 01:04:20.000000000 +0200
michael@273: +++ gmodule/gmodule-dl.c	2010-03-17 20:07:17.000000000 +0100
michael@273: @@ -107,6 +107,7 @@
michael@273:  static gpointer
michael@273:  _g_module_self (void)
michael@273:  {
michael@273: +#ifndef __FreeBSD__
michael@273:    gpointer handle;
michael@273:    
michael@273:    /* to query symbols from the program itself, special link options
michael@273: @@ -118,6 +119,9 @@
michael@273:      g_module_set_error (fetch_dlerror (TRUE));
michael@273:    
michael@273:    return handle;
michael@273: +#else
michael@273: +  return RTLD_DEFAULT;
michael@273: +#endif
michael@273:  }
michael@273:  
michael@273:  static void
michael@273: Index: tests/errorcheck-mutex-test.c
michael@273: --- tests/errorcheck-mutex-test.c.orig	2009-04-01 01:04:20.000000000 +0200
michael@273: +++ tests/errorcheck-mutex-test.c	2010-03-17 20:07:17.000000000 +0100
michael@273: @@ -1,3 +1,5 @@
michael@273: +#ifdef G_THREADS_ENABLED
michael@273: +
michael@273:  #undef G_DISABLE_ASSERT
michael@273:  #undef G_LOG_DOMAIN
michael@273:  #define G_ERRORCHECK_MUTEXES
michael@273: @@ -102,9 +104,12 @@
michael@273:     timed_wait_on_otherwise_locked_mutex}
michael@273:  };
michael@273:  
michael@273: +#endif
michael@273: +
michael@273:  int
michael@273:  main (int argc, char* argv[])
michael@273:  {
michael@273: +#ifdef G_THREADS_ENABLED
michael@273:    int i;
michael@273:  
michael@273:    if (argc == 2)
michael@273: @@ -126,6 +131,7 @@
michael@273:      {
michael@273:        fprintf (stderr, "      %s\n", func_table[i].name);
michael@273:      }
michael@273: +#endif
michael@273:  
michael@273:    return 0;
michael@273:  }