cvs: php4 /ext/rpc/java config.m4
| From: | Jani Taskinen | Date: | Fri, 04 Apr 2003 17:42:45 +0000 |
| Subject: | cvs: php4 /ext/rpc/java config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20100@lists.php.net to get a copy of this message | ||
sniper Fri Apr 4 12:42:45 2003 EDT
Modified files:
/php4/ext/rpc/java config.m4
Log:
- Fixed bug #22944 (--with-java "make install" fails)
Index: php4/ext/rpc/java/config.m4
diff -u php4/ext/rpc/java/config.m4:1.48 php4/ext/rpc/java/config.m4:1.49
--- php4/ext/rpc/java/config.m4:1.48 Sun Jan 12 03:01:42 2003
+++ php4/ext/rpc/java/config.m4 Fri Apr 4 12:42:45 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.48 2003/01/12 08:01:42 sebastian Exp $
+dnl $Id: config.m4,v 1.49 2003/04/04 17:42:45 sniper Exp $
dnl
AC_DEFUN(JAVA_FIND_JAR, [
AC_MSG_CHECKING([Java Jar location])
@@ -173,8 +173,12 @@
fi
fi
- INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755
\$(INSTALL_ROOT)\$(libdir)"
- INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar
\$(INSTALL_ROOT)\$(libdir)"
+ if test -n "$INSTALL_IT"; then
+ INSTALL_IT="$INSTALL_IT ;"
+ fi
+
+ INSTALL_IT="$INSTALL_IT \$(srcdir)/build/shtool mkdir -p -f -m 0755
\$(INSTALL_ROOT)\$(libdir)"
+ INSTALL_IT="$INSTALL_IT ; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar
\$(INSTALL_ROOT)\$(libdir)"
fi
PHP_SUBST(JAVA_CLASSPATH)