From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sat, 15 Mar 2014 13:04:11 +0000 (+0100)
Subject: Revert "Don't add redundant includedir INSTALLDIR.'/extlib/'"
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0a4e1e0f1bcdded5dfeb9ac560a689c3bd60aa5a;p=quix0rs-gnu-social.git

Revert "Don't add redundant includedir INSTALLDIR.'/extlib/'"

This reverts commit 31d8069779357fbcadcaf6a0852980160131f0a4.

I didn't notice any errors because I had php-pear installed. :]
---

diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 2bf1f0fc36..d7ee158801 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -36,7 +36,13 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-require_once INSTALLDIR . '/extlib/Console/Getopt.php';
+// Add extlib to our path so we can get Console_Getopt
+
+$_extra_path = array(INSTALLDIR.'/extlib/');
+
+set_include_path(implode(PATH_SEPARATOR, $_extra_path) . PATH_SEPARATOR . get_include_path());
+
+require_once 'Console/Getopt.php';
 
 // Note: $shortoptions and $longoptions should be pre-defined!