From b83d698671b16725b7f3baa0c459f9709fbc0f78 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 4 Feb 2009 14:29:53 +0900 Subject: [PATCH] Don't build the perl module if cross compiling. Whilst, in general, it should be possible to cross compile a perl module, the current organisation of the module doesn't support it. So this has been disabled until somebody has the time and resources to fix and test it. --- Makefile.am | 2 ++ configure.ac | 2 ++ perl-module/automake.mk | 6 +----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4fb848d2..06ae2e00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,9 @@ if WITH_GUI_TOOLS include $(top_srcdir)/glade/automake.mk endif +if WITH_PERL_MODULE include $(top_srcdir)/perl-module/automake.mk +endif PHONY += $(DIST_HOOKS) dist-hook: $(DIST_HOOKS) diff --git a/configure.ac b/configure.ac index b8c44c7a..aa1cb6f5 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,8 @@ if test x"$with_gui_tools" = x"yes" ; then fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") +AM_CONDITIONAL(WITH_PERL_MODULE, test x"$cross_compiling" != x"yes") + AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) PSPP_GSL_NEEDS_FGNU89_INLINE diff --git a/perl-module/automake.mk b/perl-module/automake.mk index 7fad5e42..f3bfdaf3 100644 --- a/perl-module/automake.mk +++ b/perl-module/automake.mk @@ -25,17 +25,14 @@ perl-module/pspp-module-config: Makefile echo ');' >> $$target ;\ cp $$target $(top_builddir)/perl-module/pspp-module-config - - perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) - perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources) $(RM) $@ cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist -.PHONY: module-make +PHONY += module-make module-make: perl-module/Makefile cd perl-module && $(MAKE) $(AM_MAKEFLAGS) @@ -64,7 +61,6 @@ clean-local: fi $(RM) perl-module/Makefile.old - CLEANFILES += \ perl-module/PSPP-Perl-$(VERSION).tar.gz \ perl-module/pspp-module-config \ -- 2.30.2