Attachment #827953 for bug #879923




  JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
  AC_MSG_CHECKING([if a java binary was specified])
  AC_ARG_WITH([java],
              [AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 11+ Java VM)],
  [
    if test "x${withval}" = "xyes"; then
      JAVA=no

      AC_PATH_PROG(JAVA, "cacao")
    fi
    if test -z "${JAVA}"; then
      AC_MSG_ERROR("A 11-compatible Java VM is required.")
    fi
  fi
  AC_SUBST(JAVA)

  AC_SUBST(ECJ_JAR)
])

AC_DEFUN_ONCE([IT_FIND_JAVAH],
[
  AC_REQUIRE([IT_CHECK_FOR_JDK])
  JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah
  AC_MSG_CHECKING([if a javah executable is specified])
  AC_ARG_WITH([javah],
              [AS_HELP_STRING([--with-javah[[=PATH]]],specify location of javah)],
  [
    if test "x${withval}" = "xyes"; then
      JAVAH=no
    else
      JAVAH="${withval}"
    fi
  ],
  [
    JAVAH=no
  ])
  AC_MSG_RESULT(${JAVAH})
  if test "x${JAVAH}" == "xno"; then
    JAVAH=${JAVAH_DEFAULT}
  fi
  AC_MSG_CHECKING([if $JAVAH is a valid executable file])
  if test -x "${JAVAH}" && test -f "${JAVAH}"; then
    AC_MSG_RESULT([yes])
  else
    AC_MSG_RESULT([no])
    JAVAH=""
    AC_PATH_PROG(JAVAH, "javah")
    if test -z "${JAVAH}"; then
      AC_PATH_PROG(JAVAH, "gjavah")
    fi
    if test -z "${JAVAH}"; then
      AC_MSG_ERROR("A Java header generator was not found.")
    fi
  fi
  AC_SUBST(JAVAH)
])

AC_DEFUN_ONCE([IT_FIND_JAR],
[
  AC_REQUIRE([IT_CHECK_FOR_JDK])

    }
}]
EOF
  if $JAVAC -cp . $JAVACFLAGS -source 11 -target 11 $CLASS 2>&1; then
    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
      it_cv_jdk_works=yes;
    else




ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java

# Build directories
RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
ICEDTEA_SOUND_NATIVE_OBJECTS = \

EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)

# Flags
IT_LANGUAGE_SOURCE_VERSION=11
IT_CLASS_TARGET_VERSION=11
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)

JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
 -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
if JAVADOC_SUPPORTS_J_OPTIONS
JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m
endif
endif


stamps/icedtea-sound-class.stamp:
	mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \
	 $(ICEDTEA_SOUND_JAVA_SRCS)
	cp  -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
	chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
	mkdir -p stamps


stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp
	mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/EventLoop.java ; \
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/Stream.java ; \
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/Operation.java; \
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java ; \
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java ; \
	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
	  src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
	mkdir -p stamps
	touch $@


Return to bug 879923

Lines 225-231 Link Here

(-)icedtea-sound-1.0.1/acinclude.m4 (-41 / +3 lines)
225	JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java	225	JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
226	AC_MSG_CHECKING([if a java binary was specified])	226	AC_MSG_CHECKING([if a java binary was specified])
227	AC_ARG_WITH([java],	227	AC_ARG_WITH([java],
228	[AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 1.5 Java VM)],	228	[AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 11+ Java VM)],
229	[	229	[
230	if test "x${withval}" = "xyes"; then	230	if test "x${withval}" = "xyes"; then
231	JAVA=no	231	JAVA=no
Lines 254-260 Link Here
254	AC_PATH_PROG(JAVA, "cacao")	254	AC_PATH_PROG(JAVA, "cacao")
255	fi	255	fi
256	if test -z "${JAVA}"; then	256	if test -z "${JAVA}"; then
257	AC_MSG_ERROR("A 1.5-compatible Java VM is required.")	257	AC_MSG_ERROR("A 11-compatible Java VM is required.")
258	fi	258	fi
259	fi	259	fi
260	AC_SUBST(JAVA)	260	AC_SUBST(JAVA)
Lines 290-333 Link Here
290	AC_SUBST(ECJ_JAR)	290	AC_SUBST(ECJ_JAR)
291	])	291	])
292		292
293	AC_DEFUN_ONCE([IT_FIND_JAVAH],
294	[
295	AC_REQUIRE([IT_CHECK_FOR_JDK])
296	JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah
297	AC_MSG_CHECKING([if a javah executable is specified])
298	AC_ARG_WITH([javah],
299	[AS_HELP_STRING([--with-javah[[=PATH]]],specify location of javah)],
300	[
301	if test "x${withval}" = "xyes"; then
302	JAVAH=no
303	else
304	JAVAH="${withval}"
305	fi
306	],
307	[
308	JAVAH=no
309	])
310	AC_MSG_RESULT(${JAVAH})
311	if test "x${JAVAH}" == "xno"; then
312	JAVAH=${JAVAH_DEFAULT}
313	fi
314	AC_MSG_CHECKING([if $JAVAH is a valid executable file])
315	if test -x "${JAVAH}" && test -f "${JAVAH}"; then
316	AC_MSG_RESULT([yes])
317	else
318	AC_MSG_RESULT([no])
319	JAVAH=""
320	AC_PATH_PROG(JAVAH, "javah")
321	if test -z "${JAVAH}"; then
322	AC_PATH_PROG(JAVAH, "gjavah")
323	fi
324	if test -z "${JAVAH}"; then
325	AC_MSG_ERROR("A Java header generator was not found.")
326	fi
327	fi
328	AC_SUBST(JAVAH)
329	])
330
331	AC_DEFUN_ONCE([IT_FIND_JAR],	293	AC_DEFUN_ONCE([IT_FIND_JAR],
332	[	294	[
333	AC_REQUIRE([IT_CHECK_FOR_JDK])	295	AC_REQUIRE([IT_CHECK_FOR_JDK])
Lines 538-544 Link Here
538	}	500	}
539	}]	501	}]
540	EOF	502	EOF
541	if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then	503	if $JAVAC -cp . $JAVACFLAGS -source 11 -target 11 $CLASS 2>&1; then
542	if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then	504	if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
543	it_cv_jdk_works=yes;	505	it_cv_jdk_works=yes;
544	else	506	else

Lines 28-34 Link Here

(-)icedtea-sound-1.0.1/Makefile.am (-17 / +16 lines)
28	ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java	28	ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java
29		29
30	# Build directories	30	# Build directories
31	RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
32	ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build	31	ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
33	ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native	32	ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
34	ICEDTEA_SOUND_NATIVE_OBJECTS = \	33	ICEDTEA_SOUND_NATIVE_OBJECTS = \
Lines 51-58 Link Here
51	EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)	50	EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)
52		51
53	# Flags	52	# Flags
54	IT_LANGUAGE_SOURCE_VERSION=6	53	IT_LANGUAGE_SOURCE_VERSION=11
55	IT_CLASS_TARGET_VERSION=6	54	IT_CLASS_TARGET_VERSION=11
56	IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)	55	IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
57	IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)	56	IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
58	IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)	57	IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
Lines 62-68 Link Here
62	JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \	61	JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
63	-bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'	62	-bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
64	if JAVADOC_SUPPORTS_J_OPTIONS	63	if JAVADOC_SUPPORTS_J_OPTIONS
65	JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m	64	JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m
66	endif	65	endif
67	endif	66	endif
68		67
Lines 114-120 Link Here
114	stamps/icedtea-sound-class.stamp:	113	stamps/icedtea-sound-class.stamp:
115	mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)	114	mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
116	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \	115	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \
117	-bootclasspath $(RUNTIME) $(ICEDTEA_SOUND_JAVA_SRCS)	116	$(ICEDTEA_SOUND_JAVA_SRCS)
118	cp -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)	117	cp -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
119	chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF	118	chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
120	mkdir -p stamps	119	mkdir -p stamps
Lines 127-144 Link Here
127		126
128	stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp	127	stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp
129	mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)	128	mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
130	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	129	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
131	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \	130	src/java/org/classpath/icedtea/pulseaudio/EventLoop.java ; \
132	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	131	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
133	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \	132	src/java/org/classpath/icedtea/pulseaudio/Stream.java ; \
134	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	133	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
135	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \	134	src/java/org/classpath/icedtea/pulseaudio/Operation.java; \
136	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	135	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
137	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \	136	src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java ; \
138	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	137	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
139	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \	138	src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java ; \
140	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \	139	$(JAVAC) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
141	-J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent	140	src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
142	mkdir -p stamps	141	mkdir -p stamps
143	touch $@	142	touch $@
144		143