[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

[Don Lewis]

 set_soenv.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 092d339debd3b567e6bc4f5f659fbf0103eaf3e5
Author: Don Lewis <truckman at apache.org>
Date:   Sat Jan 6 08:48:47 2018 +0000

    Don't add X11 include directory to compiler command line if it is
    
    /usr/include since the compiler will look there automatically.

diff --git a/set_soenv.in b/set_soenv.in
index 8912b8b5719e..b8e19203b58b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1432,7 +1432,9 @@ if ($platform =~ m/linux/)
 	}
     #The tail, if needed
     if ($platform =~ m/linux|freebsd|netbsd/)
-    {  $SOLARINC  .= $I.$XINC;
+    {  if ($XINC ne $USR.$INCLUDE)
+       { $SOLARINC  .= $I.$XINC;
+       }
     }
     elsif ($platform =~ m/osf1/)
     {  $SOLARINC  .= $I.$XINC.