Changeset 465 for trunk/zoo-project/zoo-kernel/configure.ac

Timestamp:

Apr 23, 2014, 3:05:01 AM (10 years ago)

Author:

djay

Message:

Add the optional YAML ZCFG support #4 and the zcfg2yaml converter. Return error messages that enable the service provider to quickly identify the root cause of errors due to configuration file syntax #90. Fix logic in addMapToMap #91. Enable multiple range definition using default and supported blocks. Add the lastest revision number in version.h (available from Python ZOO-API as zoo.VERSION).

File:

• trunk/zoo-project/zoo-kernel/configure.ac (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -14 +14 @@
 AC_CHECK_LIB([fl], [main])
 AC_CHECK_LIB([pthread], [main])
-AC_CHECK_LIB([fcgi], [main])
 AC_CHECK_LIB([ssl], [main])
 
@@ -68 +67 @@
 
 # ===========================================================================
+# Detect if libyaml is available
+# ===========================================================================
+
+AC_ARG_WITH([yaml],
+        [AS_HELP_STRING([--with-yaml=PATH], [specify an alternative location for the fastcgi library])],
+        [YAMLPATH="$withval"], [YAMLPATH=""])
+
+if test -z "$YAMLPATH"
+then
+        YAML_LDFLAGS=""
+        YAML_CPPFLAGS=""
+        YAML_FILE=""
+        YAML_FILE1=""
+else
+
+        # Extract the linker and include flags
+        YAML_LDFLAGS="-L$YAMLPATH/lib -lyaml"
+        YAML_CPPFLAGS="-I$YAMLPATH/include -DYAML"
+        YAML_FILE="service_yaml.o"
+        YAML_FILE1="zcfg2yaml"
+        
+        # Check headers file
+        CPPFLAGS_SAVE="$CPPFLAGS"
+        CPPFLAGS="$YAML_CPPFLAGS"
+        LDFLAGS_SAVE="$LDFLAGS"
+        LDFLAGS="YAML_LDFLAGS"
+        AC_CHECK_LIB([yaml], [yaml_parser_initialize,yaml_parser_set_input_file,yaml_parser_scan])
+        AC_CHECK_HEADERS([yaml.h],
+                 [], [AC_MSG_ERROR([could not find headers include related to YAML])])
+
+fi
+AC_SUBST([YAML_CPPFLAGS])
+AC_SUBST([YAML_LDFLAGS])
+AC_SUBST([YAML_FILE])
+AC_SUBST([YAML_FILE1])
+
+# ===========================================================================
 # Detect if fastcgi is available
 # ===========================================================================
@@ -73 +109 @@
 AC_ARG_WITH([fastcgi],
         [AS_HELP_STRING([--with-fastcgi=PATH], [specify an alternative location for the fastcgi library])],
-        [FCGIPATH="$withval"], [FCGIPATH=""])
+        [FCGIPATH="$withval"], [FCGIPATH="/usr"])
 
 # Extract the linker and include flags
@@ -82 +118 @@
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$FCGI_CPPFLAGS"
+LDFLAGS_SAVE="LDFLAGS"
+LDFLAGS="$FCGI_LDFLAGS"
+AC_CHECK_LIB([fcgi], [main])
 AC_CHECK_HEADERS([fcgi_stdio.h],
                  [], [AC_MSG_ERROR([could not find headers include related to fastcgi])])