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

define PYLINK_LIBS on Win32, since DLLs need to have all their symbols 

2005-06-24  Manish Singh  <yosh@gimp.org>

        * configure.in: define PYLINK_LIBS on Win32, since DLLs need to have
        all their symbols fully resolved at link time.

        * plug-ins/pygimp/Makefile.am: link python modules with PYLINK_LIBS.
This commit is contained in:
Manish Singh 2005-06-24 23:13:49 +00:00 committed by Manish Singh
parent 449080818b
commit 6d5096312e
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-06-24 Manish Singh <yosh@gimp.org>
* configure.in: define PYLINK_LIBS on Win32, since DLLs need to have
all their symbols fully resolved at link time.
* plug-ins/pygimp/Makefile.am: link python modules with PYLINK_LIBS.
2005-06-25 Sven Neumann <sven@gimp.org>
* app/dialogs/preferences-dialog.c: relabel the profile used for

11
configure.in
View File

@ -1348,6 +1348,17 @@ if test "x$enable_python" != xno; then
AM_CHECK_PYTHON_HEADERS(,
[AC_MSG_ERROR([pycheck_error([Python headers], [them])])])
dnl Win32 needs all symbols resolved for linking, even for DLLs
dnl Assume the link library is in $exec_prefix/libs
dnl This might be able to be figured out from distutils, but it's
dnl not documented so we won't rely on internal implementation
PYLINK_LIBS=
if test "x$platform_win32" = "xyes"; then
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYLINK_LIBS="-L${py_exec_prefix}/libs -lpython${PYTHON_VERSION}"
fi
AC_SUBST(PYLINK_LIBS)
dnl check for PyGTK
PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version,,
[AC_MSG_ERROR([pycheck_error([PyGTK], [it])])])

6
plug-ins/pygimp/Makefile.am
View File

@ -43,6 +43,7 @@ gimpmodule_la_LIBADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GLIB_LIBS) \
$(PYLINK_LIBS) \
$(RT_LIBS)
_gimpenumsmodule_la_SOURCES = \
@ -56,6 +57,7 @@ _gimpenumsmodule_la_LIBADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GLIB_LIBS) \
$(PYLINK_LIBS) \
$(RT_LIBS)
gimpcolormodule_la_SOURCES = \
@ -68,7 +70,8 @@ gimpcolormodule_la_LDFLAGS = -module -avoid-version $(no_undefined) \
gimpcolormodule_la_LIBADD = \
$(libgimpcolor) \
$(GLIB_LIBS)
$(GLIB_LIBS) \
$(PYLINK_LIBS)
gimpprocbrowsermodule_la_SOURCES = \
procbrowser.c
@ -86,6 +89,7 @@ gimpprocbrowsermodule_la_LIBADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(PYLINK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)