[23687] trunk/base

[source_changes at macosforge.org]

Revision: 23687
          http://trac.macosforge.org/projects/macports/changeset/23687
Author:   jberry at macports.org
Date:     2007-04-06 14:00:25 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
Add xar code into macports base build.

xar will be built and installed only if xar is not present in the base system, as it is rumored to be on Leopard.
This means that xar will be build and installed into /opt/local on Tiger, and that somebody who has already installed the xar port, or who decides to install the xar port on such a system, might run into a conflict. The number of such people is probably very low, according to bbraun.

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure.ac

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2007-04-06 20:57:37 UTC (rev 23686)
+++ trunk/base/aclocal.m4	2007-04-06 21:00:25 UTC (rev 23687)
@@ -491,13 +491,27 @@
 	if test "x$MTREE" = "x" ; then
 		AC_CONFIG_SUBDIRS([src/programs/mtree])
 		MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree'
-#		MTREE='${prefix}/bin/mtree'
 		REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree"
 	fi
 
 	AC_SUBST(MTREE)
 ])
 
+# OD_PROG_XAR
+#---------------------------------------
+AC_DEFUN([OD_PROG_XAR],[
+
+	AC_PATH_PROG([XAR], [xar], ,  [/usr/bin:/usr/sbin:/bin:/sbin])
+
+	if test "x$XAR" = "x" ; then
+		AC_CONFIG_SUBDIRS([src/programs/xar])
+		XAR='$(TOPSRCDIR)/src/programs/xar/xar'
+		REPLACEMENT_PROGS="$REPLACEMENT_PROGS xar"
+	fi
+
+	AC_SUBST(XAR)
+])
+
 # OD_PROG_DAEMONDO
 #---------------------------------------
 AC_DEFUN([OD_PROG_DAEMONDO],[

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-04-06 20:57:37 UTC (rev 23686)
+++ trunk/base/configure.ac	2007-04-06 21:00:25 UTC (rev 23687)
@@ -38,6 +38,7 @@
 OD_COMPILER_ATTRIBUTE_UNUSED
 
 OD_PROG_MTREE
+OD_PROG_XAR
 AC_ARG_ENABLE(launchd-support,
 	AC_HELP_STRING([--disable-launchd-support], [disable support for launchd startupitems]),
 	[], [enable_launchd_support=yes])

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070406/5a329b31/attachment.html