$OpenBSD: patch-configure_in,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- configure.in.orig	2002-10-19 17:17:11.000000000 -0400
+++ configure.in	2004-04-06 22:48:41.000000000 -0400
@@ -2,7 +2,7 @@
 AC_PREREQ(2.13)
 AC_INIT()
 
-VERSION=1.0.1
+VERSION=1.0.1a
 PACKAGE=zoom
 
 UTIL_DISPLAY_INIT()
@@ -237,12 +237,12 @@ if test "$MINGW32" != "yes"; then
       AC_MSG_ERROR([QuickTime not found (?)])
     fi
 
-    AC_CHECK_LIB(z, inflate, [ LDFLAGS="$LDFLAGS -lz" ])
+    AC_CHECK_LIB(z, inflate, [ LIBS="$LIBS -lz" ])
 
     AC_CHECK_LIB(png, png_get_IHDR,
       [
 	AC_DEFINE(HAVE_LIBPNG)
-	LDFLAGS="$LDFLAGS -lpng"
+	LIBS="$LIBS -lpng"
       ],
       [
 	AC_MSG_WARN([libpng not detected: blecherous QuickTime alpha blending will be used (Ew)])
@@ -322,16 +322,16 @@ AC_SUBST(BUILDERCC)
 
 HAVE_T1LIB=0
 if test "$WINDOW_SYSTEM" = "1"; then
-    LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
+    LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
     CFLAGS="$CFLAGS $X_CFLAGS"
-    LDFLAGS="$LDFLAGS $X_PRE_LIBS -lX11"
+    LIBS="$LIBS -lX11"
 
     AC_CHECK_LIB(m, sin)
     AC_CHECK_LIB(t1, T1_InitLib, 
       [
-        LDFLAGS="$LDFLAGS -lt1"
+        LIBS="$LIBS -lt1"
         AC_CHECK_LIB(t1x, T1_SetCharX,
-	  [ LDFLAGS="$LDFLAGS -lt1x"; HAVE_T1LIB=1 ])
+	  [ LIBS="$LIBS -lt1x"; HAVE_T1LIB=1 ])
       ])
 
     if test "$HAVE_T1LIB" = "1"; then
@@ -348,7 +348,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
 	  ])
     fi
 
-    AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LDFLAGS="$LDFLAGS -lXext" ])
+    AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LIBS="$LIBS -lXext" ])
     AC_MSG_CHECKING([for the DBE X extension library])
     AC_TRY_LINK(
       [ #include <X11/Xlib.h>
@@ -367,7 +367,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
 
     AC_CHECK_LIB(Xft, XftInit,
       [
-        LDFLAGS="$LDFLAGS -lXft"
+        LIBS="$LIBS -lXft"
 	HAVE_XFT=1
       ])
     if test "$HAVE_XFT" = "1"; then
@@ -386,7 +386,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
 
     AC_CHECK_LIB(Xrender, XRenderQueryExtension,
       [
-        LDFLAGS="$LDFLAGS -lXft"
+        LIBS="$LIBS -lXrender"
 	HAVE_XRENDER=1
       ])
     if test "$HAVE_XRENDER" = "1"; then
@@ -406,7 +406,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
     AC_CHECK_LIB(png, png_get_IHDR,
       [
 	AC_DEFINE(HAVE_LIBPNG)
-	LDFLAGS="$LDFLAGS -lpng"
+	LIBS="$LIBS -lpng"
       ],
       [
 	AC_MSG_WARN([libpng not detected: image support will be disabled])
