Attachment #103504 for bug #157389




AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes])
AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes])

dnl Start testing for cp -u availability
dnl Fallback to rsync otherwise

AC_MSG_CHECKING([for working cp -u])

: ${TMPDIR=/tmp}
{
  tmp=`
    (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
  ` && test -n "$tmp" && test -d "$tmp"
} || {
  tmp=$TMPDIR/foo$$-$RANDOM
  (umask 077 && mkdir "$tmp")
} || AC_MSG_ERROR([Unable to create a temporary directory])

touch "$tmp/origin"
if cp -u "$tmp/origin" "$tmp/destination" 2>/dev/null; then
   AC_MSG_RESULT([yes])
   CP_U="cp -u"
else
   AC_MSG_RESULT([no])
   AC_CHECK_PROG([CP_U], [rsync], [rsync -u])
fi

rm -rf "$tmp/origin"

if test "x$CP_U" = "x"; then
   AC_MSG_ERROR([Unable to find a workign cp -u implementation.])
fi

AC_SUBST([CP_U])

AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh])

AC_OUTPUT([Makefile docs/Makefile])

Lines 385-391 gjdoc_resources_src = $(patsubst %, $(sr Link Here

(-)gjdoc-0.7.7/Makefile.am (-1 / +1 lines)
385		385
386	gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src)	386	gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src)
387	for res in $(gjdoc_resources) ; \	387	for res in $(gjdoc_resources) ; \
388	do cp -u $(srcdir)/src/resources/$$res $$res ; done	388	do $(CP_U) $(srcdir)/src/resources/$$res $$res ; done
389	$(JAR) cfm $@ $(srcdir)/gjdoc.manifest \	389	$(JAR) cfm $@ $(srcdir)/gjdoc.manifest \
390	$(gjdoc_resources) \	390	$(gjdoc_resources) \
391	-C src/resources version.properties \	391	-C src/resources version.properties \

Return to bug 157389

Lines 101-106 AC_SUBST(jni_linkflag) Link Here

(-)gjdoc-0.7.7/configure.ac (+32 lines)
101	AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes])	101	AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes])
102	AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes])	102	AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes])
103		103
		104	dnl Start testing for cp -u availability
		105	dnl Fallback to rsync otherwise
		106
		107	AC_MSG_CHECKING([for working cp -u])
		108
		109	: ${TMPDIR=/tmp}
		110	{
		111	tmp=`
		112	(umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
		113	` && test -n "$tmp" && test -d "$tmp"
		114	} \|\| {
		115	tmp=$TMPDIR/foo$$-$RANDOM
		116	(umask 077 && mkdir "$tmp")
		117	} \|\| AC_MSG_ERROR([Unable to create a temporary directory])
		118
		119	touch "$tmp/origin"
		120	if cp -u "$tmp/origin" "$tmp/destination" 2>/dev/null; then
		121	AC_MSG_RESULT([yes])
		122	CP_U="cp -u"
		123	else
		124	AC_MSG_RESULT([no])
		125	AC_CHECK_PROG([CP_U], [rsync], [rsync -u])
		126	fi
		127
		128	rm -rf "$tmp/origin"
		129
		130	if test "x$CP_U" = "x"; then
		131	AC_MSG_ERROR([Unable to find a workign cp -u implementation.])
		132	fi
		133
		134	AC_SUBST([CP_U])
		135
104	AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh])	136	AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh])
105		137
106	AC_OUTPUT([Makefile docs/Makefile])	138	AC_OUTPUT([Makefile docs/Makefile])