Attachment #116443 for bug #89823




	datebooktst.class	\
	adrtest.class

$(java_classes): java_compile

java_compile: $(java_files)
	$(JAVAC) -d . $(java_files)


install: all
	ARCH=""; \
	for a in i386 amd64 ppc; do \
		if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
			 ARCH="$${a}"; \
			 break; \
		fi; \
	done; \
	if [ -n "$${ARCH}" ]; then \
		echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
	else \
		mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
		cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
		echo "done."; \
	fi
 




dnl ******************************
dnl PNG Support
dnl ******************************
msg_png=no
if test "x$enable_conduits" != "xno"; then
	have_png=no


			if test "$have_png" = yes; then
				AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
				have_png=yes
				msg_png=yes
			fi
		fi
	fi

AC_MSG_CHECKING([for BlueZ bluetooth support])
AC_ARG_WITH(bluez,
                AC_HELP_STRING([--with-bluez],
                        [Enable usage of BlueZ]),[use_bluez="$withval"],
                use_bluez=auto)
if test "x$use_bluez" != "xno"; then
        if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
                AC_MSG_ERROR([BlueZ explicitly requested but no support found])
        fi
	use_bluez="$have_bluez"
        if test "x$have_bluez" = xyes; then
                AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
                AC_MSG_RESULT([enabled])

        fi
fi

AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno")


dnl *********************************

Lines 1-5 Link Here

(-)a/pilot-link.m4 (-2 lines)
1	AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl
2
3	AC_DEFUN([AC_PILOT_LINK_HOOK],	1	AC_DEFUN([AC_PILOT_LINK_HOOK],
4	[	2	[
5	PILOT_LINK_VERS=0	3	PILOT_LINK_VERS=0

Return to bug 89823

Lines 67-72 java_classes= \ Link Here

(-)a/bindings/Java/Makefile.am (-5 / +7 lines)
67	datebooktst.class \	67	datebooktst.class \
68	adrtest.class	68	adrtest.class
69		69
		70	$(java_classes): java_compile
		71
70	java_compile: $(java_files)	72	java_compile: $(java_files)
71	$(JAVAC) -d . $(java_files)	73	$(JAVAC) -d . $(java_files)
72		74
Lines 81-96 java_pisock: java_compile java_lib java_jar Link Here
81	install: all	83	install: all
82	ARCH=""; \	84	ARCH=""; \
83	for a in i386 amd64 ppc; do \	85	for a in i386 amd64 ppc; do \
84	if [ -e ${JAVABASE}/jre/lib/${a} ]; then \	86	if [ -e ${JAVABASE}/jre/lib/$${a} ]; then \
85	ARCH="${a}"; \	87	ARCH="$${a}"; \
86	break; \	88	break; \
87	fi; \	89	fi; \
88	done; \	90	done; \
89	if [ -n "${ARCH}" ]; then \	91	if [ -n "$${ARCH}" ]; then \
90	echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \	92	echo "Unknown architecture. Copy lipijsock.so to ${JAVABASE}/jre/lib/ARCH/"; \
91	else \	93	else \
92	mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}" && \	94	mkdir -p "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}" && \
93	cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/${ARCH}"; \	95	cp libjpisock.so "$(DESTDIR)${JAVABASE}/jre/lib/$${ARCH}"; \
94	echo "done."; \	96	echo "done."; \
95	fi	97	fi
96		98

Lines 220-225 AC_MSG_RESULT($enable_conduits) Link Here

(-)a/configure.ac (-2 / +5 lines)
220	dnl ******************************	220	dnl ******************************
221	dnl PNG Support	221	dnl PNG Support
222	dnl ******************************	222	dnl ******************************
		223	msg_png=no
223	if test "x$enable_conduits" != "xno"; then	224	if test "x$enable_conduits" != "xno"; then
224	have_png=no	225	have_png=no
225		226
Lines 254-259 if test "x$enable_conduits" != "xno"; then Link Here
254	if test "$have_png" = yes; then	255	if test "$have_png" = yes; then
255	AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])	256	AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support])
256	have_png=yes	257	have_png=yes
		258	msg_png=yes
257	fi	259	fi
258	fi	260	fi
259	fi	261	fi
Lines 351-362 PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no)) Link Here
351	AC_MSG_CHECKING([for BlueZ bluetooth support])	353	AC_MSG_CHECKING([for BlueZ bluetooth support])
352	AC_ARG_WITH(bluez,	354	AC_ARG_WITH(bluez,
353	AC_HELP_STRING([--with-bluez],	355	AC_HELP_STRING([--with-bluez],
354	[Enable usage of BlueZ]),,	356	[Enable usage of BlueZ]),[use_bluez="$withval"],
355	use_bluez=auto)	357	use_bluez=auto)
356	if test "x$use_bluez" != "xno"; then	358	if test "x$use_bluez" != "xno"; then
357	if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then	359	if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then
358	AC_MSG_ERROR([BlueZ explicitly requested but no support found])	360	AC_MSG_ERROR([BlueZ explicitly requested but no support found])
359	fi	361	fi
		362	use_bluez="$have_bluez"
360	if test "x$have_bluez" = xyes; then	363	if test "x$have_bluez" = xyes; then
361	AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])	364	AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support])
362	AC_MSG_RESULT([enabled])	365	AC_MSG_RESULT([enabled])
Lines 366-372 if test "x$use_bluez" != "xno"; then Link Here
366	fi	369	fi
367	fi	370	fi
368		371
369	AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes")	372	AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno")
370		373
371		374
372	dnl *********************************	375	dnl *********************************