[Midnightbsd-cvs] src [6729] trunk/usr.bin/svn/lib/libapr_util/Makefile: conditional iconv

[laffer1 at midnightbsd.org]

Revision: 6729
          http://svnweb.midnightbsd.org/src/?rev=6729
Author:   laffer1
Date:     2014-08-29 18:21:17 -0400 (Fri, 29 Aug 2014)
Log Message:
-----------
conditional iconv

Modified Paths:
--------------
    trunk/usr.bin/svn/lib/libapr_util/Makefile

Modified: trunk/usr.bin/svn/lib/libapr_util/Makefile
===================================================================
--- trunk/usr.bin/svn/lib/libapr_util/Makefile	2014-08-29 22:19:26 UTC (rev 6728)
+++ trunk/usr.bin/svn/lib/libapr_util/Makefile	2014-08-29 22:21:17 UTC (rev 6729)
@@ -21,8 +21,6 @@
 		${APRU}/uri ${APRU}/xlate ${APRU}/xml ${APRU}/include
 
 CFLAGS+= 	-DHAVE_CONFIG_H \
-		-DHAVE_ICONV_H=0 \
-		-DAPU_HAVE_ICONV=1 \
 		-I${.CURDIR} \
 		-I${APRU}/include/private \
 		-I${APRU}/include \
@@ -32,9 +30,9 @@
 
 .include <bsd.own.mk>
 
-#.if ${MK_ICONV} == "yes"
-#CFLAGS+=	-DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1
-#.endif
+.if ${MK_ICONV} == "yes"
+CFLAGS+=	-DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1
+.endif
 
 .include <bsd.lib.mk>