Changeset 217 for branches/branch-1.2/zoo-kernel/configure.ac

Timestamp:

May 31, 2011, 3:30:49 AM (13 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/configure.ac (modified) (6 diffs)

branches/branch-1.2/zoo-kernel/configure.ac

@@ -119 +119 @@
 
 AC_ARG_WITH([python], 
-        [AS_HELP_STRING([--with-python=PATH], [To enabled python support or specify an alternative directory for python installation,  disabled by default])], 
+        [AS_HELP_STRING([--with-python=PATH], [To enable python support or specify an alternative directory for python installation,  disabled by default])], 
         [PYTHON_PATH="$withval"; PYTHON_ENABLED="-DUSE_PYTHON"], [PYTHON_ENABLED=""])
 
@@ -164 +164 @@
 
 AC_ARG_WITH([php], 
-        [AS_HELP_STRING([--with-php=PATH], [To enabled php support or specify an alternative directory for php installation,  disabled by default])], 
+        [AS_HELP_STRING([--with-php=PATH], [To enable php support or specify an alternative directory for php installation,  disabled by default])], 
         [PHP_PATH="$withval"; PHP_ENABLED="-DUSE_PHP"], [PHP_ENABLED=""])
 
@@ -209 +209 @@
 
 AC_ARG_WITH([perl], 
-        [AS_HELP_STRING([--with-perl=PATH], [To enabled perl support or specify an alternative directory for perl installation,  disabled by default])], 
+        [AS_HELP_STRING([--with-perl=PATH], [To enable perl support or specify an alternative directory for perl installation,  disabled by default])], 
         [PERL_PATH="$withval"; PERL_ENABLED="-DUSE_PERL"], [PERL_ENABLED=""])
 
@@ -217 +217 @@
         PERL_FILE=""
 else
-        PERLCONFIG="$PERL_PATH/bin/perl"
-        PHP_FILE="service_internal_perl.o"
+        PERL_FILE="service_internal_perl.o"
         if test  "$PERL_PATH" = "yes"
         then
-                # PHP was not specified, so search within the current path
+                # Perl was not specified, so search within the current path
                 AC_PATH_PROG([PERLCONFIG], [perl])
         else
@@ -249 +248 @@
 
 AC_ARG_WITH([java], 
-        [AS_HELP_STRING([--with-java=PATH], [To enabled java support, specify a JDK_HOME,  disabled by default])], 
+        [AS_HELP_STRING([--with-java=PATH], [To enable java support, specify a JDK_HOME,  disabled by default])], 
         [JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
 
@@ -308 +307 @@
 
 AC_ARG_WITH([js], 
-        [AS_HELP_STRING([--with-js=PATH], [specify --with-js=path-to-js to enabled js support, specify --with-js on linux debian like, js support is disabled by default ])], 
+        [AS_HELP_STRING([--with-js=PATH], [specify --with-js=path-to-js to enable js support, specify --with-js on linux debian like, js support is disabled by default ])], 
         [JSHOME="$withval";JS_ENABLED="-DUSE_JS"], [JS_ENABLED=""])