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

check for gmodule-no-export-2.0, not for gmodule-2.0. Also removed 

2006-05-12  Michael Natterer  <mitch@gimp.org>

	* configure.in: check for gmodule-no-export-2.0, not for
	gmodule-2.0. Also removed gobject-2.0 from the gmodule check, i
	have no idea why it was there.

	* libgimpmodule/Makefile.am: s/GMODULE/GMODULE_NO_EXPORT/ because
	we only want to import modules here, not export our own symbols.

	(note that this change is actually useless, because libgimpmodule
	 exports its symbols anyway, but it's more correct this way).
This commit is contained in:
Michael Natterer 2006-05-12 15:18:13 +00:00 committed by Michael Natterer
parent edd8f6275b
commit f94ec804a4
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2006-05-12 Michael Natterer <mitch@gimp.org>
* configure.in: check for gmodule-no-export-2.0, not for
gmodule-2.0. Also removed gobject-2.0 from the gmodule check, i
have no idea why it was there.
* libgimpmodule/Makefile.am: s/GMODULE/GMODULE_NO_EXPORT/ because
we only want to import modules here, not export our own symbols.
(note that this change is actually useless, because libgimpmodule
exports its symbols anyway, but it's more correct this way).
2006-05-12 Michael Natterer <mitch@gimp.org> 2006-05-12 Michael Natterer <mitch@gimp.org>
* app/config/Makefile.am: make test-config link again. * app/config/Makefile.am: make test-config link again.

2
configure.in
View File

@ -405,7 +405,7 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.), AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
gobject) gobject)
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0) PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
AC_MSG_CHECKING([if GLib is version 2.11.0 or newer]) AC_MSG_CHECKING([if GLib is version 2.11.0 or newer])
if $PKG_CONFIG --atleast-version=2.11.0 glib-2.0; then if $PKG_CONFIG --atleast-version=2.11.0 glib-2.0; then

10
libgimpmodule/Makefile.am
View File

@ -46,9 +46,9 @@ AM_CPPFLAGS = \
@GTHREAD_CFLAGS@ @GTHREAD_CFLAGS@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \ $(GMODULE_NO_EXPORT_CFLAGS) \
-I$(includedir) -I$(includedir)
EXTRA_DIST = \ EXTRA_DIST = \
@ -77,8 +77,8 @@ libgimpmodule_2_0_la_LDFLAGS = \
libgimpmodule_2_0_la_DEPENDENCIES = $(gimpmodule_def) libgimpmodule_2_0_la_DEPENDENCIES = $(gimpmodule_def)
libgimpmodule_2_0_la_LIBADD = \ libgimpmodule_2_0_la_LIBADD = \
$(libgimpbase) \ $(libgimpbase) \
$(GMODULE_LIBS) $(GMODULE_NO_EXPORT_LIBS)
install-data-local: install-ms-lib install-libtool-import-lib install-data-local: install-ms-lib install-libtool-import-lib