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

Re: building rapidsvn on *nix

From: Scott Lamb <slamb_at_slamb.org>
Date: 2002-07-30 16:32:56 CEST

Timothee Besset wrote:
> Trying to get the beast built on Linux here..
>
> I don't see an autogen.sh, nor an INSTALL or README file.. someone care to
> give a rundown on the compiling process?
>
> I ran autoconf to generate a configure script, then ran configure..
> (autoconf 2.13)

Running autoconf is fine for now.

>
> checking wxWindows version... 2.3.2
> Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
> [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
> [--cc] [--cxx] [--ld]

Hmm. My wxWindows version has an ldflags argument:

Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
[--static]
                  [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags]
[--rezflags]
                  [--cc] [--cxx] [--ld]

but apparently it's new. Patch to not whine below (rapidsvn-wxconfig.patch).

> sed: can't read ./src/Makefile.in: No such file or directory

Hmm. src/Makefile.in isn't in the repository. I sent it as a patch to
the list, but I can understand why it didn't get fully applied. I think
my patch (made with "svn diff") was kind of weird with the move, and
"patch" certainly doesn't know enough about subversion to run "svn mv"
itself.

Could someone do "svn mv src/Makefile.in src/Makefile" and then apply
rapidsvn-makefile.patch to it?

--
Scott Lamb

--- Makefile Tue Jul 30 09:24:12 2002
+++ Makefile.in Sun Jul 28 12:33:49 2002
@@ -1,6 +1,6 @@
 PROGRAM=rapidsvn
 
-CXX=g++
+CXX=@CXX@
 
 OBJECTS=action_thread.o \
                 add_action.o \
@@ -39,22 +39,25 @@
                 rapidsvn.o \
                 rapidsvn_app.o
 
-APR_LIBS=-L/usr/share/apache2/lib
+APR_LIBS=@APR_LIBS@
+WX_LIBS=@WX_LIBS@
 LIBS=-lsvn_client-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_delta-1 -lsvn_subr-1 \
- $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(APR_LIBS)
+ $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(APR_LIBS) \
+ $(WX_LIBS)
 SVN_INC=-I/usr/local/include/subversion-1
+CXXFLAGS=@CXXFLAGS@
 
 # implementation
 
 .SUFFIXES: .o .cpp
 
 .cpp.o:
- $(CXX) -c -g `wx-config --cxxflags` $(SVN_INC) -o $@ $<
+ $(CXX) -c -g $(CXXFLAGS) $(SVN_INC) -o $@ $<
 
 all: $(PROGRAM)
 
 $(PROGRAM): $(OBJECTS)
- $(CXX) -o $(PROGRAM) $(LIBS) `wx-config --libs` $(OBJECTS)
+ $(CXX) -o $(PROGRAM) $(LIBS) $(OBJECTS)
 
 clean:
         rm -f *.o $(PROGRAM)

* configure.in:
  Suppress warnings if wx-config is too old to understand --ldflags.
  Error out on wx-config failures otherwise.

Index: ./configure.in
===================================================================
--- ./configure.in
+++ ./configure.in Tue Jul 30 09:12:35 2002
@@ -52,8 +52,18 @@
         AC_MSG_ERROR([wxWindows 2.3.2 required])
         ;;
 esac
+
 CXXFLAGS="$CXXFLAGS `$WXCONFIG --cxxflags`"
-LDFLAGS="$LDFLAGS `$WXCONFIG --ldflags`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([$WXCONFIG --cxxflags failed])
+fi
+
+LDFLAGS="$LDFLAGS `$WXCONFIG --ldflags 2>/dev/null`"
+dnl Ignore error; older wxconfigs have no --ldflags argument
+
 WX_LIBS="`$WXCONFIG --libs`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([$WXCONFIG --libs failed])
+fi
 
 AC_OUTPUT(src/Makefile)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 30 16:36:10 2002

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.