Imported Upstream version 5.3.7upstream/5.3.7

5 files changed, 15 insertions, 7 deletions

diff --git a/scripts/dev/generate-phpt/src/gtTestSubject.php b/scripts/dev/generate-phpt/src/gtTestSubject.php
index 9be1e7450..ccf3caad9 100644
--- a/scripts/dev/generate-phpt/src/gtTestSubject.php
+++ b/scripts/dev/generate-phpt/src/gtTestSubject.php
@@ -128,7 +128,7 @@ abstract class gtTestSubject {
 
 
   /**
-   * Returns the argument list with teh greatest possible number of arguments.
+   * Returns the argument list with the greatest possible number of arguments.
    *
    * @return string
    */
@@ -163,4 +163,4 @@ abstract class gtTestSubject {
     return $this->initialisationStatements;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
index 5f16d98f3..a52988aa6 100644
--- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
+++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Check that teh method name is valid
+ * Check that the method name is valid
  *
  */
 class gtIsValidMethod extends gtPreCondition {
@@ -25,4 +25,4 @@ class gtIsValidMethod extends gtPreCondition {
     return gtText::get('unknownMethod');
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
index cb67aa345..cc5e19a5a 100644
--- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
+++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
@@ -23,7 +23,7 @@ abstract class gtTestCase {
 
 
   /**
-   * Object containing teh ooptional sections that may be added to the test case
+   * Object containing the optional sections that may be added to the test case
    *
    * @var gtOptionalSections
    */
@@ -140,7 +140,7 @@ abstract class gtTestCase {
 
 
   /**
-   * Add FILE section closing tag to teh test case
+   * Add FILE section closing tag to the test case
    *
    */
   public function fileClosing() {
@@ -227,4 +227,4 @@ abstract class gtTestCase {
     return $this->optionalSections;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index 2e49bfac8..5c60408f4 100644
--- a/scripts/man1/php-config.1.in
+++ b/scripts/man1/php-config.1.in
@@ -27,6 +27,10 @@ LD Flags which PHP was compiled with
 Extra libraries which PHP was compiled with
 .TP
 .PD 0
+.B \-\-man-dir
+The directory prefix where the manpages is installed
+.TP
+.PD 0
 .B \-\-extension-dir
 Directory where extensions are searched by default
 .TP
diff --git a/scripts/php-config.in b/scripts/php-config.in
index f7d0bcd35..13c25f290 100644
--- a/scripts/php-config.in
+++ b/scripts/php-config.in
@@ -10,6 +10,7 @@ includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/
 ldflags="@PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
 extension_dir='@EXTENSION_DIR@'
+man_dir=`eval echo @mandir@`
 program_prefix="@program_prefix@"
 program_suffix="@program_suffix@"
 exe_extension="@EXEEXT@"
@@ -59,6 +60,8 @@ case "$1" in
   echo $php_sapis;;
 --configure-options)
   echo $configure_options;;
+--man-dir)
+  echo $man_dir;;
 --version)
   echo $version;;
 --vernum)
@@ -73,6 +76,7 @@ Options:
   --libs              [$libs]
   --extension-dir     [$extension_dir]
   --include-dir       [$include_dir]
+  --man-dir           [$man_dir]
   --php-binary        [$php_binary]
   --php-sapis         [$php_sapis]
   --configure-options [$configure_options]