Updated configure.pl to new plugin syntax

montywi · montywi · commit 981b4747538c · 2015-11-20T09:57:58.000+02:00
--with-plugin-name=xxxx
--with-plugins= now uses =AUTO instead of =1
diff --git a/cmake/configure.pl b/cmake/configure.pl
@@ -125,7 +125,7 @@ sub check_compiler
     foreach my $p (@plugins)
     {
       $p =~ s/-/_/g;
-      $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=1";
+      $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=AUTO";
     }
     next;
   }
@@ -137,7 +137,12 @@ sub check_compiler
   }
   if($option =~ /without-plugin=/ || $option =~ /without-plugin-/)
   {
-    $cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1";
+    $cmakeargs = $cmakeargs." -DPLUGIN_".uc(substr($option,15))."=NO";
+    next;
+  }
+  if($option =~ /with-plugin-(.*)=(.*)/)
+  {
+    $cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2);
     next;
   }
   if($option =~ /with-zlib-dir=bundled/)

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ sub check_compiler`
`125`	`125`	`foreach my $p (@plugins)`
`126`	`126`	`{`
`127`	`127`	`$p =~ s/-/_/g;`
`128`		`- $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=1";`
	`128`	`+ $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=AUTO";`
`129`	`129`	`}`
`130`	`130`	`next;`
`131`	`131`	`}`
`@@ -137,7 +137,12 @@ sub check_compiler`
`137`	`137`	`}`
`138`	`138`	`if($option =~ /without-plugin=/ \|\| $option =~ /without-plugin-/)`
`139`	`139`	`{`
`140`		`- $cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1";`
	`140`	`+ $cmakeargs = $cmakeargs." -DPLUGIN_".uc(substr($option,15))."=NO";`
	`141`	`+ next;`
	`142`	`+ }`
	`143`	`+ if($option =~ /with-plugin-(.)=(.)/)`
	`144`	`+ {`
	`145`	`+ $cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2);`
`141`	`146`	`next;`
`142`	`147`	`}`
`143`	`148`	`if($option =~ /with-zlib-dir=bundled/)`