[Pkg-voip-commits] [janus] 151/163: Added configure flag (--enable-all-js-modules) to enable all JS modules

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit fadb4fecfce8544551848363080dd470702aa832
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Oct 20 18:14:24 2017 +0200

    Added configure flag (--enable-all-js-modules) to enable all JS modules
---
 configure.ac | 112 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 64 insertions(+), 48 deletions(-)

diff --git a/configure.ac b/configure.ac
index 546335f..701cc54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,17 @@ AC_ARG_ENABLE([all-handlers],
               ],
               [])
 
+AC_ARG_ENABLE([all-js-modules],
+              [AS_HELP_STRING([--enable-all-js-modules],
+                              [Build all the JavaScript modules (instead of manually enabling them one by one)])],
+              [
+               enable_javascript_es_module=yes
+               enable_javascript_umd_module=yes
+               enable_javascript_iife_module=yes
+               enable_javascript_common_js_module=yes
+              ],
+              [])
+
 AC_ARG_ENABLE([rest],
               [AS_HELP_STRING([--disable-rest],
                               [Disable REST (HTTP/HTTPS) support])],
@@ -169,54 +180,6 @@ AC_ARG_ENABLE([sample-event-handler],
                      [enable_sample_event_handler=no])],
               [enable_sample_event_handler=maybe])
 
-AC_ARG_ENABLE([javascript-es-module],
-              [AS_HELP_STRING([--enable-javascript-es-module],
-                              [Enable generating an ECMAScript style module from janus.js])],
-              [AS_IF([test "x$enable_javascript_es_module" = "xyes"],
-                     [enable_javascript_es_module=yes])],
-              [enable_javascript_es_module=no])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_ES_MODULE], [test "x$enable_javascript_es_module" = "xyes" ])
-
-AC_ARG_ENABLE([javascript-umd-module],
-              [AS_HELP_STRING([--enable-javascript-umd-module],
-                              [Enable generating an UMD style module from janus.js])],
-              [AS_IF([test "x$enable_javascript_umd_module" = "xyes"],
-                     [enable_javascript_umd_module=yes])],
-              [enable_javascript_umd_module=no])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_UMD_MODULE], [test "x$enable_javascript_umd_module" = "xyes" ])
-
-AC_ARG_ENABLE([javascript-iife-module],
-              [AS_HELP_STRING([--enable-javascript-iife-module],
-                              [Enable generating an IIFE style wrapper around janus.js])],
-              [AS_IF([test "x$enable_javascript_iife_module" = "xyes"],
-                     [enable_javascript_iife_module=yes])],
-              [enable_javascript_iife_module=no])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_IIFE_MODULE], [test "x$enable_javascript_iife_module" = "xyes" ])
-
-AC_ARG_ENABLE([javascript-common-js-module],
-              [AS_HELP_STRING([--enable-javascript-common-js-module],
-                              [Enable generating an CommonJS style module from janus.js])],
-              [AS_IF([test "x$enable_javascript_common_js_module" = "xyes"],
-                     [enable_javascript_common_js_module=yes])],
-              [enable_javascript_common_js_module=no])
-AM_CONDITIONAL([ENABLE_JAVASCRIPT_COMMON_JS_MODULE], [test "x$enable_javascript_common_js_module" = "xyes" ])
-
-case "-${enable_javascript_common_js_module}-${enable_javascript_iife_module}-${enable_javascript_umd_module}-${enable_javascript_es_module}-" in
-    *-yes*)
-        AM_CONDITIONAL([ENABLE_JAVASCRIPT_MODULES], true)
-    ;;
-    *)
-        AM_CONDITIONAL([ENABLE_JAVASCRIPT_MODULES], false)
-    ;;
-esac
-
-AC_ARG_VAR(NPM,"npm executable to use")
-AC_PATH_PROG(NPM,npm,,)
-AM_CONDITIONAL([NPM_FOUND], [test "x$NPM" != "x" ])
-AM_COND_IF([ENABLE_JAVASCRIPT_MODULES],[
-    AM_COND_IF([NPM_FOUND],,[AC_MSG_ERROR([npm not found])])
-])
-
 PKG_CHECK_MODULES([JANUS],
                   [
                     glib-2.0 >= $glib_version
@@ -610,6 +573,59 @@ PKG_CHECK_MODULES([EVENTS],
 
 
 ##
+# JavaScript modules
+##
+
+AC_ARG_ENABLE([javascript-es-module],
+              [AS_HELP_STRING([--enable-javascript-es-module],
+                              [Generate an ECMAScript style module from janus.js])],
+              [AS_IF([test "x$enable_javascript_es_module" = "xyes"],
+                     [enable_javascript_es_module=yes])],
+              [enable_javascript_es_module=no])
+AM_CONDITIONAL([ENABLE_JAVASCRIPT_ES_MODULE], [test "x$enable_javascript_es_module" = "xyes" ])
+
+AC_ARG_ENABLE([javascript-umd-module],
+              [AS_HELP_STRING([--enable-javascript-umd-module],
+                              [Generate an UMD style module from janus.js])],
+              [AS_IF([test "x$enable_javascript_umd_module" = "xyes"],
+                     [enable_javascript_umd_module=yes])],
+              [enable_javascript_umd_module=no])
+AM_CONDITIONAL([ENABLE_JAVASCRIPT_UMD_MODULE], [test "x$enable_javascript_umd_module" = "xyes" ])
+
+AC_ARG_ENABLE([javascript-iife-module],
+              [AS_HELP_STRING([--enable-javascript-iife-module],
+                              [Generate an IIFE style wrapper around janus.js])],
+              [AS_IF([test "x$enable_javascript_iife_module" = "xyes"],
+                     [enable_javascript_iife_module=yes])],
+              [enable_javascript_iife_module=no])
+AM_CONDITIONAL([ENABLE_JAVASCRIPT_IIFE_MODULE], [test "x$enable_javascript_iife_module" = "xyes" ])
+
+AC_ARG_ENABLE([javascript-common-js-module],
+              [AS_HELP_STRING([--enable-javascript-common-js-module],
+                              [Generate an CommonJS style module from janus.js])],
+              [AS_IF([test "x$enable_javascript_common_js_module" = "xyes"],
+                     [enable_javascript_common_js_module=yes])],
+              [enable_javascript_common_js_module=no])
+AM_CONDITIONAL([ENABLE_JAVASCRIPT_COMMON_JS_MODULE], [test "x$enable_javascript_common_js_module" = "xyes" ])
+
+case "-${enable_javascript_common_js_module}-${enable_javascript_iife_module}-${enable_javascript_umd_module}-${enable_javascript_es_module}-" in
+    *-yes*)
+        AM_CONDITIONAL([ENABLE_JAVASCRIPT_MODULES], true)
+    ;;
+    *)
+        AM_CONDITIONAL([ENABLE_JAVASCRIPT_MODULES], false)
+    ;;
+esac
+
+AC_ARG_VAR(NPM,"npm executable to use")
+AC_PATH_PROG(NPM,npm,,)
+AM_CONDITIONAL([NPM_FOUND], [test "x$NPM" != "x" ])
+AM_COND_IF([ENABLE_JAVASCRIPT_MODULES],[
+    AM_COND_IF([NPM_FOUND],,[AC_MSG_ERROR([npm not found])])
+])
+
+
+##
 # Post-processing
 ##
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git