fixup! Revert back to the standard form for ccall which supports LazyLibrary improvements

Author: vtjnash

src/FFTW.jl

@@ -16,10 +16,17 @@ export dct, idct, dct!, idct!, plan_dct, plan_idct, plan_dct!, plan_idct!
 
 include("providers.jl")
 
-function check_env()
+function fftw_init_check()
+    # If someone is trying to set the provider via the old environment variable, warn them that they
+    # should instead use `set_provider!()` instead.
     if haskey(ENV, "JULIA_FFTW_PROVIDER")
         Base.depwarn("JULIA_FFTW_PROVIDER is deprecated; use FFTW.set_provider!() instead", :JULIA_FFTW_PROVIDER)
     end
+
+    # Hook FFTW threads up to our partr runtime
+    @static if fftw_provider == "fftw"
+        fftw_init_threads()
+    end
 end
 
 if VERSION >= v"1.11.0"
@@ -42,12 +49,6 @@ function dlopen(lib::FakeLazyLibrary)
     end
     return h
 end
-function fftw_init_check()
-    check_env()
-    @static if fftw_provider == "fftw"
-        fftw_init_threads()
-    end
-end
 
 @static if fftw_provider == "fftw"
     import FFTW_jll: libfftw3 as libfftw3_no_init,
@@ -60,23 +61,19 @@ const libfftw3 = FakeLazyLibrary(:libfftw3_no_init, fftw_init_check, C_NULL)
 const libfftw3f = FakeLazyLibrary(:libfftw3f_no_init, fftw_init_check, C_NULL)
 
 else
+@static if fftw_provider == "fftw"
+    import FFTW_jll: libfftw3_path as libfftw3_no_init,
+                     libfftw3f_path as libfftw3f_no_init,
+                     libfftw3_path as libfftw3,
+                     libfftw3f_path as libfftw3f
+elseif fftw_provider == "mkl"
+    import MKL_jll: libmkl_rt_path as libfftw3_no_init,
+                    libmkl_rt_path as libfftw3f_no_init,
+                    libmkl_rt_path as libfftw3,
+                    libmkl_rt_path as libfftw3f
+end
 function __init__()
-    # If someone is trying to set the provider via the old environment variable, warn them that they
-    # should instead use `set_provider!()` instead.
-    check_env()
-
-    global libfftw3
-    global libfftw3f
-    # Hook FFTW threads up to our partr runtime
-    @static if fftw_provider == "fftw"
-        libfftw3 = FFTW_jll.libfftw3_path
-        libfftw3f = FFTW_jll.libfftw3f_path
-        fftw_init_threads()
-    end
-    @static if fftw_provider == "mkl"
-        libfftw3 = MKL_jll.libmkl_rt_path
-        libfftw3f = MKL_jll.libmkl_rt_path
-    end
+    fftw_init_check()
 end
 end