[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [patch] Configury for pthreads flags

From: Branko Čibej <branko.cibej_at_hermes.si>
Date: 2000-08-09 19:31:14 CEST

O.K., here's what I came up with:

    configure.in: source apr/APRVARS and put EXTRA_LIBS into LIBS
    configure-all.sh: New file; configure both apr/ and subversion.
        (This script should go away once the configury is stable.)
    Remove explicit CFLAGS settings from Makefile.am in
        subversion/libsvn_string/tests, subversion/libsvn_subr/tests
        and subversion/libsvn_wc/tests.

I've also included a second patch to add .deps and .libs to .cvsignore
in subversion/libsvn_delta, subversion/libsvn_delta/tests,
subversion/libsvn_wc and subversion/libsvn_wc/tests.

    Brane

-- 
Branko Čibej                 <branko.cibej@hermes.si>
HERMES SoftLab, Litijska 51, 1000 Ljubljana, Slovenia
voice: (+386 1) 586 53 49     fax: (+386 1) 586 52 70

Index: configure.in
===================================================================
RCS file: /cvs/subversion/configure.in,v
retrieving revision 1.14
diff -u -p -r1.14 configure.in
--- configure.in 2000/08/08 20:54:54 1.14
+++ configure.in 2000/08/09 17:19:03
@@ -63,7 +63,6 @@ dnl Check for libtool -- we'll definitel
 AM_PROG_LIBTOOL
 
 
-
 dnl Check for libraries --------------------
 
 dnl AC_CHECK_LIB() calls go here, if we ever need any
@@ -100,6 +99,11 @@ AC_FUNC_VPRINTF
 dnl vdelta.c is using strerror() right now
 AC_CHECK_FUNCS(strerror)
 
+
+dnl Use whatever apr/ says is appropriate ----------
+. apr/APRVARS
+LIBS="$LIBS @EXTRA_LIBS@"
+AC_SUBST(EXTRA_LIBS)
 
 dnl Final step: create all Makefiles ----------------------------
 
Index: subversion/libsvn_string/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_string/tests/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- subversion/libsvn_string/tests/Makefile.am 2000/08/08 18:14:54 1.4
+++ subversion/libsvn_string/tests/Makefile.am 2000/08/09 17:19:05
@@ -4,7 +4,6 @@ noinst_PROGRAMS = stringtest
 stringtest_SOURCES = stringtest.c
 
 ## Flags needed when compiling:
-CFLAGS = -pthread
 INCLUDES = -I../../include -I../../../apr/include
 
 ## Libraries this binary depends upon:
Index: subversion/libsvn_subr/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_subr/tests/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- subversion/libsvn_subr/tests/Makefile.am 2000/08/08 18:14:57 1.3
+++ subversion/libsvn_subr/tests/Makefile.am 2000/08/09 17:19:05
@@ -4,7 +4,6 @@ noinst_PROGRAMS = hashdump-test
 hashdump_test_SOURCES = hashdump-test.c
 
 ## Flags needed when compiling:
-CFLAGS = -pthread
 INCLUDES = -I../../include -I../../../apr/include
 
 ## Libraries this binary depends upon:
Index: subversion/libsvn_wc/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/tests/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- subversion/libsvn_wc/tests/Makefile.am 2000/08/08 23:22:16 1.5
+++ subversion/libsvn_wc/tests/Makefile.am 2000/08/09 17:19:05
@@ -4,7 +4,6 @@ noinst_PROGRAMS = checkout-test
 checkout_test_SOURCES = checkout-test.c
 
 ## Flags needed when compiling:
-CFLAGS = -pthread
 INCLUDES = -I../../include -I../../../apr/include -I../../../expat-lite
 
 ## Libraries this binary depends upon:

Index: subversion/libsvn_delta/.cvsignore
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/.cvsignore,v
retrieving revision 1.2
diff -u -p -r1.2 .cvsignore
--- subversion/libsvn_delta/.cvsignore 2000/08/09 04:38:13 1.2
+++ subversion/libsvn_delta/.cvsignore 2000/08/09 17:19:05
@@ -1,3 +1,5 @@
+.deps
+.libs
 ChangeLog*
 Makefile.in
 Makefile
Index: subversion/libsvn_delta/tests/.cvsignore
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/tests/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- subversion/libsvn_delta/tests/.cvsignore 2000/08/08 17:35:38 1.1
+++ subversion/libsvn_delta/tests/.cvsignore 2000/08/09 17:19:05
@@ -1,3 +1,5 @@
+.deps
+.libs
 ChangeLog*
 Makefile.in
 Makefile
Index: subversion/libsvn_wc/.cvsignore
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/.cvsignore,v
retrieving revision 1.4
diff -u -p -r1.4 .cvsignore
--- subversion/libsvn_wc/.cvsignore 2000/08/08 17:36:57 1.4
+++ subversion/libsvn_wc/.cvsignore 2000/08/09 17:19:05
@@ -1,3 +1,5 @@
+.deps
+.libs
 ChangeLog*
 Makefile.in
 Makefile
Index: subversion/libsvn_wc/tests/.cvsignore
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/tests/.cvsignore,v
retrieving revision 1.1
diff -u -p -r1.1 .cvsignore
--- subversion/libsvn_wc/tests/.cvsignore 2000/08/08 16:53:25 1.1
+++ subversion/libsvn_wc/tests/.cvsignore 2000/08/09 17:19:05
@@ -1,3 +1,5 @@
+.deps
+.libs
 ChangeLog*
 Makefile.in
 Makefile

Received on Sat Oct 21 14:36:06 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.