use Kind::Arbitrary instead of new config_options Vec

Author: dubiousjim

src/lib.rs

@@ -52,6 +52,7 @@ enum Kind {
     Disable,
     With,
     Without,
+    Arbitrary,
 }
 
 /// Builder style configuration for a pending autotools build.
@@ -63,7 +64,6 @@ pub struct Config {
     cxxflags: OsString,
     ldflags: OsString,
     options: Vec<(Kind, OsString, Option<OsString>)>,
-    config_options: Vec<(OsString, Option<OsString>)>,
     target: Option<String>,
     make_args: Option<Vec<String>>,
     make_targets: Option<Vec<String>>,
@@ -108,7 +108,6 @@ impl Config {
             cxxflags: OsString::new(),
             ldflags: OsString::new(),
             options: Vec::new(),
-            config_options: Vec::new(),
             make_args: None,
             make_targets: None,
             out_dir: None,
@@ -159,10 +158,7 @@ impl Config {
 
     /// Passes `--<opt><=optarg>` to configure.
     pub fn config_option<P: AsRef<OsStr>>(&mut self, opt: P, optarg: Option<P>) -> &mut Config {
-        let optarg = optarg.as_ref().map(|v| v.as_ref().to_owned());
-        self.config_options.push((opt.as_ref().to_owned(),
-                           optarg));
-        self
+        self.set_opt(Kind::Arbitrary, opt, optarg)
     }
 
     /// Passes `--enable-<opt><=optarg>` to configure.
@@ -377,30 +373,21 @@ impl Config {
             };
         }
 
+        let mut config_host = false;
+
         for &(ref kind, ref k, ref v) in &self.options {
             let mut os = OsString::from("--");
             match *kind {
-                Kind::Enable => os.push("enable"),
-                Kind::Disable => os.push("disable"),
-                Kind::With => os.push("with"),
-                Kind::Without => os.push("without")
+                Kind::Enable => os.push("enable-"),
+                Kind::Disable => os.push("disable-"),
+                Kind::With => os.push("with-"),
+                Kind::Without => os.push("without-"),
+                Kind::Arbitrary => {
+                    if k == "host" {
+                        config_host = true;
+                    }
+                }
             };
-            os.push("-");
-            os.push(k);
-            if let &Some(ref v) = v {
-                os.push("=");
-                os.push(v);
-            }
-            cmd.arg(os);
-        }
-
-        let mut config_host = false;
-
-        for &(ref k, ref v) in &self.config_options {
-            let mut os = OsString::from("--");
-            if k == "host" {
-                config_host = true;
-            }
             os.push(k);
             if let &Some(ref v) = v {
                 os.push("=");