[csw-devel] SF.net SVN: gar:[11106] csw/mgar/pkg/libserf/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 11106
          http://gar.svn.sourceforge.net/gar/?rev=11106&view=rev
Author:   dmichelsen
Date:     2010-09-30 14:34:27 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
libserf: Move to APR

Modified Paths:
--------------
    csw/mgar/pkg/libserf/trunk/Makefile

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2010-09-30 13:44:38 UTC (rev 11105)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2010-09-30 14:34:27 UTC (rev 11106)
@@ -15,7 +15,7 @@
 MASTER_SITES = http://serf.googlecode.com/files/
 DISTFILES  = $(DISTNAME).tar.bz2
 
-RUNTIME_DEP_PKGS_CSWlibserf = CSWapache2rt CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
+DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(DISTNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -27,24 +27,21 @@
 # Make sure the current directory comes before everything else
 INCLUDE_FLAGS = -I. -I$(includedir)
 
+EXTRA_LIB = $(prefix)/bdb48/lib
+
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 CONFIGURE_ARGS = $(DIRPATHS)
-# CONFIGURE_ARGS += --with-openssl=$(prefix)
-CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
-CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
+CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
+CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config
 
 TEST_TARGET = check
 
-# as long as apache does not depend on apr, serf as well 
-# does not depend on it
-CHECKPKG_OVERRIDES_CSWlibserf += missing-dependency|CSWapr
-
 include gar/category.mk
 
-APR_LIBTOOL = $(shell /opt/csw/apache2/bin/apr-config --apr-libtool)
+post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool)
 post-configure-modulated:
 	gcp $(APR_LIBTOOL) $(WORKSRC)
 	perl -i -pne 's|$(APR_LIBTOOL)|$(abspath $(WORKSRC)/libtool)|' $(WORKSRC)/Makefile


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.