patches/duma/2_5_8/110-separate_cpp.patch
author Oron Peled <oron@actcom.co.il>
Mon Aug 03 23:11:53 2009 +0200 (2009-08-03)
branch1.4
changeset 1455 e6a3b4ffe576
parent 369 9258a7c3b84f
permissions -rw-r--r--
[configure] Fix automake version check

The configure script fails on automake-1.11 (in Fedora-11) since
it looks for 3-digit version number.

"Yann E. MORIN", added the following comment:

The check for the automake version is not against a 3-digit number,
but really against a 3-part version number, a-la 'x.y.z'. Versions
such as 1.10 and 1.11 are also valid.
yann@369
     1
diff -durN duma_2_5_8.orig/Makefile duma_2_5_8/Makefile
yann@369
     2
--- duma_2_5_8.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
yann@369
     3
+++ duma_2_5_8/Makefile	2007-09-07 21:58:35.000000000 +0200
yann@369
     4
@@ -216,9 +216,13 @@
yann@369
     5
 	dumatest.c tstheap.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@369
     6
 	createconf.c
yann@369
     7
 
yann@369
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@369
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@369
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@369
    11
 
yann@369
    12
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@369
    13
+ifeq ($(DUMA_CPP),1)
yann@369
    14
+OBJECTS += dumapp.o
yann@369
    15
+SO_OBJECTS += dumapp_so.o
yann@369
    16
+endif
yann@369
    17
 
yann@369
    18
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@369
    19
 	@ $(ECHOLF)