Attachment #204509 for bug #252824




    incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
#endif

    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
    incpush("/etc/perl", FALSE, FALSE, TRUE, TRUE);

#ifdef MACOS_TRADITIONAL
    {
	Stat_t tmpstatbuf;

#endif
#if defined(WIN32)
    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
#else
    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
#endif

#ifdef PERL_VENDORARCH_EXP
    /* vendorarch is always relative to vendorlib on Windows for
     * DLL-based path intuition to work correctly */
#  if !defined(WIN32)
    incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE);
#  endif
#endif

#ifdef PERL_VENDORLIB_EXP
#  if defined(WIN32)
    /* this picks up vendorarch as well */
    incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE);
#  else
    incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE);
#  endif
#endif

#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
    incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
#endif

#ifdef SITEARCH_EXP
    /* sitesearch is always relative to sitelib on Windows for
     * DLL-based path intuition to work correctly */
#  if !defined(WIN32)
    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
#  endif
#endif

#ifdef SITELIB_EXP
#  if defined(WIN32)
    incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);	/* this picks up sitearch as well */
#  else
    incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
#  endif
#endif

#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
    incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
#endif

    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);

    /* Non-versioned site directory for local modules and for
       compatability with the previous packages' site dirs */

    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE, TRUE);

#ifdef PERL_OTHERLIBDIRS
    incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
#endif

Return to bug 252824

Lines 4882-4890 Link Here

(-)perl.c.orig (-23 / +28 lines)
4882	incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);	4882	incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
4883	#endif	4883	#endif
4884		4884
4885	#ifdef ARCHLIB_EXP	4885	/* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
4886	incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);	4886	incpush("/etc/perl", FALSE, FALSE, TRUE, TRUE);
4887	#endif	4887
4888	#ifdef MACOS_TRADITIONAL	4888	#ifdef MACOS_TRADITIONAL
4889	{	4889	{
4890	Stat_t tmpstatbuf;	4890	Stat_t tmpstatbuf;
Lines 4911-4962 Link Here
4911	#endif	4911	#endif
4912	#if defined(WIN32)	4912	#if defined(WIN32)
4913	incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);	4913	incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
4914	#else
4915	incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
4916	#endif	4914	#endif
4917		4915
4918	#ifdef SITEARCH_EXP	4916	#ifdef PERL_VENDORARCH_EXP
4919	/* sitearch is always relative to sitelib on Windows for	4917	/* vendorarch is always relative to vendorlib on Windows for
4920	* DLL-based path intuition to work correctly */	4918	* DLL-based path intuition to work correctly */
4921	# if !defined(WIN32)	4919	# if !defined(WIN32)
4922	incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);	4920	incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE);
4923	# endif	4921	# endif
4924	#endif	4922	#endif
4925		4923
4926	#ifdef SITELIB_EXP	4924	#ifdef PERL_VENDORLIB_EXP
4927	# if defined(WIN32)	4925	# if defined(WIN32)
4928	/* this picks up sitearch as well */	4926	/* this picks up vendorarch as well */
4929	incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);	4927	incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE);
4930	# else	4928	# else
4931	incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);	4929	incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE);
4932	# endif	4930	# endif
4933	#endif	4931	#endif
4934		4932
4935	#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)	4933	#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
4936	/* Search for version-specific dirs below here */	4934	incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
4937	incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
4938	#endif	4935	#endif
4939		4936
4940	#ifdef PERL_VENDORARCH_EXP	4937	#ifdef SITEARCH_EXP
4941	/* vendorarch is always relative to vendorlib on Windows for	4938	/* sitesearch is always relative to sitelib on Windows for
4942	* DLL-based path intuition to work correctly */	4939	* DLL-based path intuition to work correctly */
4943	# if !defined(WIN32)	4940	# if !defined(WIN32)
4944	incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE, TRUE);	4941	incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE);
4945	# endif	4942	# endif
4946	#endif	4943	#endif
4947		4944
4948	#ifdef PERL_VENDORLIB_EXP	4945	#ifdef SITELIB_EXP
4949	# if defined(WIN32)	4946	# if defined(WIN32)
4950	incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE, TRUE); /* this picks up vendorarch as well */	4947	incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); /* this picks up sitearch as well */
4951	# else	4948	# else
4952	incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE, TRUE);	4949	incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
4953	# endif	4950	# endif
4954	#endif	4951	#endif
4955		4952
4956	#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */	4953	#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
4957	incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);	4954	incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
4958	#endif	4955	#endif
4959		4956
		4957	incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
		4958	incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
		4959
		4960	/* Non-versioned site directory for local modules and for
		4961	compatability with the previous packages' site dirs */
		4962
		4963	incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE, TRUE);
		4964
4960	#ifdef PERL_OTHERLIBDIRS	4965	#ifdef PERL_OTHERLIBDIRS
4961	incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);	4966	incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
4962	#endif	4967	#endif