Author: arekm                        Date: Sun Aug 28 09:15:38 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   mysql-administrator-termcap.patch (NONE -> 1.1)  (NEW), 
mysql-administrator-lua.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mysql-administrator-termcap.patch
diff -u /dev/null SOURCES/mysql-administrator-termcap.patch:1.1
--- /dev/null   Sun Aug 28 11:15:38 2005
+++ SOURCES/mysql-administrator-termcap.patch   Sun Aug 28 11:15:33 2005
@@ -0,0 +1,20 @@
+diff -urN 
mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 
mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am
+--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am  
2005-08-28 10:59:08.801973000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am      
2005-08-28 11:00:00.974042616 +0200
+@@ -28,7 +28,7 @@
+       $(UUID_LIB)\
+       @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \
+       @JNI_LDFLAGS@ @[EMAIL PROTECTED]
+-      -lncurses -lreadline -lhistory -ltermcap\
++      -lncurses -lreadline -lhistory\
+       @LUA_LDFLAGS@ -ldl -lstdc++
+ 
+ 
+@@ -39,6 +39,6 @@
+       $(UUID_LIB)\
+       @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \
+       @[EMAIL PROTECTED]
+-      -lncurses -lreadline -lhistory -ltermcap\
++      -lncurses -lreadline -lhistory\
+       @LUA_LDFLAGS@ -ldl -lstdc++
+ 

================================================================
Index: SOURCES/mysql-administrator-lua.patch
diff -u /dev/null SOURCES/mysql-administrator-lua.patch:1.1
--- /dev/null   Sun Aug 28 11:15:38 2005
+++ SOURCES/mysql-administrator-lua.patch       Sun Aug 28 11:15:33 2005
@@ -0,0 +1,73 @@
+diff -urbB mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in 
mysql-administrator-1.0.22a/mysql-gui-common/configure.in
+--- mysql-administrator-1.0.22a.org/mysql-gui-common/configure.in      
2005-06-02 05:20:50.000000000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/configure.in  2005-08-28 
10:58:26.907342928 +0200
+@@ -77,14 +77,14 @@
+ 
+ 
+ # Lua Stuff
+-LUA_CFLAGS=
+-LUA_LDFLAGS=-llua
++LUA_CFLAGS=-I/usr/include/lua50
++LUA_LDFLAGS="-llua50 -llualib50"
+ AC_ARG_WITH(lua-includes,
+ [  --with-lua-includes                directory where Lua headers are 
located],
+       [LUA_CFLAGS=-I$withval])
+ AC_ARG_WITH(lua-libs,
+ [  --with-lua-libs              directory where Lua libraries are located],
+-        [LUA_LDFLAGS="$withval -llua"])
++        [LUA_LDFLAGS="$withval -llua50 -llualib50"])
+ AC_SUBST(LUA_CFLAGS)
+ AC_SUBST(LUA_LDFLAGS)
+ 
+diff -urbB 
mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am 
mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am
+--- 
mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt/source/Makefile.am 
   2005-04-14 04:48:08.000000000 +0200
++++ 
mysql-administrator-1.0.22a/mysql-gui-common/library_grt/source/Makefile.am     
   2005-08-28 10:58:05.487599224 +0200
+@@ -8,7 +8,7 @@
+       -I$(top_srcdir)/library/shared_include \
+       -I$(top_srcdir)/library/include \
+       @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @[EMAIL PROTECTED]
+-      @PYTHON_CFLAGS@ @ENABLED_MODULES@
++      @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@
+ 
+ libgrt_a_SOURCES=myx_grt.c\
+       myx_grt_module.c\
+diff -urbB 
mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am
 
mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am
+--- 
mysql-administrator-1.0.22a.org/mysql-gui-common/library_grt_modules/source/Makefile.am
    2005-04-30 01:25:58.000000000 +0200
++++ 
mysql-administrator-1.0.22a/mysql-gui-common/library_grt_modules/source/Makefile.am
        2005-08-28 10:58:05.487599224 +0200
+@@ -10,7 +10,7 @@
+       -I$(top_srcdir)/library/shared_include \
+       -I$(top_srcdir)/library/include \
+       @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @[EMAIL PROTECTED]
+-      @PYTHON_CFLAGS@ @ENABLED_MODULES@
++      @PYTHON_CFLAGS@ @ENABLED_MODULES@ @LUA_CFLAGS@
+ 
+ libgrtmods_a_SOURCES=\
+       myx_grt_base.c\
+diff -urbB 
mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am 
mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am
+--- mysql-administrator-1.0.22a.org/mysql-gui-common/source/grtsh/Makefile.am  
2005-05-16 15:12:10.000000000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/source/grtsh/Makefile.am      
2005-08-28 10:59:08.801973976 +0200
+@@ -18,7 +18,7 @@
+       $(JAVA_INC)\
+       @GTHREAD_CFLAGS@ @MYSQL_INCLUDE@ @PCRE_CFLAGS@ @[EMAIL PROTECTED]
+         @PYTHON_CFLAGS@ @[EMAIL PROTECTED]
+-      @GTK_CFLAGS@
++      @GTK_CFLAGS@ @LUA_CFLAGS@
+ 
+ 
+ grtsh_LDADD=\
+@@ -29,7 +29,7 @@
+       @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \
+       @JNI_LDFLAGS@ @[EMAIL PROTECTED]
+       -lncurses -lreadline -lhistory -ltermcap\
+-      -llua -llualib -ldl -lstdc++
++      @LUA_LDFLAGS@ -ldl -lstdc++
+ 
+ 
+ agentest_LDADD=\
+@@ -40,5 +40,5 @@
+       @GTHREAD_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ \
+       @[EMAIL PROTECTED]
+       -lncurses -lreadline -lhistory -ltermcap\
+-      -llua -llualib -ldl -lstdc++
++      @LUA_LDFLAGS@ -ldl -lstdc++
+ 
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to