dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed extra check for gthread and fold it into the GLIB and GTK checks. 

2007-06-25  Sven Neumann  <sven@gimp.org>

	* configure.in: removed extra check for gthread and fold it into
	the GLIB and GTK checks.

	* */Makefile.am: changed accordingly.

	* app/main.c (main): always call g_thread_init().

svn path=/trunk/; revision=22832
This commit is contained in:
Sven Neumann 2007-06-25 12:41:59 +00:00 committed by Sven Neumann
parent 3254ed4d42
commit 09578ea070
33 changed files with 57 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-06-25 Sven Neumann <sven@gimp.org>
* configure.in: removed extra check for gthread and fold it into
the GLIB and GTK checks.
* */Makefile.am: changed accordingly.
* app/main.c (main): always call g_thread_init().
2007-06-25 Sven Neumann <sven@gimp.org>
* libgimpbase/gimpwire.c: if the wire protocol is used without

6
app/Makefile.am
View File

@ -82,8 +82,7 @@ endif
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION \
@GTHREAD_CFLAGS@
-DGIMP_APP_GLUE_COMPILATION
INCLUDES = \
-I$(top_srcdir) \
@ -133,7 +132,6 @@ gimp_2_3_LDADD = \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)
@ -176,7 +174,7 @@ gimp_console_2_3_LDADD = \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GTHREAD_LIBS) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)

3
app/actions/Makefile.am
View File

@ -159,8 +159,7 @@ EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-I$(top_builddir) \

3
app/base/Makefile.am
View File

@ -56,8 +56,7 @@ libappbase_a_SOURCES = \
tile-swap.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Base\"
INCLUDES = \
-I$(top_builddir) \

3
app/composite/Makefile.am
View File

@ -4,8 +4,7 @@ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Composite\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Composite\"
INCLUDES = \
-I$(top_builddir) \

5
app/config/Makefile.am
View File

@ -40,16 +40,15 @@ libappconfig_a_SOURCES = \
gimpxmlparser.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Config\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)

4
app/core/Makefile.am
View File

@ -2,8 +2,7 @@
AM_CPPFLAGS = \
-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\" \
-DG_LOG_DOMAIN=\"Gimp-Core\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Core\"
INCLUDES = \
-I$(top_builddir) \
@ -12,6 +11,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(LIBART_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappcore.a

3
app/dialogs/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Dialogs\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Dialogs\"
INCLUDES = \
-I$(top_builddir) \

3
app/display/Makefile.am
View File

@ -71,8 +71,7 @@ libappdisplay_a_SOURCES = \
$(libappdisplay_a_sources)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Display\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Display\"
INCLUDES = \
-I$(top_builddir) \

4
app/file/Makefile.am
View File

@ -3,8 +3,7 @@
noinst_LIBRARIES = libappfile.a
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-File\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-File\"
INCLUDES = \
-I$(top_builddir) \
@ -12,6 +11,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
libappfile_a_SOURCES = \

3
app/gui/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GUI\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-GUI\"
INCLUDES = \
-I$(top_builddir) \

3
app/main.c
View File

@ -285,10 +285,7 @@ main (int argc,
gchar *basename;
gint i;
#ifdef ENABLE_MP
if (! g_thread_supported ())
g_thread_init (NULL);
#endif
#ifdef GIMP_UNSTABLE
gimp_open_console_window ();

3
app/menus/Makefile.am
View File

@ -26,8 +26,7 @@ EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Menus\"
INCLUDES = \
-I$(top_builddir) \

3
app/paint-funcs/Makefile.am
View File

@ -19,8 +19,7 @@ INCLUDES = \
-I$(includedir)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\"
AM_CCASFLAGS = \
-I$(top_builddir) \

4
app/paint/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Paint\"
INCLUDES = \
-I$(top_builddir) \
@ -10,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapppaint.a

4
app/pdb/Makefile.am
View File

@ -65,8 +65,7 @@ libappinternal_procs_a_SOURCES = \
vectors_cmds.c
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-PDB\"
INCLUDES = \
-I$(top_builddir) \
@ -74,6 +73,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc

4
app/plug-in/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Plug-In\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Plug-In\"
INCLUDES = \
-I$(top_builddir) \
@ -10,6 +9,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappplug-in.a

4
app/text/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Text\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Text\"
INCLUDES = \
-I$(top_builddir) \
@ -11,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(PANGOFT2_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapptext.a

3
app/tools/Makefile.am
View File

@ -175,8 +175,7 @@ libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Tools\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Tools\"
INCLUDES = \
-I$(top_builddir) \

4
app/vectors/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Vectors\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Vectors\"
INCLUDES = \
-I$(top_builddir) \
@ -11,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(LIBART_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappvectors.a

3
app/widgets/Makefile.am
View File

@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Widgets\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Widgets\"
INCLUDES = \
-I$(top_builddir) \

4
app/xcf/Makefile.am
View File

@ -18,8 +18,7 @@ libappxcf_a_SOURCES = \
xcf-write.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-XCF\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-XCF\"
INCLUDES = \
-I$(top_builddir) \
@ -27,6 +26,7 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc

11
configure.in
View File

@ -418,7 +418,7 @@ AM_GLIB_GNU_GETTEXT
AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
gobject)
gobject gthread)
PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
@ -443,7 +443,8 @@ LIBS=$gimp_save_LIBS
AC_PATH_XTRA
AM_PATH_GTK_2_0(gtk_required_version, :,
AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.))
AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.),
gthread)
AC_MSG_CHECKING([if GTK+ is version 2.11.0 or newer])
if $PKG_CONFIG --atleast-version=2.11.0 gtk+-2.0; then
@ -884,10 +885,8 @@ fi
AC_ARG_ENABLE(mp, [ --disable-mp disable support for multiple processors])
if test "x$enable_mp" != "xno"; then
PKG_CHECK_MODULES(GTHREAD, gthread-2.0,
[AC_DEFINE(ENABLE_MP, 1,
[Define to 1 to enable support for multiple processors.])]
)
AC_DEFINE(ENABLE_MP, 1,
[Define to 1 to enable support for multiple processors.])
fi

1
devel-docs/app/Makefile.am
View File

@ -103,7 +103,6 @@ GTKDOC_LIBS = \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)

2
devel-docs/app/app-sections.txt
View File

@ -7122,8 +7122,6 @@ tile_manager_get
tile_manager_map_tile
tile_manager_map
tile_manager_validate
tile_manager_set_user_data
tile_manager_get_user_data
tile_manager_width
tile_manager_height
tile_manager_bpp

3
libgimp/Makefile.am
View File

@ -58,8 +58,7 @@ endif
gimpincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimp
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimp\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimp\"
INCLUDES = \
-I$(top_srcdir) \

5
libgimpbase/Makefile.am
View File

@ -51,9 +51,7 @@ AM_CPPFLAGS = \
-DGIMP_DATA_VERSION=\"$(GIMP_DATA_VERSION)\" \
-DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\" \
-DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\" \
-DG_LOG_DOMAIN=\"LibGimpBase\" \
@BINRELOC_CFLAGS@ \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpBase\"
AM_CCASFLAGS = \
-I$(top_builddir) \
@ -62,6 +60,7 @@ AM_CCASFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(BINRELOC_CFLAGS) \
-I$(includedir)
EXTRA_DIST = \

3
libgimpcolor/Makefile.am
View File

@ -47,8 +47,7 @@ endif
libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpColor\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpColor\"
INCLUDES = \
-I$(top_srcdir) \

3
libgimpconfig/Makefile.am
View File

@ -44,8 +44,7 @@ endif
libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpConfig\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpConfig\"
INCLUDES = \
-I$(top_srcdir) \

3
libgimpmath/Makefile.am
View File

@ -47,8 +47,7 @@ endif
libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpMath\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpMath\"
INCLUDES = \
-I$(top_srcdir) \

3
libgimpmodule/Makefile.am
View File

@ -42,8 +42,7 @@ endif
libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpModule\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpModule\"
INCLUDES = \
-I$(top_srcdir) \

4
libgimpthumb/Makefile.am
View File

@ -42,12 +42,12 @@ endif
libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpThumb\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpThumb\"
INCLUDES = \
-I$(top_srcdir) \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = \

3
libgimpwidgets/Makefile.am
View File

@ -49,8 +49,7 @@ endif
libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpWidgets\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"LibGimpWidgets\"
INCLUDES = \
-I$(top_srcdir) \