[Jboss-svn-commits] JBL Code SVN: r4564 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-02 09:39:05 -0400 (Fri, 02 Jun 2006)
New Revision: 4564

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Improve the detect of the possible install mysql packages.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 10:33:17 UTC (rev 4563)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 13:39:05 UTC (rev 4564)
@@ -160,21 +160,35 @@
 # try to find mysql
 case ${OS} in
   SunOS)
+    MSQLSY=solaris
     case `uname -r` in
       5.9)  MSQLPR=2.9 ;;
       5.10) MSQLPR=2.10 ;;
       *)    MSQLPR=${OS} ;;
     esac
-    MYSQL="mysql-standard-${MSQLVER}-sun-solaris${MSQLPR}-${PR}"
-    for dir in $HOME/${MYSQL} /usr/${MYSQL} /opt/${MYSQL}
-    do
-      if [ -d $dir ]
-      then
-        MYSQLDIR=${dir}
-      fi
-    done
+    case `uname -m` in
+      i86pc) MSQLHD=pc;;
+      sun*) MSQLHD=sun;;
+    esac
+    MYSQL="mysql-standard-${MSQLVER}-${MSQLHD}-${MSQLSY}${MSQLPR}-${PR}"
     ;;
+  Linux)
+    MSQLSY=solaris
+    MSQLHD=pc
+    MSQLSY=linux-gnu
+    MYSQL="mysql-standard-${MSQLVER}-${MSQLHD}-${MSQLSY}${MSQLPR}-${PR}-glibc23"
+    ;;
 esac
+
+for dir in $HOME/${MYSQL} /usr/${MYSQL} /opt/${MYSQL} /opt/i86pc/${MYSQL}
+do
+  echo "$dir"
+  if [ -d $dir ]
+  then
+    MYSQLDIR=${dir}
+  fi
+done
+
 case `uname -n` in
   dev12)
     BUILDXML2=true