+ eliminated build-time dependence on svn:special symlinks

svn path=/trunk/externals/moocow/; revision=10845

3 files changed, 45 insertions, 4 deletions

diff --git a/common/autogen.sh b/common/autogen.sh
index 3e88258..21dcf50 100755
--- a/common/autogen.sh
+++ b/common/autogen.sh
@@ -11,7 +11,7 @@ MY_AHDIRS="."
 MY_AMDIRS="."
 MY_ACDIRS="."
 
-test -z "$ACLOCAL" && ACLOCAL="aclocal -I m4"
+test -z "$ACLOCAL" && ACLOCAL="aclocal -I common/m4"
 test -z "$AUTOHEADER" && AUTOHEADER=autoheader
 test -z "$AUTOMAKE" && AUTOMAKE=automake
 test -z "$AUTOCONF" && AUTOCONF=autoconf
diff --git a/common/m4/ax_pd_external.m4 b/common/m4/ax_pd_external.m4
index 580ba02..8afa7b0 100644
--- a/common/m4/ax_pd_external.m4
+++ b/common/m4/ax_pd_external.m4
@@ -13,7 +13,7 @@
 #
 # Pd directories
 #   AC_ARG_WITH(pd-dir)     : default: "\${prefix}/pd"
-#   AC_ARG_WITH(pd-include) : sets IFLAGS, AM_IFLAGS
+#   AC_ARG_WITH(pd-include) : sets PDEXT_IFLAGS, AM_IFLAGS
 #   AC_ARG_WITH(pd-extdir)  : default $pddir/externs
 #   AC_SUBST(pddir)
 #   AC_SUBST(pddocdir)
@@ -148,7 +148,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
 	[pdincludedir="$withval"],
 	[pdincludedir=""])
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
  AC_SUBST(pdincludedir)
 
@@ -194,7 +194,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  AC_CHECK_HEADER(m_pd.h,[],
 	AC_MSG_ERROR([could not find Pd header file 'm_pd.h' - bailing out]),
 	[/* nonempty includes: compile only */])
diff --git a/common/svn-prepare.sh b/common/svn-prepare.sh
new file mode 100755
index 0000000..6edae1a
--- /dev/null
+++ b/common/svn-prepare.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+USAGE="$0 {copy|link} [COMMON_SRC=../common] [COMMON_DST=./common]"
+
+if test -n "$1"; then
+  case "$1" in
+    copy)
+      CP="cp -a";
+      ;;
+    link)
+      CP="ln -s";
+      ;;
+    *)
+      echo "Usage: $USAGE"
+      exit 1;
+      ;;
+  esac
+else
+  CP="ln -s"
+fi
+
+if test -n "$2"; then
+  COMMON_SRC="$2";
+else
+  COMMON_SRC="../common";
+fi
+
+if test -n "$3"; then
+  COMMON_DST="$3";
+else
+  COMMON_DST="./common";
+fi
+
+##-- copy or link in common dir
+runcmd() {
+  echo "$0[`basename \`pwd\``]:" "$@"
+  $@
+}
+
+runcmd rm -rf "$COMMON_DST";
+runcmd $CP "$COMMON_SRC" "$COMMON_DST";