Changeset 3867 in Sophya for trunk/SophyaLib

Timestamp:

Aug 12, 2010, 4:25:41 PM (15 years ago)

Author:

ansari

Message:

petite amelioration, suppression des chemins en double -I -L ds configure, Reza 12/08/2010

File:

• trunk/SophyaLib/BuildMgr/configure (modified) (8 diffs)

trunk/SophyaLib/BuildMgr/configure

@@ -258 +258 @@
 if ( $?linux64 ) then 
   if ( $?arch64 ) then 
-    set defextlib = ( /usr/lib64 /usr/local/lib )
+    set defextlib = ( /usr/lib64 /usr/local/ )
     set defepilib = ( /usr/X11R6/lib64 )
     echo ' linux 64 , arch64 defextlib = ' $defextlib ' defepilib=' $defepilib 
@@ -393 +393 @@
     set dumrep = $duminc:h
     if ( "$dumrep" != "" ) then
-      set piextinc = "-I$dumrep"
       echo Includes for Motif found in $dumrep
+      if ( ( "$dumrep" != "/usr/include" ) && ( "$dumrep" != "/usr/include/" ) )   set piextinc = "-I$dumrep"
       break
     endif
@@ -408 +408 @@
       set dumrep2 = $duminc:h
       if ( "$dumrep2" != "" ) then
-        if ( "$dumrep2" != "$dumrep" )  set piextinc = "-I$dumrep2 $piextinc"
         echo Includes for readline found in $dumrep2
+        if ( "$dumrep2" != "$dumrep" )  then 
+          if ( ( "$dumrep2" != "/usr/include" ) && ( "$dumrep2" != "/usr/include/" ) )  set piextinc = "-I$dumrep2 $piextinc"
+        endif
         break
       endif
@@ -455 +457 @@
 
 ### recherche des librairies Motif et si besoin readline 
-set piextlib = '-L/usr/X11R6/lib -lXm'
+set piextlib = "-L$defepilib -lXm"
 if ( $?avecPI ) then
   echo " "
@@ -463 +465 @@
     set dumrep = $dumlib:h
     if ( "$dumrep" != "" ) then
-      set piextlib = "-L$dumrep -lXm"
       echo Motif library found in $dumrep
+      if ( ( "$dumrep" != "/usr/lib" ) && ( "$dumrep" != "/usr/lib/" ) && \
+           ( "$dumrep" != "/usr/lib64" ) && ( "$dumrep" != "/usr/lib64/" ) && \
+           ( "$dumrep" != "/usr/X11R6/lib" ) && ( "$dumrep" != "/usr/X11R6/lib/" ) && \
+           ( "$dumrep" != "/usr/X11R6/lib64" ) && ( "$dumrep" != "/usr/X11R6/lib64/" ) )  set piextlib = "-L$dumrep -lXm"
       break
     endif
@@ -478 +483 @@
     set dumrep2 = $dumlib:h
     if ( "$dumrep2" != "" ) then
-      if ( "$dumrep2" != "$dumrep" )  then 
+      if ( ( "$dumrep2" != "$dumrep" )  && \
+           ( "$dumrep2" != "/usr/lib" ) && ( "$dumrep2" != "/usr/lib/" ) && \
+           ( "$dumrep2" != "/usr/lib64" ) && ( "$dumrep2" != "/usr/lib64/" ) && \
+           ( "$dumrep2" != "/usr/X11R6/lib" ) && ( "$dumrep2" != "/usr/X11R6/lib/" ) && \
+           ( "$dumrep2" != "/usr/X11R6/lib64" ) && ( "$dumrep2" != "/usr/X11R6/lib64/" ) )  then
         set piextlib = "-L$dumrep2 -lreadline -lhistory -lcurses $piextlib "
       else 
@@ -487 +496 @@
     endif
     end
-    if ( "$dumrep" == "" ) then
+    if ( "$dumrep2" == "" ) then
+      set piextlib = "$piextlib -lreadline -lhistory -lcurses "
       echo WARNING: libraries for readline NOT found
-      echo '    expect problems for linking piapp, check sophyamake.inc ... '
+      echo '    expect problems when linking piapp, check sophyamake.inc ... '
     endif
   endif
@@ -605 +615 @@
 endif
 if ( ( $?linux64 ) && ( $?arch64) ) then
+  echo "s?-L/usr/lib?-L/usr/lib64?g" >>  $sprgfile 
   echo "s?-L/usr/X11R6/lib?-L/usr/X11R6/lib64?g" >>  $sprgfile 
 endif