[Erp5-report] r40115 kazuhiko - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Nov  9 16:15:28 2010
New Revision: 40115

URL: http://svn.erp5.org?rev=40115&view=rev
Log:
use our own readline library.

Modified:
    erp5/trunk/buildout/software-profiles/mysql-5.1.cfg
    erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg

Modified: erp5/trunk/buildout/software-profiles/mysql-5.1.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-5.1.cfg?rev=40115&r1=40114&r2=40115&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-5.1.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-5.1.cfg [utf8] Tue Nov  9 16:15:28 2010
@@ -8,6 +8,7 @@ extends =
   ../software-profiles/libtool.cfg
   ../software-profiles/ncurses.cfg
   ../software-profiles/openssl.cfg
+  ../software-profiles/readline.cfg
 
 parts =
     mysql-5.1
@@ -47,7 +48,7 @@ configure-options =
   --with-charset=utf8
   --with-collation=utf8_unicode_ci
   --with-server-suffix=mysql-5.1
-  --with-readline
+  --without-readline
   --with-ssl
 make-options =
   LIBTOOL=libtool
@@ -59,6 +60,6 @@ patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
 environment =
   PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
-  CFLAGS =-I${ncurses:location}/include
-  CXXFLAGS =-I${ncurses:location}/include
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
+  CFLAGS =-I${ncurses:location}/include -I${readline:location}/include
+  CXXFLAGS =-I${ncurses:location}/include -I${readline:location}/include
+  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib

Modified: erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg?rev=40115&r1=40114&r2=40115&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] Tue Nov  9 16:15:28 2010
@@ -12,6 +12,7 @@ extends =
   ../software-profiles/libtool.cfg
   ../software-profiles/ncurses.cfg
   ../software-profiles/openssl.cfg
+  ../software-profiles/readline.cfg
 
 parts =
     mysql-tritonn-5.0
@@ -63,7 +64,7 @@ configure-options =
   --with-server-suffix=mysql-tritonn-5.0
   --with-mysqlmanager
   --enable-assembler
-  --with-readline
+  --without-readline
   --with-sphinx-storage-engine
   --with-named-curses-libs=${ncurses:location}/lib/libncurses.so
   --with-zlib-dir=${zlib:location}
@@ -80,6 +81,6 @@ patches =
   ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename}
 environment =
     PATH =${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
-    CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include
-    CXXFLAGS =-I${senna:location}/include/senna
-    LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
+    CFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include
+    CXXFLAGS =-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include
+    LDFLAGS =-L${senna:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib