Attachment #494294 for bug #612378





AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_MSG_CHECKING([for build time linking with Python (Win32)])
case "$host" in
  *-*-mingw*|*-*-cygwin*)
    os_win32=yes

    ;;
  *-*-darwin*)
    os_win32=no
    link_python_libs=no
    OS_EXT=dylib
    ;;
  *)


AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
if test "x$link_python_libs" = "xyes"; then
  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows require Python modules to be explicitly linked to libpython.]))
fi

AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])




CLEANFILES =
check_LTLIBRARIES = libgimarshallingtests.la
test_typelibs = GIMarshallingTests-1.0.typelib
extension_libadd =

if OS_WIN32
extension_libadd += \
	$(PYTHON_LIBS)
endif

nodist_libgimarshallingtests_la_SOURCES = \
	$(GI_DATADIR)/tests/gimarshallingtests.c \

check_LTLIBRARIES += testhelper.la

testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
testhelper_la_LDFLAGS = -module -avoid-version -no-undefined
testhelper_la_LIBADD = $(GLIB_LIBS) $(extension_libadd)
testhelper_la_SOURCES = \
	testhelpermodule.c \
	test-floating.c \
- 

Return to bug 612378

Lines 53-59 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Link Here

(-)a/configure.ac (-3 / +3 lines)
53		53
54	AC_CANONICAL_BUILD	54	AC_CANONICAL_BUILD
55	AC_CANONICAL_HOST	55	AC_CANONICAL_HOST
56	AC_MSG_CHECKING([for build time linking with Python (Darwin and Win32)])	56	AC_MSG_CHECKING([for build time linking with Python (Win32)])
57	case "$host" in	57	case "$host" in
58	--mingw\|--cygwin)	58	--mingw\|--cygwin)
59	os_win32=yes	59	os_win32=yes
Lines 62-68 case "$host" in Link Here
62	;;	62	;;
63	--darwin*)	63	--darwin*)
64	os_win32=no	64	os_win32=no
65	link_python_libs=yes	65	link_python_libs=no
66	OS_EXT=dylib	66	OS_EXT=dylib
67	;;	67	;;
68	*)	68	*)
Lines 121-127 AC_SUBST(PYTHON_SO) Link Here
121		121
122	AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))	122	AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
123	if test "x$link_python_libs" = "xyes"; then	123	if test "x$link_python_libs" = "xyes"; then
124	AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows and Darwin require Python modules to be explicitly linked to libpython.]))	124	AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows require Python modules to be explicitly linked to libpython.]))
125	fi	125	fi
126		126
127	AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])	127	AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])

Lines 1-6 Link Here

(-)a/tests/Makefile.am (-3 / +8 lines)
1	CLEANFILES =	1	CLEANFILES =
2	check_LTLIBRARIES = libgimarshallingtests.la	2	check_LTLIBRARIES = libgimarshallingtests.la
3	test_typelibs = GIMarshallingTests-1.0.typelib	3	test_typelibs = GIMarshallingTests-1.0.typelib
		4	extension_libadd =
		5
		6	if OS_WIN32
		7	extension_libadd += \
		8	$(PYTHON_LIBS)
		9	endif
4		10
5	nodist_libgimarshallingtests_la_SOURCES = \	11	nodist_libgimarshallingtests_la_SOURCES = \
6	$(GI_DATADIR)/tests/gimarshallingtests.c \	12	$(GI_DATADIR)/tests/gimarshallingtests.c \
Lines 64-71 CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIM Link Here
64	check_LTLIBRARIES += testhelper.la	70	check_LTLIBRARIES += testhelper.la
65		71
66	testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)	72	testhelper_la_CFLAGS = -I$(top_srcdir)/gi $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
67	testhelper_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS)	73	testhelper_la_LDFLAGS = -module -avoid-version -no-undefined
68	testhelper_la_LIBADD = $(GLIB_LIBS)	74	testhelper_la_LIBADD = $(GLIB_LIBS) $(extension_libadd)
69	testhelper_la_SOURCES = \	75	testhelper_la_SOURCES = \
70	testhelpermodule.c \	76	testhelpermodule.c \
71	test-floating.c \	77	test-floating.c \
72	-