[csw-devel] SF.net SVN: gar:[16759] csw/mgar/pkg/389-admin/trunk

[cgrzemba at users.sourceforge.net]

Revision: 16759
          http://gar.svn.sourceforge.net/gar/?rev=16759&view=rev
Author:   cgrzemba
Date:     2012-01-13 15:07:03 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
389-admin/trunk: add patch

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-13 12:37:59 UTC (rev 16758)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-13 15:07:03 UTC (rev 16759)
@@ -19,14 +19,15 @@
 
 LICENSE = LICENSE LICENSE.GPLv2
 
+PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
+
 PACKAGES = CSW389admin
 RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
 
 GARCOMPILER = SOS12U2
 # remove -I/opt/csw/include
 CPPFLAGS = 
-EXTRA_CFLAGS = --disable-threading
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 

Added: csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	2012-01-13 15:07:03 UTC (rev 16759)
@@ -0,0 +1,25 @@
+From 2cedc89069d4f66c9ce9e24addaa4c13ebd1bca4 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 13 Jan 2012 13:04:22 +0100
+Subject: [PATCH] change includedir preference in Makefile.am
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 792f782..25ae853 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -99,7 +99,7 @@ libadmin_a_SOURCES = lib/libadmin/cluster.c \
+ 	lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
+ 	lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
+ 
+-AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
++AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ -DUSE_ADMSERV=1 \
+ 	-I$(srcdir)/include -I$(srcdir)/include/base
+ if WINNT
+ AM_CPPFLAGS += -DXP_WINNT
+-- 
+1.7.8.2
+

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