fgrollier
diff --git a/‎astropy/nddata/convolution/convolve.py‎
Lines changed: 11 additions & 1 deletion b/‎astropy/nddata/convolution/convolve.py‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎astropy/nddata/convolution/make_kernel.py‎
Lines changed: 2 additions & 0 deletions b/‎astropy/nddata/convolution/make_kernel.py‎
Lines changed: 2 additions & 0 deletions
@@ -1,5 +1,13 @@
+# Licensed under a 3-clause BSD style license - see PYFITS.rst
+
 import numpy as np
 import warnings
+from astropy.config import ConfigurationItem
+
+USE_NUMPY_FFT = ConfigurationItem('use_numpy_fft', False,
+        "Use numpy's fft instead of fftw.  This will be forced True if fftw is unavailable.")
+
+
 try:
     import fftw3
     has_fftw = True
@@ -23,6 +31,8 @@ def ifftwn(array, nthreads=1):
     fftn = np.fft.fftn
     ifftn = np.fft.ifftn
     has_fftw = False
+    USE_NUMPY_FFT=True
+
 
 from .boundary_none import convolve1d_boundary_none, \
                            convolve2d_boundary_none, \
@@ -203,7 +213,7 @@ def convolve_fft(array, kernel, boundary='fill', fill_value=0,
         crop=True, return_fft=False, fft_pad=True,
         psf_pad=False, interpolate_nan=False, quiet=False,
         ignore_edge_zeros=False, min_wt=0.0, normalize_kernel=False,
-        use_numpy_fft=not has_fftw, nthreads=1):
+        use_numpy_fft=USE_NUMPY_FFT, nthreads=1):
     """
     Convolve an ndarray with an nd-kernel.  Returns a convolved image with
     shape = array.shape.  Assumes kernel is centered.
 
@@ -1,3 +1,5 @@
+# Licensed under a 3-clause BSD style license - see PYFITS.rst
+
 import numpy as np
 
 def make_kernel(kernelshape, kernelwidth=3, kerneltype='gaussian',
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# Licensed under a 3-clause BSD style license - see PYFITS.rst`
	`2`	`+`
`1`	`3`	`import numpy as np`
`2`	`4`
`3`	`5`	`def make_kernel(kernelshape, kernelwidth=3, kerneltype='gaussian',`