include CFLAGS from gthread-2.0 so that the libs work correctly in a

2002-03-16  Sven Neumann  <sven@gimp.org>

	* configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS)
	(GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
	so that the libs work correctly in a threaded environment.

diff --git a/ChangeLog b/ChangeLog
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 821753b50a8ebd8078bef7d88155c34e8e26db99..801b3be608f23ea2914ff816c7b655c0108311c0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-03-16  Sven Neumann  <sven@gimp.org>
+
+       * configure.in (GDK_PIXBUF_DEP_CFLAGS) (GDK_PIXBUF_XLIB_DEP_CFLAGS) 
+       (GDK_DEP_CFLAGS) (GTK_DEP_CFLAGS): include CFLAGS from gthread-2.0
+       so that the libs work correctly in a threaded environment.
+
 Fri Mar 15 12:51:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c

diff --git a/configure.in b/configure.in
index 1d0cf9a6de28cc05d890a9587609cf98d261f55a..ba23054a1610610136c12be5f43ce311bfe7b65b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -846,7 +846,7 @@ GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PIXBUF_PACKAGES)
 AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
@@ -1152,7 +1152,7 @@ AC_SUBST(xinput_progs)
 
 GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
+GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PIXBUF_XLIB_PACKAGES)
 AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_LIBS)
@@ -1247,7 +1247,7 @@ LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES=$PANGO_PACKAGES
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
@@ -1293,8 +1293,8 @@ fi
 GTK_PACKAGES=atk
 GTK_EXTRA_LIBS=
 GTK_EXTRA_CFLAGS= 
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)