Attachment #80355 for bug #123586

View | Details | Raw Unified | Return to bug 123586
Collapse All | Expand All

Lines 8512-8517 elif test -x "${apache_bin}/httpd"; then Link Here

(-)/var/tmp/portage/resin-3.0.17/work/resin-3.0.17/configure (+4 lines)
8512	apache_exe="${apache_bin}/httpd"	8512	apache_exe="${apache_bin}/httpd"
8513	elif test -x "${apache_bin}/httpd2"; then	8513	elif test -x "${apache_bin}/httpd2"; then
8514	apache_exe="${apache_bin}/httpd2"	8514	apache_exe="${apache_bin}/httpd2"
		8515	elif test -x "${apache_bin}/apache"; then
		8516	apache_exe="${apache_bin}/apache"
		8517	elif test -x "${apache_bin}/apache2"; then
		8518	apache_exe="${apache_bin}/apache2"
8515	else	8519	else
8516	{ { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5	8520	{ { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5
8517	echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}	8521	echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}

Lines 13-19 resin_libexec=@apache_libexec@ Link Here

(-)/var/tmp/portage/resin-3.0.17/work/resin-3.0.17/modules/c/src/resin_os/Makefile.in (-1 / +1 lines)
13	resin_home=@resin_home@	13	resin_home=@resin_home@
14	JNI_INCLUDE=@JNI_INCLUDE@	14	JNI_INCLUDE=@JNI_INCLUDE@
15	INCLUDES = @INCLUDES@ $(JNI_INCLUDE) -I../common	15	INCLUDES = @INCLUDES@ $(JNI_INCLUDE) -I../common
16	CFLAGS = @CFLAGS@ -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS)	16	CFLAGS = @CFLAGS@ -fPIC -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS)
17	OBJ= jni_os.o jni_jvmti.o jni_jvmdi.o	17	OBJ= jni_os.o jni_jvmti.o jni_jvmdi.o
18		18
19	all : libresin_os.$(SO)	19	all : libresin_os.$(SO)

Return to bug 123586