From 1523eb9c6de6affffd34a919702f0a88d9ef745a Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Mon, 14 Dec 2009 23:31:19 +0100
Subject: mysqlconnector: #i10000# fix build with system-mysql but internal
 mysqlcppconn. it does not make sense o specify -lmysqlcppconn in mysqlcppconn
 build...

---
 mysqlcppconn/mysql_config.pmk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index e18697ccbc92..eb316e0911c3 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -35,17 +35,11 @@
   .ENDIF
 .ENDIF
 
-.IF "$(GUI)"!="WNT"
-
-.IF "$(SYSTEM_MYSQL)" == "YES"
-    MYSQL_LIB+=-lmysqlcppconn
-.ENDIF
-
-.ELSE   # "$(GUI)"!="WNT"
+.IF "$(GUI)"=="WNT"
 
 CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
-.ENDIF  # "$(GUI)"!="WNT"
+.ENDIF  # "$(GUI)"=="WNT"
 
 .IF "$(SYSTEM_MYSQL)" != "YES"
     MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
-- 
cgit