From a257042a121c010a57ec885f5597da9c52ed3940 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 28 Mar 2007 12:07:02 +0000 Subject: [PATCH] merge from RC31 branch --- org.glite.jp.server-common/Makefile | 8 +++----- org.glite.jp.server-common/project/version.properties | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/org.glite.jp.server-common/Makefile b/org.glite.jp.server-common/Makefile index ae6a269..8807ebf 100644 --- a/org.glite.jp.server-common/Makefile +++ b/org.glite.jp.server-common/Makefile @@ -14,8 +14,6 @@ glite_location=/opt/glite globus_prefix=/opt/globus nothrflavour=gcc32 thrflavour=gcc32pthr -expat_prefix=/opt/expat -gsoap_prefix=/software/gsoap-2.6 CC=gcc @@ -56,12 +54,12 @@ LOBJS:=${OBJS:.o=.lo} ifneq (${mysql_prefix},/usr) ifeq ($(shell test -f ${mysql_prefix}/lib/libmysqlclient.a -o -f ${mysql_prefix}/lib/libmysqlclient.so && echo ok),ok) - MYSQLIB := -L${mysql_prefix}/lib -lmysqlclient + MYSQLIB := -L${mysql_prefix}/lib -lmysqlclient -lz else - MYSQLIB := -L${mysql_prefix}/lib/mysql -lmysqlclient + MYSQLIB := -L${mysql_prefix}/lib/mysql -lmysqlclient -lz endif else - MYSQLIB := -lmysqlclient + MYSQLIB := -lmysqlclient -lz endif diff --git a/org.glite.jp.server-common/project/version.properties b/org.glite.jp.server-common/project/version.properties index 1ef4b00..f2f1ca2 100644 --- a/org.glite.jp.server-common/project/version.properties +++ b/org.glite.jp.server-common/project/version.properties @@ -1,2 +1,2 @@ -module.version=1.1.0 -module.age=1 +module.version=1.1.1 +module.age=2 -- 1.8.2.3