[patches.git] / ode-empty-x-flags.patch

Index: configure.in
===================================================================
--- configure.in	(revision 1360)
+++ configure.in	(working copy)
@@ -333,10 +333,10 @@ AC_SUBST(SHARED_LDFLAGS)
 dnl Check for AC_PATH_X variables
 XINCLUDES=
 XLIBRARIES=
-if test "X$x_includes" != "XNONE" || "X$x_includes" != "X"; then
+if test "X$x_includes" != "XNONE" -a "X$x_includes" != "X"; then
 	XINCLUDES="-I$x_includes"
 fi
-if test "X$x_libraries" != "XNONE" || "X$x_libraries" != "X"; then
+if test "X$x_libraries" != "XNONE" -a "X$x_libraries" != "X"; then
 	XLIBRARIES="-L$x_libraries"
 fi
 AC_SUBST(XINCLUDES)
Commit	Line	Data
	1	Index: configure.in
	2	===================================================================
	3	--- configure.in (revision 1360)
	4	+++ configure.in (working copy)
	5	@@ -333,10 +333,10 @@ AC_SUBST(SHARED_LDFLAGS)
	6	dnl Check for AC_PATH_X variables
	7	XINCLUDES=
	8	XLIBRARIES=
	9	-if test "X$x_includes" != "XNONE" \|\| "X$x_includes" != "X"; then
	10	+if test "X$x_includes" != "XNONE" -a "X$x_includes" != "X"; then
	11	XINCLUDES="-I$x_includes"
	12	fi
	13	-if test "X$x_libraries" != "XNONE" \|\| "X$x_libraries" != "X"; then
	14	+if test "X$x_libraries" != "XNONE" -a "X$x_libraries" != "X"; then
	15	XLIBRARIES="-L$x_libraries"
	16	fi
	17	AC_SUBST(XINCLUDES)