Changeset 16092 for trunk/psconfig/psconfig.csh

Timestamp:

Jan 15, 2008, 6:01:17 PM (19 years ago)

Author:

eugene

Message:

fixing various build issues: where to get mysql, options passed to extlibs, name cleanups

File:

• trunk/psconfig/psconfig.csh (modified) (4 diffs)

trunk/psconfig/psconfig.csh

@@ -243 +243 @@
   endif
 end
+
+## XXX mysql (and others?) are not installed in the correct location: they go into
+## prefix/lib/mysql regardless of configure options
 if ("$PSCONFIG" == "none") then
   if ("$newpath" == "") then
     unsetenv CPATH
   else
-    setenv CPATH {$newpath}
-  endif 
-else
-  if ("$newpath" == "") then
-    setenv CPATH {$incdir}:
-  else
-    setenv CPATH {$incdir}:{$newpath}
+    setenv CPATH {$newpath}:
+  endif 
+else
+  if ("$newpath" == "") then
+    setenv CPATH {$incdir}:{$PSCONFDIR}/{$PSCONFIG}/include/mysql:
+  else
+    setenv CPATH {$incdir}:{$PSCONFDIR}/{$PSCONFIG}/include/mysql:{$newpath}:
   endif 
 endif 
@@ -270 +273 @@
   endif
 end
+
+## XXX mysql (and others?) are not installed in the correct location: they go into
+## prefix/lib/mysql regardless of configure options
 if ("$PSCONFIG" == "none") then
   if ("$newpath" == "") then
@@ -275 +281 @@
     unsetenv LIBRARY_PATH
   else
-    setenv LD_LIBRARY_PATH {$newpath}
-    setenv LIBRARY_PATH {$newpath}
-  endif 
-else
-  if ("$newpath" == "") then
-    setenv LD_LIBRARY_PATH {$libdir}:
-    setenv LIBRARY_PATH {$libdir}:
-  else
-    setenv LD_LIBRARY_PATH {$libdir}:{$newpath}
-    setenv LIBRARY_PATH {$libdir}:{$newpath}
+    setenv LD_LIBRARY_PATH {$newpath}:
+    setenv LIBRARY_PATH {$newpath}:
+  endif 
+else
+  if ("$newpath" == "") then
+    setenv LD_LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:
+    setenv LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:
+  else
+    setenv LD_LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:{$newpath}:
+    setenv LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:{$newpath}:
   endif 
 endif 
@@ -312 +318 @@
   if ("$newpath" == "") then
     setenv PERL5LIB {$plibdir}:
-    # setenv PERL5LIB {$plibdir}:{$plib5dir}:
   else
     setenv PERL5LIB {$plibdir}:{$newpath}
-    # setenv PERL5LIB {$plibdir}:{$plib5dir}:{$newpath}
   endif 
 endif