Fix linking for Cygwin. From: David Rothenberger --- build.conf | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/build.conf b/build.conf index 74defd0..885db3c 100644 --- a/build.conf +++ b/build.conf @@ -360,7 +360,7 @@ type = apache-mod path = subversion/mod_dav_svn sources = *.c reports/*.c posts/*.c libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr -nonlibs = apr aprutil + mod_dav httpd aprutil apr install = apache-mod msvc-libs = mod_dav.lib libhttpd.lib @@ -369,8 +369,9 @@ description = Subversion path-based authorization module for Apache when = INSTALL_APACHE_MODS type = apache-mod path = subversion/mod_authz_svn -nonlibs = mod_dav_svn apr aprutil libs = libsvn_repos libsvn_subr + mod_dav httpd aprutil apr + mod_dav_svn install = apache-mod msvc-libs = libhttpd.lib @@ -379,8 +380,9 @@ description = Apache Httpd module to block certain kinds of Apache Subversion re when = INSTALL_APACHE_MODS type = apache-mod path = tools/server-side/mod_dontdothat -nonlibs = mod_dav_svn apr aprutil libs = libsvn_subr xml + mod_dav httpd aprutil apr + mod_dav_svn install = tools msvc-libs = libhttpd.lib @@ -501,7 +503,7 @@ type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) +link-cmd = $(LINK) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) @@ -512,7 +514,7 @@ msvc-static = no type = swig_lib lang = perl path = subversion/bindings/swig/perl/libsvn_swig_perl -libs = libsvn_delta libsvn_subr apriconv apr +libs = libsvn_delta libsvn_subr apriconv apr perl install = swig-pl-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_PL) @@ -1205,6 +1207,20 @@ type = lib external-lib = $(SVN_FS_LIB_LINK) libs = libsvn_fs_base libsvn_fs_fs +[perl] +type = lib +external-lib = -L/usr/lib/perl5/5.14/i686-cygwin-threads-64int/CORE -lperl + +[mod_dav] +type = lib +external-lib = -Wl,`$(APXS) -q libexecdir`/mod_dav.so +libs = httpd aprutil apr + +[httpd] +type = lib +external-lib = -lhttpd2core +libs = aprutil apr + [__ALL__] type = project path = build/win32