use check_version.pl

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 1472b2d..e0f2a33 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -60,6 +60,7 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
 # we are.
 
 VERSION_AHEAD=2
+CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${top_srcdir}/project/check_version.pl
 
 GLOBUS_LIBS:=-L${globus_prefix}/lib \
         -lglobus_common_${nothrflavour} \
@@ -273,11 +274,4 @@ il_int_test.o il_string_test.o il_test.o il_msg_test.o: %.o: %.cpp
        chmod -w $@ >/dev/null
 
 check_version:
-       @perl -ne '/#define GLITE_LB_CLIENT_INTERFACE "(\d+)\.\d+\.\d+"/; \
-               $$iface=$$1; \
-               $$_="${version}"; /(\d+)\.\d+\.\d+/; \
-               if ($$iface + ${VERSION_AHEAD} != $$1) { \
-                       print "error: Major version of the interface ($$iface+${VERSION_AHEAD}) does not match implementation ($$1)\n" ;\
-                       exit 1;  \
-               } \
-               ' ${stagedir}/include/glite/lb/interface_version.h
+       ${CHECK_VERSION} ${stagedir}/include/glite/lb/interface_version.h

diff --git a/org.glite.lb.common/build.xml b/org.glite.lb.common/build.xml
index e3add29..a6f7224 100755 (executable)
--- a/org.glite.lb.common/build.xml
+++ b/org.glite.lb.common/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.8  2005/08/03 09:30:17  akrenek
+       Merged the release 1.0 branch
+
        Revision 1.7  2005/05/26 15:13:46  zurek
        inserted module.build.file
        
@@ -114,6 +117,7 @@
                                <include name="at3" />
                                <include name="*.T" />
                                <include name="*.pm" />
+                               <include name="check_version.pl" />
                        </fileset>
                </copy> 
                <antcall target="lbmakefiles" />