Fixup breakage from previous changes

Distribution/Make.hs

@@ -152,7 +152,9 @@ configureAction :: ConfigFlags -> [String] -> IO ()
 configureAction flags args = do
   no_extra_flags args
   let verbosity = fromFlag (configVerbose flags)
-  rawSystemExit verbosity "./configure" (configureArgs flags)
+  rawSystemExit verbosity "./configure"
+    (configureArgs backwardsCompatHack flags)
+  where backwardsCompatHack = True
 
 copyAction :: CopyFlags -> [String] -> IO ()
 copyAction flags args = do

Distribution/Simple/SetupWrapper.hs

@@ -110,8 +110,8 @@ setupWrapper args mdir = inDir mdir $ do
 buildTypes :: [(BuildType, ([String] -> IO (), String))]
 buildTypes = [
   (Simple, (defaultMainArgs, "import Distribution.Simple; main=defaultMain")),
-  (Configure, (defaultMainWithHooksArgs defaultUserHooks,
-    "import Distribution.Simple; main=defaultMainWithHooks defaultUserHooks")),
+  (Configure, (defaultMainWithHooksArgs autoconfUserHooks,
+    "import Distribution.Simple; main=defaultMainWithHooks autoconfUserHooks")),
   (Make, (Make.defaultMainArgs, "import Distribution.Make; main=defaultMain"))]
 
 inDir :: Maybe FilePath -> IO () -> IO ()