diff options
Diffstat (limited to 'sysutils/ups-nut-cgi/patches/patch-ad')
| -rw-r--r-- | sysutils/ups-nut-cgi/patches/patch-ad | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad index a8ac5a5382d..e4dd560e7ad 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ b/sysutils/ups-nut-cgi/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ +$NetBSD: patch-ad,v 1.4.2.2 2002/08/25 21:21:36 jlam Exp $ ---- configure.in.orig Tue Feb 26 05:46:25 2002 +--- configure.in.orig Tue Apr 16 23:34:38 2002 +++ configure.in -@@ -16,6 +16,7 @@ +@@ -18,6 +18,7 @@ dnl | default values for things later on STATEPATH="/var/state/ups" MODELPATH="$prefix/bin" CGIPATH="$prefix/cgi-bin" @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ RUN_AS_USER="nobody" RUN_AS_GROUP="nogroup" PIDPATH="/var/run" -@@ -120,9 +121,43 @@ +@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no" ], [], []) fi @@ -54,7 +54,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(X11, XBell, -@@ -131,13 +166,16 @@ +@@ -129,13 +164,16 @@ AC_CHECK_LIB(X11, XBell, echo "Retrying with -L /usr/X11R6/lib" unset ac_cv_lib_X11_XBell AC_CHECK_LIB(X11, XBell, @@ -73,7 +73,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ dnl Skip this chunk if there's no LIBX to use if test "$LIBX" != "" -@@ -145,69 +183,34 @@ +@@ -143,69 +181,35 @@ then dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, @@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ -[-lm -lpng -lz], +[$GRAPHICS_LIBS -lm -lpng -lz], ) -- + -dnl Don't run the ttf/xpm tests against gd unless -dnl we actually have something to test! -dnl @@ -154,13 +154,13 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ +GRAPHICS_LIBS="$LIBGD" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h) + AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h) +CFLAGS=$CFLAGS_save +CPPFLAGS=$CPPFLAGS_save AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h) -@@ -220,7 +223,7 @@ +@@ -218,7 +222,7 @@ if test -n "$LD_LIBRARY_PATH"; then for lib in `echo $LD_LIBRARY_PATH | $AWK -F: '{ for (i = NF; i > 0; --i) print $i }' | sort | uniq`; do if test -f ${lib}/libpng.so; then AC_CHECK_LIB(png, png_info_init, @@ -169,7 +169,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ ], [], [-lm -R${lib}],) -@@ -524,7 +527,8 @@ +@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET) AC_SUBST(LIBOBJ) AC_SUBST(BUILDOBJ) AC_SUBST(NETLIBS) |