From 94bcc2b664e12a0c34492dc882fae48bd0a5fa0b Mon Sep 17 00:00:00 2001 From: lukem Date: Fri, 13 Dec 2002 04:23:17 +0000 Subject: Update from nut 0.50.0 to 1.2.1. Many changes, too many to list here. See: http://www.exploits.org/nut/release/1.2/new-1.2.1.txt and (after installation): /usr/pkg/share/doc/nut/UPGRADING --- sysutils/ups-nut-cgi/Makefile | 38 ++- sysutils/ups-nut-cgi/PLIST | 11 +- sysutils/ups-nut-cgi/distinfo | 15 +- sysutils/ups-nut-cgi/patches/patch-aa | 32 +- sysutils/ups-nut-cgi/patches/patch-ab | 21 +- sysutils/ups-nut-cgi/patches/patch-ac | 21 +- sysutils/ups-nut-cgi/patches/patch-ad | 181 ------------ sysutils/ups-nut-cgi/patches/patch-ae | 38 --- sysutils/ups-nut-cgi/patches/patch-af | 541 ---------------------------------- 9 files changed, 64 insertions(+), 834 deletions(-) delete mode 100644 sysutils/ups-nut-cgi/patches/patch-ad delete mode 100644 sysutils/ups-nut-cgi/patches/patch-ae delete mode 100644 sysutils/ups-nut-cgi/patches/patch-af (limited to 'sysutils/ups-nut-cgi') diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 3a47c52d84f..fa8aeeefdf9 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,31 +1,43 @@ -# $NetBSD: Makefile,v 1.19 2002/10/02 23:36:06 dillo Exp $ +# $NetBSD: Makefile,v 1.20 2002/12/13 04:23:20 lukem Exp $ -DISTNAME= nut-0.50.0 -PKGNAME= ups-nut-cgi-0.50.0 +DISTNAME= nut-1.2.1 +PKGNAME= ups-nut-cgi-1.2.1 CATEGORIES= sysutils -MASTER_SITES= http://www.exploits.org/nut/release/ +MASTER_SITES= http://www.exploits.org/nut/release/1.2/ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.exploits.org/nut/ COMMENT= Network UPS Tools CGI scripts -DEPENDS+= ups-nut-0.*:../../sysutils/ups-nut +DEPENDS+= ups-nut-1.*:../../sysutils/ups-nut ALL_TARGET= cgi -INSTALL_TARGET= install-cgi install-cgi-man - -PKG_SYSCONFSUBDIR?= nut -NUT_CONFDIR= ${PKG_SYSCONFDIR} -NUT_STATEDIR= /var/db/nut -NUT_CGIDIR= ${PREFIX}/share/nut/cgi +INSTALL_TARGET= install-cgi USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --with-statepath=${NUT_STATEDIR} \ - --with-cgipath=${NUT_CGIDIR} \ - --with-graphics=${LOCALBASE} + --with-cgi \ + --with-cgipath=${NUT_CGIDIR} + +PKG_SYSCONFSUBDIR?= nut +NUT_CONFDIR= ${PKG_SYSCONFDIR} +NUT_EGDIR= ${PREFIX}/share/examples/nut +NUT_STATEDIR= /var/db/nut +NUT_CGIDIR= ${PREFIX}/share/nut/cgi + +CONF_FILES= ${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf +CONF_FILES+= ${NUT_EGDIR}/upsset.conf.sample \ + ${NUT_CONFDIR}/upsset.conf +CONF_FILES+= ${NUT_EGDIR}/upsstats-single.html.sample \ + ${NUT_CONFDIR}/upsstats-single.html +CONF_FILES+= ${NUT_EGDIR}/upsstats.html.sample \ + ${NUT_CONFDIR}/upsstats.html + +OWN_DIRS= ${NUT_CONFDIR} .include "../../graphics/gd/buildlink2.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST index d586f7a473b..e54f79e70dc 100644 --- a/sysutils/ups-nut-cgi/PLIST +++ b/sysutils/ups-nut-cgi/PLIST @@ -1,14 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:51:07 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/12/13 04:23:21 lukem Exp $ +share/examples/nut/hosts.conf.sample +share/examples/nut/upsset.conf.sample +share/examples/nut/upsstats-single.html.sample +share/examples/nut/upsstats.html.sample man/man5/hosts.conf.5 -man/man5/multimon.conf.5 man/man5/upsset.conf.5 -man/man8/multimon.cgi.8 +man/man5/upsstats.html.5 man/man8/upsimage.cgi.8 man/man8/upsset.cgi.8 man/man8/upsstats.cgi.8 -share/nut/cgi/multimon.cgi share/nut/cgi/upsimage.cgi share/nut/cgi/upsset.cgi share/nut/cgi/upsstats.cgi @dirrm share/nut/cgi -@dirrm share/nut diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo index bddeffc2aed..b4dd38ceaf9 100644 --- a/sysutils/ups-nut-cgi/distinfo +++ b/sysutils/ups-nut-cgi/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.11 2002/10/02 23:36:06 dillo Exp $ +$NetBSD: distinfo,v 1.12 2002/12/13 04:23:21 lukem Exp $ -SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 -Size (nut-0.50.0.tar.gz) = 382755 bytes -SHA1 (patch-aa) = cd7b96973d696c1a1f1051fc30c516e158c89ec5 -SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3 -SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f -SHA1 (patch-ad) = 3620c734b396a2de657b6dceb7d5ba3cc821250b -SHA1 (patch-ae) = 6cff43dc5ed449a8f3c9b1e4864a47336b69fb30 -SHA1 (patch-af) = 803005e807fa6cee7ef9c4b3006ae23b51cb1a2c +SHA1 (nut-1.2.1.tar.gz) = db55b0165ef594ad1cf73bf5d3d9336a0ac0fb93 +Size (nut-1.2.1.tar.gz) = 444256 bytes +SHA1 (patch-aa) = 62f0a514e6dde1f5438be676c269711d1bc5d42c +SHA1 (patch-ab) = 5099c3efb84be2447f80bfeb7f02acc4038ed58f +SHA1 (patch-ac) = 6f9ca3c1faa4cb20598116f602596f43d1e07199 diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa index 4a9cef4a296..b38c9e23f23 100644 --- a/sysutils/ups-nut-cgi/patches/patch-aa +++ b/sysutils/ups-nut-cgi/patches/patch-aa @@ -1,30 +1,12 @@ -$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:07 jlam Exp $ +$NetBSD: patch-aa,v 1.7 2002/12/13 04:23:21 lukem Exp $ ---- Makefile.in.orig Wed Apr 17 00:00:49 2002 +--- Makefile.in.orig Sun Dec 8 12:04:24 2002 +++ Makefile.in -@@ -9,7 +9,7 @@ MODELPATH = $(INSTALLROOT)@MODELPATH@ - INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ - STATEPATH = $(INSTALLROOT)@STATEPATH@ +@@ -81,6 +81,7 @@ + @echo "Run 'configure --with-cgi' before doing 'make cgi'." --SUBDIRS = common models server clients -+SUBDIRS = common - CFLAGS = -I../include @CFLAGS@ - - # these are here so they can be overridden during a make install -@@ -65,7 +65,7 @@ install-dirs: - install-man: - @cd man; $(MAKE) install; cd ..; - --cgi: -+cgi: build + build-cgi: ++ @cd common; $(MAKE); cd ..; @cd clients; $(MAKE) cgi; cd ..; - install-cgi: install-dirs -@@ -73,7 +73,6 @@ install-cgi: install-dirs - ./install-sh -d $(CGIPATH) || exit 1; \ - fi \ - -- @cd conf; $(MAKE) install; cd ..; - @cd clients; $(MAKE) install-cgi; cd ..; - - install-cgi-man: + install-cgi: cgi install-cgi-dir install-dirs install-cgi-bin \ diff --git a/sysutils/ups-nut-cgi/patches/patch-ab b/sysutils/ups-nut-cgi/patches/patch-ab index 04856e2c203..46a19e0a3bd 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ab +++ b/sysutils/ups-nut-cgi/patches/patch-ab @@ -1,13 +1,12 @@ -$NetBSD: patch-ab,v 1.3 2001/11/21 15:53:08 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2002/12/13 04:23:21 lukem Exp $ ---- clients/Makefile.in.orig Wed Jul 4 00:31:29 2001 +--- clients/Makefile.in.orig Mon Dec 2 23:09:20 2002 +++ clients/Makefile.in -@@ -59,7 +59,7 @@ - $(CC) $(CFLAGS) -o upsstats.cgi upsstats.c upsfetch.o cgilib.o $(LIBOBJ) - - upsimage.cgi: upsimage.c upsfetch.o cgilib.o $(LIBDEP) -- $(CC) $(CFLAGS) -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @GFXLIBS@ -lm $(LIBOBJ) -+ $(CC) $(CFLAGS) @GRAPHICS_INCLUDES@ -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @LDFLAGS@ @GRAPHICS_LIBS@ -lm $(LIBOBJ) - - clean: - rm -f *~ *.o $(PROGS) $(SPROGS) $(CGIPROGS) +@@ -15,6 +15,7 @@ + # other definitions + CC = @CC@ + CFLAGS = -I../include @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + PROGS = upsc upslog upsrw upscmd + SPROGS = upsmon upssched + CGIPROGS = upsstats.cgi upsimage.cgi upsset.cgi diff --git a/sysutils/ups-nut-cgi/patches/patch-ac b/sysutils/ups-nut-cgi/patches/patch-ac index c9b5c7f02f9..cf04b8406e4 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ac +++ b/sysutils/ups-nut-cgi/patches/patch-ac @@ -1,14 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2001/03/11 13:50:50 martin Exp $ +$NetBSD: patch-ac,v 1.3 2002/12/13 04:23:21 lukem Exp $ ---- acconfig.h.orig Sat Mar 10 17:00:13 2001 -+++ acconfig.h Sat Mar 10 17:00:39 2001 -@@ -15,6 +15,9 @@ - /* default path for model-specific drivers */ - #define MODELPATH "/usr/local/ups/bin" +--- conf/Makefile.in.orig Tue Sep 3 17:23:02 2002 ++++ conf/Makefile.in +@@ -4,7 +4,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ -+/* default path for graphics library files */ -+#define GRAPHLIB_PATH "/usr/local" -+ - /* path where your pid files should go. */ - #define PIDPATH "/var/run" +-CONFPATH = $(DESTDIR)@sysconfdir@ ++CONFPATH = $(DESTDIR)@datadir@/examples/nut + + INSTALLCMD = @INSTALL@ diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad deleted file mode 100644 index bdc5984ad81..00000000000 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ /dev/null @@ -1,181 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2002/08/25 21:51:08 jlam Exp $ - ---- configure.in.orig Tue Apr 16 23:34:38 2002 -+++ configure.in -@@ -18,6 +18,7 @@ dnl | default values for things later on - STATEPATH="/var/state/ups" - MODELPATH="$prefix/bin" - CGIPATH="$prefix/cgi-bin" -+GRAPHLIB_PATH="/usr/local" - RUN_AS_USER="nobody" - RUN_AS_GROUP="nogroup" - PIDPATH="/var/run" -@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no" - ], [], []) - fi - -+AC_MSG_CHECKING(graphics library file path) -+AC_ARG_WITH(graphics, -+[ --with-graphics=PATH Path for graphics library files], -+[ case "$withval" in -+ yes|no) -+ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) -+ ;; -+ *) -+ AC_MSG_RESULT($withval) -+ AC_DEFINE_UNQUOTED(GRAPHLIB_PATH, "$withval") -+ GRAPHLIB_PATH=$withval -+ ;; -+ esac], -+ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) -+) -+GRAPHICS_LIBS="-R$GRAPHLIB_PATH/lib -L$GRAPHLIB_PATH/lib" -+GRAPHICS_INCLUDES="-I$GRAPHLIB_PATH/include" -+CFLAGS_save=$CFLAGS -+CPPFLAGS_save=$CPPFLAGS -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+CPPFLAGS="$CPPFLAGS_save $GRAPHICS_INCLUDES" -+ -+dnl Include in case GD was compiled with internationalization support -+AC_CHECK_LIB(intl, gettext, -+[ LIBINTL="-lintl"],[ LIBINTL=""] ) -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBINTL" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ - dnl Include in case GD was compiled with True Type support - AC_CHECK_LIB(ttf, TT_New_Glyph, - [ LIBTTF="-lttf"],[ LIBTTF=""] ) -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBTTF" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ -+dnl Include in case GD was compiled with jpeg support -+AC_CHECK_LIB(jpeg, jpeg_abort, -+[ LIBJPEG="-ljpeg"],[ LIBJPEG=""] ) - - dnl Include in case GD was compiled with Xpm support - AC_CHECK_LIB(X11, XBell, -@@ -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, -- [ LIBX="-lX11 -L/usr/X11R6/lib" ], -+ [ LIBX="-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11" ], - [ LIBX="" ], -- [ -lX11 -L/usr/X11R6/lib ], -+ [ -L/usr/X11R6/lib -lX11 ], - ) - ], - ) - -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ - dnl Skip this chunk if there's no LIBX to use - - if test "$LIBX" != "" -@@ -143,69 +181,35 @@ then - - dnl Include in case GD was compiled with Xpm support - AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, -- [ LIBXPM="-lXpm"], -- [ -- echo "Retrying with $LIBX" -- unset ac_cv_lib_Xpm_XpmReadFileToXpmImage -- AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, -- [ LIBXPM="-lXpm $LIBX" ], -- [ LIBXPM="" ], -- [ -lXpm $LIBX ], -- ) -- ], -- [ -lXpm ], -+ [ LIBXPM="-lXpm $LIBX"], -+ [ LIBXPM="" ], -+ [ -lXpm $LIBX ], - ) -+ -+ GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBXPM" -+ CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - fi - - AC_CHECK_LIB(gd, gdImagePng, - [ -- GFXLIBS="-lgd -lpng -lz" -+ LIBGD="$GRAPHICS_LIBS -lgd -lpng -lz" - ], - [ -- echo "Trying again - using -L/usr/local/lib -I/usr/local/include..." -- unset ac_cv_lib_gd_gdImagePng -- CPPFLAGS="$CPPFLAGS -L/usr/local/lib -I/usr/local/include" -- AC_CHECK_LIB(gd, gdImagePng, -- [ -- GFXLIBS="-lgd -lpng -lz -L/usr/local/lib -I/usr/local/include" -- ],, -- [-lm -lpng -lz]) -+ AC_MSG_RESULT( -+** You will not be able to build the CGI programs without gd. -+** -+** To get it, visit http://www.boutell.com/gd/ -+ ) - ], --[-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 --if test "$LIBTTF" != "" --then -- -- if test "$GFXLIBS" = "" ; then -- echo "Trying again - using $LIBTTF" -- unset ac_cv_lib_gd_gdImagePng -- AC_CHECK_LIB(gd, gdImagePng, -- [ -- GFXLIBS="-lgd -lpng -lz $LIBTTF" -- ],, -- [-lm -lpng -lz $LIBTTF]) -- fi -- -- if test "$GFXLIBS" = "" ; then -- echo "Trying again - using $LIBTTF $LIBXPM" -- unset ac_cv_lib_gd_gdImagePng -- AC_CHECK_LIB(gd, gdImagePng, -- [ -- GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM" -- ],, -- [-lm -lpng -lz $LIBTTF $LIBXPM]) -- fi --fi -- --test "$GFXLIBS" = "" && echo "** You will not be able to build the CGI programs without gd." --test "$GFXLIBS" = "" && echo "** " --test "$GFXLIBS" = "" && echo "** To get it, visit http://www.boutell.com/gd/" -+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) -+CFLAGS=$CFLAGS_save -+CPPFLAGS=$CPPFLAGS_save - - AC_HEADER_TIME - AC_CHECK_HEADERS(sys/time.h) -@@ -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, -- [ GFXLIBS="-R${lib} $GFXLIBS" -+ [ GRAPHICS_LIBS="-R${lib} $GRAPHICS_LIBS" - ], - [], - [-lm -R${lib}],) -@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET) - AC_SUBST(LIBOBJ) - AC_SUBST(BUILDOBJ) - AC_SUBST(NETLIBS) --AC_SUBST(GFXLIBS) -+AC_SUBST(GRAPHICS_LIBS) -+AC_SUBST(GRAPHICS_INCLUDES) - AC_SUBST(SERLIBS) - AC_SUBST(STATEPATH) - AC_SUBST(MODELPATH) diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae deleted file mode 100644 index 9f364aeb950..00000000000 --- a/sysutils/ups-nut-cgi/patches/patch-ae +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2002/08/25 21:51:08 jlam Exp $ - ---- clients/upsstats.c.orig Thu Mar 21 17:01:16 2002 -+++ clients/upsstats.c -@@ -74,6 +74,7 @@ int main() - double tempf; - char model[64], status[64], battpct[64], utility[64], loadpct[64], - upstemp[64], acfreq[64], *stat, *ptr; -+ char runtime[64]; - int i; - - extractcgiargs(); -@@ -162,6 +163,7 @@ int main() - printf("\n"); - printf("\n"); - -+#if 0 - printf("
\n");
- 
- 	/* TODO: handle self tests */
-@@ -169,6 +171,7 @@ int main() 
- /*	printf("Last UPS Self Test: Not Available\n"); */
- /*	printf("    Last Test Date: Not Available\n"); */
- 	printf("
\n"); -+#endif - - printf("
\n");
- 
-@@ -186,6 +189,9 @@ int main() 
- 
- 	if (getupsvar(monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
- 		printf(" Output Freq: %s Hz\n", acfreq);
-+
-+	if (getupsvar(monhost, "runtime", runtime, sizeof(runtime)) > 0)
-+		printf("     Runtime: %s\n", runtime);
- 
- 	printf("

\n"); - printf("

Network UPS Tools upsstats %s
\n", UPS_VERSION); diff --git a/sysutils/ups-nut-cgi/patches/patch-af b/sysutils/ups-nut-cgi/patches/patch-af deleted file mode 100644 index 78cb19ffd65..00000000000 --- a/sysutils/ups-nut-cgi/patches/patch-af +++ /dev/null @@ -1,541 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/10/02 23:36:07 dillo Exp $ - ---- configure.orig Thu Oct 3 01:28:43 2002 -+++ configure -@@ -12,6 +12,8 @@ ac_help= - ac_default_prefix=/usr/local - # Any additions from configure.in: - ac_help="$ac_help -+ --with-graphics=PATH Path for graphics library files" -+ac_help="$ac_help - --with-linux-hiddev=PATH Path to Linux hiddev.h kernel headers" - ac_help="$ac_help - --with-statepath=PATH Path for ups state files" -@@ -666,6 +668,7 @@ test "$host_alias" != "$target_alias" && - STATEPATH="/var/state/ups" - MODELPATH="$prefix/bin" - CGIPATH="$prefix/cgi-bin" -+GRAPHLIB_PATH="/usr/local" - RUN_AS_USER="nobody" - RUN_AS_GROUP="nogroup" - PIDPATH="/var/run" -@@ -1763,99 +1766,46 @@ fi - - fi - --echo $ac_n "checking for TT_New_Glyph in -lttf""... $ac_c" 1>&6 --echo "configure:1768: checking for TT_New_Glyph in -lttf" >&5 --ac_lib_var=`echo ttf'_'TT_New_Glyph | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lttf $LIBS" --cat > conftest.$ac_ext <&6 -+echo "configure:1771: checking graphics library file path" >&5 -+# Check whether --with-graphics or --without-graphics was given. -+if test "${with_graphics+set}" = set; then -+ withval="$with_graphics" -+ case "$withval" in -+ yes|no) -+ echo "$ac_t""using default: $GRAPHLIB_PATH" 1>&6 -+ ;; -+ *) -+ echo "$ac_t""$withval" 1>&6 -+ cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBTTF="-lttf" --else -- echo "$ac_t""no" 1>&6 -- LIBTTF="" --fi -- -- --echo $ac_n "checking for XBell in -lX11""... $ac_c" 1>&6 --echo "configure:1810: checking for XBell in -lX11" >&5 --ac_lib_var=`echo X11'_'XBell | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ GRAPHLIB_PATH=$withval -+ ;; -+ esac - else -- ac_save_LIBS="$LIBS" --LIBS="-lX11 $LIBS" --cat > conftest.$ac_ext <&6 - --int main() { --XBell() --; return 0; } --EOF --if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" - fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBX="-lX11" --else -- echo "$ac_t""no" 1>&6 -+GRAPHICS_LIBS="-R$GRAPHLIB_PATH/lib -L$GRAPHLIB_PATH/lib" -+GRAPHICS_INCLUDES="-I$GRAPHLIB_PATH/include" -+CFLAGS_save=$CFLAGS -+CPPFLAGS_save=$CPPFLAGS -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+CPPFLAGS="$CPPFLAGS_save $GRAPHICS_INCLUDES" - -- echo "Retrying with -L /usr/X11R6/lib" -- unset ac_cv_lib_X11_XBell -- echo $ac_n "checking for XBell in -lX11""... $ac_c" 1>&6 --echo "configure:1851: checking for XBell in -lX11" >&5 --ac_lib_var=`echo X11'_'XBell | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -+echo "configure:1801: checking for gettext in -lintl" >&5 -+ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lX11 -lX11 -L/usr/X11R6/lib $LIBS" -+LIBS="-lintl $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1881,30 +1831,25 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- LIBX="-lX11 -L/usr/X11R6/lib" -+ LIBINTL="-lintl" - else - echo "$ac_t""no" 1>&6 -- LIBX="" --fi -- -- -+ LIBINTL="" - fi - -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBINTL" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - -- --if test "$LIBX" != "" --then -- -- echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:1900: checking for XpmReadFileToXpmImage in -lXpm" >&5 --ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for TT_New_Glyph in -lttf""... $ac_c" 1>&6 -+echo "configure:1845: checking for TT_New_Glyph in -lttf" >&5 -+ac_lib_var=`echo ttf'_'TT_New_Glyph | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lXpm -lXpm $LIBS" -+LIBS="-lttf $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1930,22 +1875,25 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- LIBXPM="-lXpm" -+ LIBTTF="-lttf" - else - echo "$ac_t""no" 1>&6 -- -- echo "Retrying with $LIBX" -- unset ac_cv_lib_Xpm_XpmReadFileToXpmImage -- echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:1941: checking for XpmReadFileToXpmImage in -lXpm" >&5 --ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` -+ LIBTTF="" -+fi -+ -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBTTF" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ -+echo $ac_n "checking for jpeg_abort in -ljpeg""... $ac_c" 1>&6 -+echo "configure:1889: checking for jpeg_abort in -ljpeg" >&5 -+ac_lib_var=`echo jpeg'_'jpeg_abort | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lXpm -lXpm $LIBX $LIBS" -+LIBS="-ljpeg $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1971,27 +1919,23 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- LIBXPM="-lXpm $LIBX" -+ LIBJPEG="-ljpeg" - else - echo "$ac_t""no" 1>&6 -- LIBXPM="" --fi -- -- -+ LIBJPEG="" - fi - --fi - --echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6 --echo "configure:1987: checking for gdImagePng in -lgd" >&5 --ac_lib_var=`echo gd'_'gdImagePng | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for XBell in -lX11""... $ac_c" 1>&6 -+echo "configure:1931: checking for XBell in -lX11" >&5 -+ac_lib_var=`echo X11'_'XBell | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lgd -lm -lpng -lz $LIBS" -+LIBS="-lX11 $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2017,25 +1961,22 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- GFXLIBS="-lgd -lpng -lz" -- -+ LIBX="-lX11" - else - echo "$ac_t""no" 1>&6 - -- echo "Trying again - using -L/usr/local/lib -I/usr/local/include..." -- unset ac_cv_lib_gd_gdImagePng -- CPPFLAGS="$CPPFLAGS -L/usr/local/lib -I/usr/local/include" -- echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6 --echo "configure:2031: checking for gdImagePng in -lgd" >&5 --ac_lib_var=`echo gd'_'gdImagePng | sed 'y%./+-%__p_%'` -+ echo "Retrying with -L /usr/X11R6/lib" -+ unset ac_cv_lib_X11_XBell -+ echo $ac_n "checking for XBell in -lX11""... $ac_c" 1>&6 -+echo "configure:1972: checking for XBell in -lX11" >&5 -+ac_lib_var=`echo X11'_'XBell | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lgd -lm -lpng -lz $LIBS" -+LIBS="-lX11 -L/usr/X11R6/lib -lX11 $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2061,33 +2002,33 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- GFXLIBS="-lgd -lpng -lz -L/usr/local/lib -I/usr/local/include" -- -+ LIBX="-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11" - else - echo "$ac_t""no" 1>&6 -+ LIBX="" - fi - -- -+ - fi - - --if test "$LIBTTF" != "" -+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ -+ -+if test "$LIBX" != "" - then - -- if test "$GFXLIBS" = "" ; then -- echo "Trying again - using $LIBTTF" -- unset ac_cv_lib_gd_gdImagePng -- echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6 --echo "configure:2083: checking for gdImagePng in -lgd" >&5 --ac_lib_var=`echo gd'_'gdImagePng | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 -+echo "configure:2024: checking for XpmReadFileToXpmImage in -lXpm" >&5 -+ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lgd -lm -lpng -lz $LIBTTF $LIBS" -+LIBS="-lXpm -lXpm $LIBX $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2113,28 +2054,27 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- GFXLIBS="-lgd -lpng -lz $LIBTTF" -- -+ LIBXPM="-lXpm $LIBX" - else - echo "$ac_t""no" 1>&6 -+ LIBXPM="" - fi - -- fi - -- if test "$GFXLIBS" = "" ; then -- echo "Trying again - using $LIBTTF $LIBXPM" -- unset ac_cv_lib_gd_gdImagePng -- echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6 --echo "configure:2130: checking for gdImagePng in -lgd" >&5 -+ GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBXPM" -+ CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+fi -+ -+echo $ac_n "checking for gdImagePng in -lgd""... $ac_c" 1>&6 -+echo "configure:2070: checking for gdImagePng in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImagePng | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lgd -lm -lpng -lz $LIBTTF $LIBXPM $LIBS" -+LIBS="-lgd $GRAPHICS_LIBS -lm -lpng -lz $LIBS" - cat > conftest.$ac_ext <&6 - -- GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM" -- -+ LIBGD="$GRAPHICS_LIBS -lgd -lpng -lz" -+ - else - echo "$ac_t""no" 1>&6 --fi - -- fi -+ echo "$ac_t""** You will not be able to build the CGI programs without gd. -+** -+** To get it" 1>&6 -+ - fi - --test "$GFXLIBS" = "" && echo "** You will not be able to build the CGI programs without gd." --test "$GFXLIBS" = "" && echo "** " --test "$GFXLIBS" = "" && echo "** To get it, visit http://www.boutell.com/gd/" -+ -+GRAPHICS_LIBS="$LIBGD" -+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - - for ac_hdr in gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h - do -@@ -2214,9 +2156,11 @@ else - fi - done - -+CFLAGS=$CFLAGS_save -+CPPFLAGS=$CPPFLAGS_save - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2220: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2164: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2363,7 +2307,7 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- GFXLIBS="-R${lib} $GFXLIBS" -+ GRAPHICS_LIBS="-R${lib} $GRAPHICS_LIBS" - - else - echo "$ac_t""no" 1>&6 -@@ -3242,7 +3187,8 @@ s%@DRIVER_INSTALL_TARGET@%$DRIVER_INSTAL - s%@LIBOBJ@%$LIBOBJ%g - s%@BUILDOBJ@%$BUILDOBJ%g - s%@NETLIBS@%$NETLIBS%g --s%@GFXLIBS@%$GFXLIBS%g -+s%@GRAPHICS_LIBS@%$GRAPHICS_LIBS%g -+s%@GRAPHICS_INCLUDES@%$GRAPHICS_INCLUDES%g - s%@SERLIBS@%$SERLIBS%g - s%@STATEPATH@%$STATEPATH%g - s%@MODELPATH@%$MODELPATH%g -- cgit v1.2.3