[csw-devel] SF.net SVN: gar:[11058] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2

[dmichelsen at users.sourceforge.net]

Revision: 11058
          http://gar.svn.sourceforge.net/gar/?rev=11058&view=rev
Author:   dmichelsen
Date:     2010-09-27 14:02:25 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
sasl-2.1.23-mGARv2: Some more adjustments, now waiting on 64 bit libkrb5.so

Modified Paths:
--------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile

Property Changed:
----------------
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/


Property changes on: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile
===================================================================
--- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-27 13:19:58 UTC (rev 11057)
+++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile	2010-09-27 14:02:25 UTC (rev 11058)
@@ -43,24 +43,30 @@
 UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # It is a long way to 64 bits...
-# BUILD64 = 1
+BUILD64 = 1
 
 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries
 # before the newly built ones.
+NOISALIST = 1
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 LD_OPTIONS =
 
+EXTRA_CFLAGS = -D__EXTENSIONS__
+
 BUILD_ENV = _REENTRANT=1
 
-EXTRA_LIBS += /opt/csw/bdb47/lib
-EXTRA_LIBS += /opt/csw/mysql5/lib
-EXTRA_LIBS += /opt/csw/postgresql/lib
+EXTRA_LIB += $(prefix)/bdb47/lib
+# EXTRA_LIB += $(prefix)/mysql5/lib
+# EXTRA_LIB += $(prefix)/postgresql/lib
 
-EXTRA_INC = /opt/csw/mysql5/include
+EXTRA_INC = /opt/csw/mysql5/include/mysql
+EXTRA_INC += /opt/csw/postgresql/include
 
 sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
+NODIRPATHS = --docdir
+
 # SASL configuration
 CONFIGURE_ARGS = $(DIRPATHS) 
 CONFIGURE_ARGS += --enable-shared
@@ -71,8 +77,11 @@
 CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
 CONFIGURE_ARGS += --with-ldap=$(prefix)
-CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5/ 
-CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql 
+# Autoconf tries to find the directory with the shared lib in it. Because of the
+# ISA suffix for 64 bit we must specify the exact library location and add
+# the include directories manually.
+CONFIGURE_ARGS += --with-mysql=$(abspath $(prefix)/mysql5/lib/$(MM_LIBDIR)/mysql)
+CONFIGURE_ARGS += --with-pgsql=$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2
 CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 


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