aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xscreensaver
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/xscreensaver
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/xscreensaver')
-rw-r--r--recipes/xscreensaver/files/XScreenSaver625
-rw-r--r--recipes/xscreensaver/files/fixes.patch94
-rw-r--r--recipes/xscreensaver/xscreensaver-4.16/configure.patch1954
-rw-r--r--recipes/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch72
-rw-r--r--recipes/xscreensaver/xscreensaver-4.22/configure.in.patch15
-rw-r--r--recipes/xscreensaver/xscreensaver-5.07/configure.in.patch91
-rw-r--r--recipes/xscreensaver/xscreensaver-5.07/glfix.patch20
-rw-r--r--recipes/xscreensaver/xscreensaver.inc87
-rw-r--r--recipes/xscreensaver/xscreensaver_4.16.bb61
-rw-r--r--recipes/xscreensaver/xscreensaver_4.22.bb66
-rw-r--r--recipes/xscreensaver/xscreensaver_5.07.bb9
11 files changed, 3094 insertions, 0 deletions
diff --git a/recipes/xscreensaver/files/XScreenSaver b/recipes/xscreensaver/files/XScreenSaver
new file mode 100644
index 0000000000..fa27d2c536
--- /dev/null
+++ b/recipes/xscreensaver/files/XScreenSaver
@@ -0,0 +1,625 @@
+!
+! XScreenSaver
+!
+! a screen saver and locker for the X window system
+! by Jamie Zawinski
+!
+! version 4.16
+! 12-May-2004
+!
+! See "man xscreensaver" for more info. The latest version is always
+! available at http://www.jwz.org/xscreensaver/
+
+
+! These resources, when placed in the system-wide app-defaults directory
+! (e.g., /usr/lib/X11/app-defaults/XScreenSaver) will provide the default
+! settings for new users. However, if you have a ".xscreensaver" file in
+! your home directory, the settings in that file take precedence.
+
+
+! Don't hand this file to "xrdb" -- that isn't how app-defaults files work.
+! Though app-defaults files have (mostly) the same syntax as your ~/.Xdefaults
+! file, they are used differently, and if you run this file through xrdb,
+! you will probably mess things up.
+
+#error Do not run app-defaults files through xrdb!
+#error That does not do what you might expect.
+#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.
+
+! /* (xrdb prevention kludge: whole file)
+
+*timeout: 0:10:00
+*cycle: 0:10:00
+*lockTimeout: 0:00:00
+*passwdTimeout: 0:00:30
+*dpmsEnabled: False
+*dpmsStandby: 2:00:00
+*dpmsSuspend: 2:00:00
+*dpmsOff: 4:00:00
+*grabDesktopImages: True
+*grabVideoFrames: False
+*chooseRandomImages: False
+*imageDirectory:
+*mode: one
+*selected: 129
+*nice: 10
+*memoryLimit: 0
+*lock: False
+*lockVTs: True
+*verbose: False
+*timestamp: True
+*fade: True
+*unfade: False
+*fadeSeconds: 0:00:03
+*fadeTicks: 20
+*splash: False
+*splashDuration: 0:00:05
+*visualID: default
+*captureStderr: True
+*ignoreUninstalledPrograms: True
+
+*overlayTextForeground: #FFFF00
+*overlayTextBackground: #000000
+*overlayStderr: True
+*font: *-medium-r-*-140-*-m-*
+
+! The default is to use these extensions if available (as noted.)
+*sgiSaverExtension: True
+*mitSaverExtension: False
+*xidleExtension: True
+*procInterrupts: True
+
+! Set this to True if you are experiencing longstanding XFree86 bug #421
+! (xscreensaver not covering the whole screen)
+GetViewPortIsFullOfLies: False
+
+! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.)
+*demoCommand: xscreensaver-demo
+
+! This is what the "Prefs" button on the splash screen runs (/bin/sh syntax.)
+*prefsCommand: xscreensaver-demo -prefs
+
+! This is the URL that the "Help" button on the splash screen loads.
+*helpURL: http://www.jwz.org/xscreensaver/man.html
+
+! This is how the "Help" button loads URLs (/bin/sh syntax.)
+! The "helpURL" will be substituted for up to two occurrences of "%s".
+*loadURL: mozilla '%s' || netscape '%s'
+! *loadURL: gnome-url-show '%s' || gnome-moz-remote --newwin '%s'
+
+! This is what the "Manual" button in xscreensaver-demo runs (/bin/sh syntax.)
+*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
+ -e /bin/sh -c 'man "%s" ; read foo'
+! For GNOME systems:
+! *manualCommand: yelp 'man:%s' || gnome-help-browser 'man:%s'
+
+
+! The format used for printing the date and time in the password dialog box
+! (see the strftime(3) manual page for details.)
+*dateFormat: %d-%b-%y (%a); %I:%M %p
+! To show the time only:
+! *dateFormat: %I:%M %p
+! For 24 hour time:
+! *dateFormat: %H:%M
+
+
+! Turning on "installColormap" on 8-bit systems interacts erratically with
+! certain jurassic window managers. If your screen turns some color other
+! than black, the window manager is buggy, and you need to set this resource
+! to false. Or switch WMs. Or join the 21st century and get a 24-bit
+! graphics card.
+!
+*installColormap: True
+
+
+! This is the list of installed screen saver modes. See "man xscreensaver"
+! for the syntax used here.
+!
+! If you want to disable a screensaver, DO NOT remove it from this list:
+! instead, mark it as inactive by placing a "-" at the beginning of the line.
+!
+! You can use the `xscreensaver-demo' program to edit the current list of
+! screen savers interactively.
+!
+*programs: \
+ "Qix (solid)" qix -root -solid -segments 100 \n\
+ "Qix (transparent)" qix -root -count 4 -solid -transparent \n\
+ "Qix (linear)" qix -root -count 5 -solid -transparent \
+ -linear -segments 250 -size 100 \n\
+- "Qix (xor)" qix -root -linear -count 5 -size 200 \
+ -spread 30 -segments 75 -solid -xor \n\
+ \
+ "Attraction (balls)" attraction -root -mode balls \n\
+ "Attraction (lines)" attraction -root -mode lines -points 3 \
+ -segments 200 \n\
+- "Attraction (poly)" attraction -root -mode polygons \n\
+ "Attraction (splines)" attraction -root -mode splines -segments \
+ 300 \n\
+ "Attraction (orbital)" attraction -root -mode lines -radius 300 \
+ -orbit -vmult 0.5 \n\
+ \
+ pyro -root \n\
+ rocks -root \n\
+ helix -root \n\
+ pedal -root \n\
+ rorschach -root -offset 7 \n\
+ hopalong -root \n\
+ greynetic -root \n\
+ imsmap -root \n\
+ slidescreen -root \n\
+ decayscreen -root \n\
+ jigsaw -root \n\
+ blitspin -root -grab \n\
+ slip -root \n\
+ distort -root \n\
+ spotlight -root \n\
+ "Ripples (oily)" ripples -root -oily -light 2 \n\
+ "Ripples (stir)" ripples -root -oily -light 2 -stir \n\
+ "Ripples (desktop)" ripples -root -water -light 6 \n\
+ hypercube -root \n\
+- hyperball -root \n\
+ halo -root \n\
+ maze -root \n\
+ noseguy -root \n\
+ flame -root \n\
+ lmorph -root \n\
+ deco -root \n\
+ moire -root \n\
+ moire2 -root \n\
+ lightning -root \n\
+ strange -root \n\
+ spiral -root \n\
+ laser -root \n\
+ grav -root \n\
+ "Grav (trails)" grav -root -trail -decay \n\
+ drift -root \n\
+ ifs -root \n\
+ julia -root \n\
+ penrose -root \n\
+ sierpinski -root \n\
+ braid -root \n\
+ galaxy -root \n\
+ bouboule -root \n\
+ swirl -root \n\
+ flag -root \n\
+ sphere -root \n\
+ forest -root \n\
+ lisa -root \n\
+ lissie -root \n\
+ goop -root -max-velocity 0.5 -elasticity \
+ 0.9 \n\
+ starfish -root \n\
+ "Starfish (blob)" starfish -root -blob \n\
+ munch -root \n\
+ mismunch -root \n\
+ fadeplot -root \n\
+ coral -root -delay 0 \n\
+ mountain -root \n\
+ triangle -root -delay 1 \n\
+ worm -root \n\
+ rotor -root \n\
+ ant -root \n\
+ demon -root \n\
+ loop -root \n\
+ vines -root \n\
+ kaleidescope -root \n\
+ xjack -root \n\
+ xlyap -root -randomize \n\
+ cynosure -root \n\
+ flow -root \n\
+ epicycle -root \n\
+ interference -root \n\
+ truchet -root -randomize \n\
+ bsod -root \n\
+ crystal -root \n\
+ discrete -root \n\
+ kumppa -root \n\
+ rd-bomb -root \n\
+ "RD-Bomb (mobile)" rd-bomb -root -speed 1 -size 0.1 \n\
+ sonar -root \n\
+ t3d -root \n\
+ penetrate -root \n\
+ deluxe -root \n\
+ compass -root \n\
+ squiral -root \n\
+ xflame -root \n\
+ wander -root \n\
+ "Wander (spots)" wander -root -advance 0 -size 10 -circles \
+ -length 10000 -reset 100000 \n\
+ critical -root \n\
+ phosphor -root \n\
+ xmatrix -root \n\
+ petri -root -size 2 -count 20 \n\
+ "Petri 2" petri -root -minlifespeed 0.02 \
+ -maxlifespeed 0.03 -minlifespan 1 \
+ -maxlifespan 1 -instantdeathchan 0 \
+ -minorchan 0 -anychan 0.3 \n\
+ shadebobs -root \n\
+ ccurve -root \n\
+ blaster -root \n\
+ bumps -root \n\
+ xteevee -root \n\
+ xanalogtv -root \n\
+ xspirograph -root \n\
+ nerverot -root \n\
+- "NerveRot (dense)" nerverot -root -count 1000 \n\
+- "NerveRot (thick)" nerverot -root -count 100 -line-width 4 \
+ -max-nerve-radius 0.8 -nervousness 0.5 -db \n\
+ xrayswarm -root \n\
+- "Zoom (Fatbits)" zoom -root \n\
+ "Zoom (Lenses)" zoom -root -lenses \n\
+ rotzoomer -root \n\
+- "RotZoomer (mobile)" rotzoomer -root -move \n\
+- "RotZoomer (sweep)" rotzoomer -root -sweep \n\
+ whirlwindwarp -root \n\
+ "WhirlyGig" whirlygig -root \n\
+ "SpeedMine" speedmine -root \n\
+ "SpeedWorm" speedmine -root -worm \n\
+ vermiculate -root \n\
+ twang -root \n\
+ apollonian -root \n\
+ euler2d -root \n\
+ "Euler2d (dense)" euler2d -root -count 4000 -eulertail 400 \
+ -ncolors 230 \n\
+- juggle -root \n\
+ polyominoes -root \n\
+- thornbird -root \n\
+ fluidballs -root \n\
+ anemone -root \n\
+ halftone -root \n\
+ metaballs -root \n\
+ eruption -root \n\
+ popsquares -root \n\
+ barcode -root \n\
+ piecewise -root \n\
+ cloudlife -root \n\
+ "FontGlide" fontglide -root -page \n\
+ "FontGlide (scroller)" fontglide -root -scroll \n\
+ apple2 -root \n\
+ bubbles -root \n\
+ pong -root \n\
+ wormhole -root \n\
+ pacman -root \n\
+ fuzzyflakes -root \n\
+- default-n: webcollage -root \n\
+- default-n: "WebCollage (whacked)" \
+ webcollage -root -filter \
+ 'vidwhacker -stdin -stdout' \n\
+- default-n: vidwhacker -root \n\
+ \
+- GL: gears -root \n\
+- GL: "Gears (planetary)" gears -root -planetary \n\
+- GL: superquadrics -root \n\
+- GL: morph3d -root \n\
+- GL: cage -root \n\
+- GL: moebius -root \n\
+- GL: stairs -root \n\
+- GL: pipes -root \n\
+- GL: sproingies -root \n\
+- GL: rubik -root \n\
+- GL: atlantis -root \n\
+- GL: lament -root \n\
+- GL: bubble3d -root \n\
+- GL: glplanet -root \n\
+- GL: flurry -root -preset random \n\
+- GL: pulsar -root \n\
+- GL: "Pulsar (textures)" \
+ pulsar -root -texture -mipmap \
+ -texture_quality -light -fog \n\
+- GL: extrusion -root \n\
+- GL: sierpinski3d -root \n\
+- GL: menger -root \n\
+- GL: "GFlux" gflux -root \n\
+- GL: "GFlux (grab)" gflux -root -mode grab \n\
+- GL: stonerview -root \n\
+- GL: starwars -root \n\
+- GL: gltext -root \n\
+- GL: "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root \n\
+- GL: "Molecule" molecule -root \n\
+- GL: "Molecule (lumpy)" molecule -root -no-bonds -no-labels \n\
+- GL: dangerball -root \n\
+- GL: circuit -root \n\
+- GL: engine -root \n\
+- GL: flipscreen3d -root \n\
+- GL: glsnake -root \n\
+- GL: boxed -root \n\
+- GL: "GLForestFire" glforestfire -root \n\
+- GL: "GLForestFire (rain)" glforestfire -root -count 0 \n\
+- GL: sballs -root \n\
+- GL: cubenetic -root \n\
+- GL: spheremonics -root \n\
+- GL: lavalite -root \n\
+- GL: queens -root \n\
+- GL: endgame -root \n\
+- GL: glblur -root \n\
+- GL: atunnel -root \n\
+- GL: flyingtoasters -root \n\
+- GL: bouncingcow -root \n\
+- GL: jigglypuff -root -random \n\
+- GL: klein -root -random \n\
+- GL: "HyperTorus (striped)" hypertorus -root \n\
+- GL: "HyperTorus (solid)" hypertorus -root -solid -transparent \n\
+- GL: glmatrix -root \n\
+- GL: cubestorm -root \n\
+- GL: glknots -root \n\
+- GL: blocktube -root \n\
+- GL: flipflop -root \n\
+- GL: antspotlight -root \n\
+- GL: glslideshow -root \n\
+- GL: polytopes -root \n\
+- GL: gleidescope -root \n\
+- GL: mirrorblob -root \n\
+- GL: "MirrorBlob (color only)" \
+ mirrorblob -root -colour -no-texture \n\
+- GL: blinkbox -root \n\
+- GL: noof -root \n\
+- GL: polyhedra -root \n\
+ \
+- xdaliclock -root -builtin3 -cycle \n\
+- default-n: xearth -nofork -nostars -ncolors 50 \
+ -night 3 -wait 0 -timewarp 400.0 -pos \
+ sunrel/38/-30 \n\
+- xplanet -vroot -wait 1 -timewarp 90000 \
+ -label -origin moon \n\
+- xmountains -b -M -Z 0 -r 1 \n\
+- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\
+- xaos -root -autopilot -nogui -delay 10000 \
+ -maxframerate 30 \
+ -incoloring -1 -outcoloring -1 \n\
+- xfishtank -d -s \n\
+- xsnow \n\
+- goban -root \n\
+- electricsheep \n\
+- cosmos -root \n\
+- GL: sphereEversion --root \n\
+- GL: fireflies -root \n\
+- GL: antinspect -root \n\
+- GL: providence -root \n
+
+
+
+!=============================================================================
+!
+! You probably don't want to change anything after this point.
+!
+!=============================================================================
+
+
+XScreenSaver.pointerPollTime: 0:00:05
+XScreenSaver.initialDelay: 0:00:00
+XScreenSaver.windowCreationTimeout: 0:00:30
+XScreenSaver.bourneShell: /bin/sh
+
+
+! Resources for the password and splash-screen dialog boxes of
+! the "xscreensaver" daemon.
+!
+*Dialog.headingFont: *-times-bold-r-*-*-*-180-*-*-*-iso8859-1
+*Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
+*Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
+*Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
+*Dialog.dateFont: *-courier-medium-r-*-*-*-80-*-*-*-iso8859-1
+*Dialog.foreground: #000000
+*Dialog.background: #D6D6D6
+*Dialog.Button.foreground: #000000
+*Dialog.Button.background: #EAEAEA
+!*Dialog.Button.background: #D6D6D6
+!*Dialog.Button.pointBackground: #EAEAEA
+!*Dialog.Button.clickBackground: #C3C3C3
+*Dialog.text.foreground: #000000
+*Dialog.text.background: #FFFFFF
+*passwd.thermometer.foreground: #FF0000
+*passwd.thermometer.background: #FFFFFF
+*Dialog.topShadowColor: #FFFFFF
+*Dialog.bottomShadowColor: #666666
+*Dialog.logo.width: 210
+*Dialog.logo.height: 210
+*Dialog.internalBorderWidth: 30
+*Dialog.borderWidth: 1
+*Dialog.shadowThickness: 2
+
+*passwd.heading.label: XScreenSaver %s
+*passwd.body.label: This display is locked.
+*passwd.user.label: User:
+*passwd.passwd.label: Password:
+*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
+*passwd.thermometer.width: 8
+
+*splash.heading.label: XScreenSaver %s
+*splash.body.label: Copyright © 1991-2004 by
+*splash.body2.label: Jamie Zawinski <jwz@jwz.org>
+*splash.demo.label: Settings
+*splash.help.label: Help
+
+
+! Resources for the Motif dialog boxes of the "xscreensaver-demo" program.
+!
+*fontList: *-helvetica-medium-r-*-*-*-120-*-*-*-iso8859-1
+*demoDialog*label1.fontList: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1
+*cmdText.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1
+*label0.fontList: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
+XScreenSaver*doc.fontList: *-helvetica-medium-r-*-*-*-100-*-*-*-iso8859-1
+! above must be fully qualified to get around *sgiMode.
+
+*foreground: #000000
+*background: #C0C0C0
+*XmTextField.foreground: #000000
+*XmTextField.background: #FFFFFF
+*list.foreground: #000000
+*list.background: #FFFFFF
+
+*ApplicationShell.title: XScreenSaver
+*warning.title: XScreenSaver
+*warning_popup.title: XScreenSaver
+*allowShellResize: True
+*autoUnmanage: False
+
+*menubar*file.labelString: File
+*menubar*file.mnemonic: F
+*file.blank.labelString: Blank Screen Now
+*file.blank.mnemonic: B
+*file.lock.labelString: Lock Screen Now
+*file.lock.mnemonic: L
+*file.kill.labelString: Kill Daemon
+*file.kill.mnemonic: K
+*file.restart.labelString: Restart Daemon
+*file.restart.mnemonic: R
+*file.exit.labelString: Exit
+*file.exit.mnemonic: E
+
+*menubar*edit.labelString: Edit
+*menubar*edit.mnemonic: E
+*edit.cut.labelString: Cut
+*edit.cut.mnemonic: u
+*edit.copy.labelString: Copy
+*edit.copy.mnemonic: C
+*edit.paste.labelString: Paste
+*edit.paste.mnemonic: P
+
+*menubar*help.labelString: Help
+*menubar*help.mnemonic: H
+*help.about.labelString: About...
+*help.about.mnemonic: A
+*help.docMenu.labelString: Documentation...
+*help.docMenu.mnemonic: D
+
+*demoTab.marginWidth: 10
+*optionsTab.marginWidth: 10
+
+*XmScrolledWindow.topOffset: 10
+*XmScrolledWindow.leftOffset: 10
+*demoTab.topOffset: 4
+*form1.bottomOffset: 10
+*form3.leftOffset: 10
+*form3.rightOffset: 10
+*frame.topOffset: 10
+*frame.bottomOffset: 10
+*enabled.topOffset: 10
+*visLabel.topOffset: 10
+*combo.topOffset: 10
+*form4.bottomOffset: 4
+*hr.bottomOffset: 4
+*XmComboBox.marginWidth: 0
+*XmComboBox.marginHeight: 0
+
+*demo.marginWidth: 30
+*demo.marginHeight: 4
+*man.marginWidth: 10
+*man.marginHeight: 4
+*down.leftOffset: 40
+*down.marginWidth: 4
+*down.marginHeight: 4
+*up.marginWidth: 4
+*up.marginHeight: 4
+*frame.traversalOn: False
+
+*list.automaticSelection: True
+*list.visibleItemCount: 20
+*doc.columns: 60
+*combo.columns: 11
+
+*demoTab.labelString: Graphics Demos
+*optionsTab.labelString: Screensaver Options
+*down.labelString: \\/
+*up.labelString: /\\
+*frameLabel.labelString:
+*cmdLabel.labelString: Command Line:
+*cmdLabel.alignment: ALIGNMENT_BEGINNING
+*enabled.labelString: Enabled
+*visLabel.labelString: Visual:
+*visLabel.alignment: ALIGNMENT_END
+*visLabel.leftOffset: 20
+*demo.labelString: Demo
+*man.labelString: Documentation...
+*done.labelString: Quit
+
+*preferencesLabel.labelString: XScreenSaver Parameters
+
+*timeoutLabel.labelString: Saver Timeout
+*cycleLabel.labelString: Cycle Timeout
+*fadeSecondsLabel.labelString: Fade Duration
+*fadeTicksLabel.labelString: Fade Ticks
+*lockLabel.labelString: Lock Timeout
+*passwdLabel.labelString: Password Timeout
+*preferencesForm*XmTextField.columns: 8
+
+*verboseToggle.labelString: Verbose
+*cmapToggle.labelString: Install Colormap
+*fadeToggle.labelString: Fade Colormap
+*unfadeToggle.labelString: Unfade Colormap
+*lockToggle.labelString: Require Password
+
+
+*OK.marginWidth: 30
+*OK.marginHeight: 4
+*OK.leftOffset: 10
+*OK.bottomOffset: 10
+*Cancel.marginWidth: 30
+*Cancel.marginHeight: 4
+*Cancel.rightOffset: 10
+*Cancel.bottomOffset: 10
+
+
+!=============================================================================
+!
+! Pretty names for the hacks that have unusual capitalization.
+!
+!=============================================================================
+
+*hacks.imsmap.name: IMSmap
+*hacks.slidescreen.name: SlideScreen
+*hacks.decayscreen.name: DecayScreen
+*hacks.blitspin.name: BlitSpin
+*hacks.lmorph.name: LMorph
+*hacks.ifs.name: IFS
+*hacks.fadeplot.name: FadePlot
+*hacks.bsod.name: BSOD
+*hacks.rd-bomb.name: RD-Bomb
+*hacks.t3d.name: T3D
+*hacks.shadebobs.name: ShadeBobs
+*hacks.ccurve.name: C Curve
+*hacks.xteevee.name: XTeeVee
+*hacks.xanalogtv.name: XAnalogTV
+*hacks.xspirograph.name: XSpiroGraph
+*hacks.nerverot.name: NerveRot
+*hacks.webcollage.name: WebCollage
+*hacks.vidwhacker.name: VidWhacker
+*hacks.morph3d.name: Morph3D
+*hacks.bubble3d.name: Bubble3D
+*hacks.sierpinski3d.name: Sierpinski3D
+*hacks.gflux.name: GFlux
+*hacks.xrayswarm.name: XRaySwarm
+*hacks.whirlwindwarp.name: WhirlwindWarp
+*hacks.rotzoomer.name: RotZoomer
+*hacks.stonerview.name: StonerView
+*hacks.starwars.name: StarWars
+*hacks.dangerball.name: DangerBall
+*hacks.whirlygig.name: WhirlyGig
+*hacks.speedmine.name: SpeedMine
+*hacks.glforestfire.name: GLForestFire
+*hacks.sballs.name: SBalls
+*hacks.xdaliclock.name: XDaliClock
+*hacks.xplanetbg.name: XPlanet
+*hacks.xplanet.name: XPlanet
+*hacks.xaos.name: XaoS
+*hacks.xfishtank.name: XFishTank
+*hacks.electricsheep.name: ElectricSheep
+*hacks.sphereEversion.name: SphereEversion
+*hacks.fluidballs.name: FluidBalls
+*hacks.flyingtoasters.name: FlyingToasters
+*hacks.bouncingcow.name: BouncingCow
+*hacks.jigglypuff.name: JigglyPuff
+*hacks.hypertorus.name: HyperTorus
+*hacks.cubestorm.name: CubeStorm
+*hacks.blocktube.name: BlockTube
+*hacks.flipflop.name: FlipFlop
+*hacks.antspotlight.name: AntSpotlight
+*hacks.fontglide.name: FontGlide
+*hacks.mirrorblob.name: MirrorBlob
+*hacks.blinkbox.name: BlinkBox
+*hacks.fuzzyflakes.name: FuzzyFlakes
+
+! obsolete, but still used by xscreensaver-demo-Xm.
+*hacks.documentation.isInstalled: True
+
+! (xrdb prevention kludge: whole file) */
diff --git a/recipes/xscreensaver/files/fixes.patch b/recipes/xscreensaver/files/fixes.patch
new file mode 100644
index 0000000000..3d138bc490
--- /dev/null
+++ b/recipes/xscreensaver/files/fixes.patch
@@ -0,0 +1,94 @@
+diff --exclude '*.o' -u xscreensaver-4.16/hacks/bouboule.c xscreensaver-4.16.new/hacks/bouboule.c
+--- xscreensaver-4.16/hacks/bouboule.c 2003-10-18 17:29:50.000000000 -0700
++++ xscreensaver-4.16.new/hacks/bouboule.c 2004-08-06 13:44:21.282983912 -0700
+@@ -105,7 +105,7 @@
+ * erase the whole window than to erase each star
+ */
+
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ #define ADAPT_ERASE 1 /* If 1, then we try ADAPT_CHECKS black XFillArcs,
+ * and after, ADAPT_CHECKS XFillRectangle.
+ * We check which method seems better, knowing that
+diff --exclude '*.o' -u xscreensaver-4.16/hacks/speedmine.c xscreensaver-4.16.new/hacks/speedmine.c
+--- xscreensaver-4.16/hacks/speedmine.c 2003-05-19 21:31:29.000000000 -0700
++++ xscreensaver-4.16.new/hacks/speedmine.c 2004-08-06 13:46:25.056167528 -0700
+@@ -174,7 +174,7 @@
+ /* a forward declaration ... */
+ static void change_colors(void);
+
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ static int total_nframes = 0;
+ static int nframes = 0;
+ static double fps = 0.0;
+@@ -189,7 +189,7 @@
+ static double get_time(void) {
+ struct timeval t;
+ float f;
+-#if GETTIMEOFDAY_TWO_ARGS
++#ifdef GETTIMEOFDAY_TWO_ARGS
+ gettimeofday(&t, NULL);
+ #else
+ gettimeofday(&t);
+@@ -205,7 +205,7 @@
+ * initialises the timing structures
+ */
+ static void init_time(void) {
+-#if GETTIMEOFDAY_TWO_ARGS
++#ifdef GETTIMEOFDAY_TWO_ARGS
+ gettimeofday(&start_time, NULL);
+ #else
+ gettimeofday(&start_time);
+@@ -1194,7 +1194,7 @@
+ render_speedmine (dpy, dbuf);
+ XCopyArea (dpy, dbuf, window, draw_gc, 0, 0, width, height, 0, 0);
+
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ fps_end = get_time();
+ nframes++;
+ total_nframes++;
+diff --exclude '*.o' -u xscreensaver-4.16/hacks/xrayswarm.c xscreensaver-4.16.new/hacks/xrayswarm.c
+--- xscreensaver-4.16/hacks/xrayswarm.c 2003-07-21 01:05:51.000000000 -0700
++++ xscreensaver-4.16.new/hacks/xrayswarm.c 2004-08-06 13:47:01.984553560 -0700
+@@ -980,10 +980,10 @@
+ }
+ }
+
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ static struct timeval startupTime;
+ static void initTime(void) {
+-#if GETTIMEOFDAY_TWO_ARGS
++#ifdef GETTIMEOFDAY_TWO_ARGS
+ gettimeofday(&startupTime, NULL);
+ #else
+ gettimeofday(&startupTime);
+@@ -993,7 +993,7 @@
+ static double getTime(void) {
+ struct timeval t;
+ float f;
+-#if GETTIMEOFDAY_TWO_ARGS
++#ifdef GETTIMEOFDAY_TWO_ARGS
+ gettimeofday(&t, NULL);
+ #else
+ gettimeofday(&t);
+@@ -1033,7 +1033,7 @@
+ }
+
+ nframes = 0;
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ start = getTime();
+ #endif
+
+@@ -1055,7 +1055,7 @@
+ XSync(dpy, False);
+ screenhack_handle_events (dpy);
+ }
+-#if HAVE_GETTIMEOFDAY
++#ifdef HAVE_GETTIMEOFDAY
+ end = getTime();
+ nframes++;
+
diff --git a/recipes/xscreensaver/xscreensaver-4.16/configure.patch b/recipes/xscreensaver/xscreensaver-4.16/configure.patch
new file mode 100644
index 0000000000..fc8e1a9756
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver-4.16/configure.patch
@@ -0,0 +1,1954 @@
+--- xscreensaver-4.16/configure.in 2004-05-11 18:43:13.000000000 -0700
++++ xscreensaver-4.16.new/configure.in 2004-08-06 13:31:20.547673720 -0700
+@@ -24,781 +24,11 @@
+ fi
+ done
+
+-###############################################################################
+-#
+-# Function to figure out how to run the compiler.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_PROG_CC_ANSI,
+- [AC_PROG_CC
+-
+- if test -z "$GCC"; then
+- AC_MSG_CHECKING(how to request ANSI compilation)
+- case "$host" in
+- *-hpux* )
+- AC_MSG_RESULT(HPUX: adding -Ae)
+- CC="$CC -Ae"
+- ;;
+- *-aix* )
+- AC_MSG_RESULT(AIX: adding -qlanglvl=ansi -qhalt=e)
+- CC="$CC -qlanglvl=ansi -qhalt=e"
+- ;;
+-
+- *-dec-* )
+- AC_MSG_RESULT(DEC: adding -std1 -ieee)
+- CC="$CC -std1"
+- ;;
+-
+- *)
+- AC_MSG_RESULT(no idea)
+- ;;
+- esac
+- fi
+-
+- OBJCC="$CC"
+-
+- AC_MSG_CHECKING([whether the compiler works on ANSI C])
+- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
+- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
+-
+- if test -n "$GCC"; then
+- AC_MSG_RESULT(Turning on gcc compiler warnings.)
+- CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs"
+- OBJCC="$OBJCC -Wall"
+- # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
+- # and then perhaps we can do without -pedantic?
+- else
+- case "$host" in
+- *-irix5* |*-irix6.[0-3]* )
+- AC_MSG_RESULT(Turning on SGI compiler warnings.)
+- CC="$CC -fullwarn -use_readonly_const -rdata_shared -g3"
+- ;;
+-# *-dec-osf* )
+-# if test -z "$GCC"; then
+-# AC_MSG_RESULT(Turning on DEC C compiler warnings.)
+-# CC="$CC -migrate -w0 -verbose -warnprotos"
+-# fi
+-# ;;
+- esac
+- fi
+-])
+-
+-
+-###############################################################################
+-#
+-# Functions to figure out how to disable // comments in ANSI C code.
+-#
+-# (With recent gcc, this is done with "-std=c89". With older gcc, this
+-# is done by passing "-lang-c89" to cpp, by passing "-Wp,-lang-c89" to
+-# gcc. Old gcc doesn't support -std, and new gcc doesn't support -lang.
+-# so much for compatibility!)
+-#
+-# UPDATE: apparently there is NO WAY to tell gcc 3.2.2 to require that
+-# declarations preceed statements, without resorting to "-pedantic".
+-# This means that there is no way to get gcc3 to issue warnings that
+-# ensure that your code complies with the ANSI/ISO C89 standard, without
+-# also drowning in totally useless warnings. Thank you master may I
+-# have another.
+-#
+-# So, I give up, let's just use -pedantic.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_GCC_ACCEPTS_STD,
+- [if test -n "$GCC"; then
+- AC_CACHE_CHECK([whether gcc accepts -std],
+- ac_cv_gcc_accepts_std,
+- [if ( ( gcc -E -std=c89 - </dev/null >/dev/null ) 2>&1 | \
+- grep unrecognized >/dev/null ); then
+- ac_cv_gcc_accepts_std=no
+- else
+- ac_cv_gcc_accepts_std=yes
+- fi])
+- ac_gcc_accepts_std="$ac_cv_gcc_accepts_std"
+- fi
+-])
+-
+-AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE,
+- [if test -n "$GCC"; then
+- AC_GCC_ACCEPTS_STD
+- AC_MSG_RESULT(Disabling C++ comments in ANSI C code.)
+- #
+- # The reason that // comments are banned from xscreensaver is that gcc is
+- # basically the only compiler in the world that supports them in C code.
+- # All other vendors support them only in their C++ compilers, not in their
+- # ANSI C compilers. This means that it's a portability problem: every time
+- # these comments have snuck into the xscreensaver source code, I've gotten
+- # complaints about it the next day. So we turn off support for them in gcc
+- # as well to prevent them from accidentially slipping in.
+- #
+- if test "$ac_gcc_accepts_std" = yes ; then
+- #
+- # -std=c89 defines __STRICT_ANSI__, which we don't want.
+- # (That appears to be the only additional preprocessor symbol
+- # it defines, in addition to the syntax changes it makes.)
+- #
+- # -std=gnu89 is no good, because // comments were a GNU extension
+- # before they were in the ANSI C 99 spec... (gcc 2.96 permits //
+- # with -std=gnu89 but not with -std=c89.)
+- #
+- CC="$CC -std=c89 -U__STRICT_ANSI__"
+- else
+- # The old way:
+- CC="$CC -Wp,-lang-c89"
+- fi
+- fi
+-])
+-
+-
+-###############################################################################
+-#
+-# Function to figure out how to turn off Objective C on MacOS X.
+-# (We have to do this to work around an Apple-specific gcc bug.)
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_GCC_ACCEPTS_NO_CPP_PRECOMP,
+- [if test -n "$GCC"; then
+- AC_CACHE_CHECK([whether gcc accepts -no-cpp-precomp],
+- ac_cv_gcc_accepts_no_cpp_precomp,
+- [if ( ( gcc -E -no-cpp-precomp - </dev/null >/dev/null ) 2>&1 | \
+- grep unrecognized >/dev/null ); then
+- ac_cv_gcc_accepts_no_cpp_precomp=no
+- else
+- ac_cv_gcc_accepts_no_cpp_precomp=yes
+- fi])
+- ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
+- fi
+-])
+-
+-AC_DEFUN(AC_NO_OBJECTIVE_C,
+- [if test -n "$GCC"; then
+- AC_GCC_ACCEPTS_NO_CPP_PRECOMP
+- if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then
+- AC_MSG_RESULT(Disabling Objective C extensions in ANSI C code.)
+- CC="$CC -no-cpp-precomp"
+- fi
+- fi
+-])
+-
+-
+-###############################################################################
+-#
+-# Function to figure out how to create directory trees.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_PROG_INSTALL_DIRS,
+- [AC_CACHE_CHECK([whether "\${INSTALL} -d" creates intermediate directories],
+- ac_cv_install_d_creates_dirs,
+- [ac_cv_install_d_creates_dirs=no
+- rm -rf conftestdir
+- if mkdir conftestdir; then
+- cd conftestdir 2>/dev/null
+- ${INSTALL} -d `pwd`/dir1/dir2 >/dev/null 2>&1
+- if test -d dir1/dir2/. ; then
+- ac_cv_install_d_creates_dirs=yes
+- fi
+- cd .. 2>/dev/null
+- rm -rf conftestdir
+- fi
+- ])
+-
+- if test "$ac_cv_install_d_creates_dirs" = no ; then
+- AC_CACHE_CHECK([whether "mkdir -p" creates intermediate directories],
+- ac_cv_mkdir_p_creates_dirs,
+- [ac_cv_mkdir_p_creates_dirs=no
+- rm -rf conftestdir
+- if mkdir conftestdir; then
+- cd conftestdir 2>/dev/null
+- mkdir -p dir1/dir2 >/dev/null 2>&1
+- if test -d dir1/dir2/. ; then
+- ac_cv_mkdir_p_creates_dirs=yes
+- fi
+- cd .. 2>/dev/null
+- rm -rf conftestdir
+- fi
+- ])
+- fi
+-
+- if test "$ac_cv_install_d_creates_dirs" = yes ; then
+- INSTALL_DIRS='${INSTALL} -d'
+- elif test "$ac_cv_mkdir_p_creates_dirs" = yes ; then
+- INSTALL_DIRS='mkdir -p'
+- else
+- # any other ideas?
+- INSTALL_DIRS='${INSTALL} -d'
+- fi
+-])
+-
+-
+-###############################################################################
+-#
+-# Function to check whether gettimeofday() exists, and how to call it.
+-# This may define HAVE_GETTIMEOFDAY and GETTIMEOFDAY_TWO_ARGS.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_GETTIMEOFDAY_ARGS,
+- [AC_MSG_CHECKING(how to call gettimeofday)
+- AC_CACHE_VAL(ac_cv_gettimeofday_args,
+- [AC_TRY_COMPILE([#include <stdlib.h>
+- #include <sys/time.h>],
+- [struct timeval tv; struct timezone tzp;
+- gettimeofday(&tv, &tzp);],
+- [ac_gettimeofday_args=2],
+- [AC_TRY_COMPILE([#include <stdlib.h>
+- #include <sys/time.h>],
+- [struct timeval tv; gettimeofday(&tv);],
+- [ac_gettimeofday_args=1],
+- [ac_gettimeofday_args=0])])
+- ac_cv_gettimeofday_args=$ac_gettimeofday_args])
+- ac_gettimeofday_args=$ac_cv_gettimeofday_args
+- if test "$ac_gettimeofday_args" = 1 ; then
+- AC_DEFINE(HAVE_GETTIMEOFDAY)
+- AC_MSG_RESULT(one argument)
+- elif test "$ac_gettimeofday_args" = 2 ; then
+- AC_DEFINE(HAVE_GETTIMEOFDAY)
+- AC_DEFINE(GETTIMEOFDAY_TWO_ARGS)
+- AC_MSG_RESULT(two arguments)
+- else
+- AC_MSG_RESULT(unknown)
+- fi
+-])
+-
+-
+-###############################################################################
+-#
+-# Function to find perl5 (defines PERL and PERL_VERSION.)
+-#
+-###############################################################################
+-
+-# M4 sucks!! perl sucks too!!
+-changequote(X,Y)
+-perl_version_cmd='print $]'
+-changequote([,])
+-
+-AC_DEFUN(AC_PROG_PERL,
+- [AC_PATH_PROGS(PERL, [perl5 perl],,)
+- if test -z "$PERL" ; then
+- PERL_VERSION=0
+- else
+- AC_CACHE_CHECK([perl version], ac_cv_perl_version,
+- [ac_cv_perl_version=`$PERL -e "$perl_version_cmd"`])
+- PERL_VERSION=$ac_cv_perl_version
+- fi
+- ])
+-
+-
+-###############################################################################
+-#
+-# Function to demand "bc". Losers.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_DEMAND_BC,
+- [ac_bc_result=`echo 6+9 | bc 2>/dev/null`
+- AC_MSG_CHECKING([for bc])
+- if test "$ac_bc_result" = "15" ; then
+- AC_MSG_RESULT(yes)
+- else
+- AC_MSG_RESULT(no)
+- echo ''
+- AC_MSG_ERROR([Your system doesn't have \"bc\", which has been a standard
+- part of Unix since the 1970s. Come back when your vendor
+- has grown a clue.])
+- fi
+- ])
+-
+-###############################################################################
+-#
+-# Functions to check how to do ICMP PING requests.
+-#
+-###############################################################################
+-
+-AC_DEFUN(AC_CHECK_ICMP,
+- [AC_CACHE_CHECK([for struct icmp], ac_cv_have_icmp,
+- [AC_TRY_COMPILE([#include <stdlib.h>
+- #include <stdio.h>
+- #include <math.h>
+- #include <unistd.h>
+- #include <limits.h>
+- #include <signal.h>
+- #include <fcntl.h>
+- #include <sys/types.h>
+- #include <sys/time.h>
+- #include <sys/ipc.h>
+- #include <sys/shm.h>
+- #include <sys/socket.h>
+- #include <netinet/in_systm.h>
+- #include <netinet/in.h>
+- #include <netinet/ip.h>
+- #include <netinet/ip_icmp.h>
+- #include <netinet/udp.h>
+- #include <arpa/inet.h>
+- #include <netdb.h>],
+- [struct icmp i;
+- struct sockaddr s;
+- struct sockaddr_in si;
+- struct ip ip;
+- i.icmp_type = ICMP_ECHO;
+- i.icmp_code = 0;
+- i.icmp_cksum = 0;
+- i.icmp_id = 0;
+- i.icmp_seq = 0;
+- si.sin_family = AF_INET;
+- #if defined(__DECC) || defined(_IP_VHL)
+- ip.ip_vhl = 0;
+- #else
+- ip.ip_hl = 0;
+- #endif
+- ],
+- [ac_cv_have_icmp=yes],
+- [ac_cv_have_icmp=no])])
+- if test "$ac_cv_have_icmp" = yes ; then
+- AC_DEFINE(HAVE_ICMP)
+- fi])
+-
+-AC_DEFUN(AC_CHECK_ICMPHDR,
+- [AC_CACHE_CHECK([for struct icmphdr], ac_cv_have_icmphdr,
+- [AC_TRY_COMPILE([#include <stdlib.h>
+- #include <stdio.h>
+- #include <math.h>
+- #include <unistd.h>
+- #include <limits.h>
+- #include <signal.h>
+- #include <fcntl.h>
+- #include <sys/types.h>
+- #include <sys/time.h>
+- #include <sys/ipc.h>
+- #include <sys/shm.h>
+- #include <sys/socket.h>
+- #include <netinet/in_systm.h>
+- #include <netinet/in.h>
+- #include <netinet/ip.h>
+- #include <netinet/ip_icmp.h>
+- #include <netinet/udp.h>
+- #include <arpa/inet.h>
+- #include <netdb.h>],
+- [struct icmphdr i;
+- struct sockaddr s;
+- struct sockaddr_in si;
+- struct ip ip;
+- i.type = ICMP_ECHO;
+- i.code = 0;
+- i.checksum = 0;
+- i.un.echo.id = 0;
+- i.un.echo.sequence = 0;
+- si.sin_family = AF_INET;
+- ip.ip_hl = 0;],
+- [ac_cv_have_icmphdr=yes],
+- [ac_cv_have_icmphdr=no])])
+- if test "$ac_cv_have_icmphdr" = yes ; then
+- AC_DEFINE(HAVE_ICMPHDR)
+- fi])
+-
+-
+-###############################################################################
+-#
+-# Functions to check for various X11 crap.
+-#
+-###############################################################################
+-
+-# Try and find the app-defaults directory.
+-# It sucks that autoconf doesn't do this already...
+-#
+-AC_DEFUN(AC_PATH_X_APP_DEFAULTS_XMKMF,[
+- rm -fr conftestdir
+- if mkdir conftestdir; then
+- cd conftestdir 2>/dev/null
+- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+- cat > Imakefile <<'EOF'
+-acfindx:
+- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
+-EOF
+- if (xmkmf) >/dev/null 2>&1 && test -f Makefile; then
+- # GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
+- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+- fi
+- cd .. 2>/dev/null
+- rm -fr conftestdir
+- fi])
+-
+-AC_DEFUN(AC_PATH_X_APP_DEFAULTS_DIRECT,[
+- # Look for the directory under a standard set of common directories.
+- # Check X11 before X11Rn because it's often a symlink to the current release.
+- for ac_dir in \
+- /usr/X11/lib/app-defaults \
+- /usr/X11R6/lib/app-defaults \
+- /usr/X11R6/lib/X11/app-defaults \
+- /usr/X11R5/lib/app-defaults \
+- /usr/X11R5/lib/X11/app-defaults \
+- /usr/X11R4/lib/app-defaults \
+- /usr/X11R4/lib/X11/app-defaults \
+- \
+- /usr/lib/X11/app-defaults \
+- /usr/lib/X11R6/app-defaults \
+- /usr/lib/X11R5/app-defaults \
+- /usr/lib/X11R4/app-defaults \
+- \
+- /usr/local/X11/lib/app-defaults \
+- /usr/local/X11R6/lib/app-defaults \
+- /usr/local/X11R5/lib/app-defaults \
+- /usr/local/X11R4/lib/app-defaults \
+- \
+- /usr/local/lib/X11/app-defaults \
+- /usr/local/lib/X11R6/app-defaults \
+- /usr/local/lib/X11R6/X11/app-defaults \
+- /usr/local/lib/X11R5/app-defaults \
+- /usr/local/lib/X11R5/X11/app-defaults \
+- /usr/local/lib/X11R4/app-defaults \
+- /usr/local/lib/X11R4/X11/app-defaults \
+- \
+- /usr/X386/lib/X11/app-defaults \
+- /usr/x386/lib/X11/app-defaults \
+- /usr/XFree86/lib/X11/app-defaults \
+- \
+- /usr/lib/X11/app-defaults \
+- /usr/local/lib/X11/app-defaults \
+- /usr/unsupported/lib/X11/app-defaults \
+- /usr/athena/lib/X11/app-defaults \
+- /usr/local/x11r5/lib/X11/app-defaults \
+- /usr/lpp/Xamples/lib/X11/app-defaults \
+- /lib/usr/lib/X11/app-defaults \
+- \
+- /usr/openwin/lib/app-defaults \
+- /usr/openwin/lib/X11/app-defaults \
+- /usr/openwin/share/lib/app-defaults \
+- /usr/openwin/share/lib/X11/app-defaults \
+- \
+- /X11R6/lib/app-defaults \
+- /X11R5/lib/app-defaults \
+- /X11R4/lib/app-defaults \
+- ; \
+- do
+- if test -d "$ac_dir"; then
+- ac_x_app_defaults=$ac_dir
+- break
+- fi
+- done
+-])
+-
+-AC_DEFUN(AC_PATH_X_APP_DEFAULTS,
+- [AC_REQUIRE_CPP()
+- AC_CACHE_CHECK([for X app-defaults directory], ac_cv_x_app_defaults,
+- [AC_PATH_X_APP_DEFAULTS_XMKMF
+- if test x"$ac_x_app_defaults" = x; then
+- AC_PATH_X_APP_DEFAULTS_DIRECT
+- fi
+- if test x"$ac_x_app_defaults" = x; then
+- ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
+- else
+- # Record where we found app-defaults for the cache.
+- ac_cv_x_app_defaults="$ac_x_app_defaults"
+- fi])
+- eval ac_x_app_defaults="$ac_cv_x_app_defaults"])
+-
+-
+-AC_DEFUN(AC_XPOINTER,
+- [AC_CACHE_CHECK([for XPointer], ac_cv_xpointer,
+- [AC_TRY_X_COMPILE([#include <X11/Xlib.h>],
+- [XPointer foo = (XPointer) 0;],
+- [ac_cv_xpointer=yes],
+- [ac_cv_xpointer=no])])
+- if test "$ac_cv_xpointer" != yes; then
+- AC_DEFINE(XPointer,[char*])
+- fi])
+-
+-
+-# Random special-cases for X on certain pathological OSes.
+-# You know who you are.
+-#
+-AC_DEFUN(AC_X_RANDOM_PATHS,
+- [case "$host" in
+- *-hpux*)
+-
+- # The following arcana was gleaned from conversations with
+- # Eric Schwartz <erics@col.hp.com>:
+- #
+- # On HPUX 10.x, the parts of X that HP considers "standard" live in
+- # /usr/{include,lib}/X11R6/. The parts that HP doesn't consider
+- # "standard", notably, Xaw and Xmu, live in /usr/contrib/X11R6/.
+- # Yet /usr/contrib/X11R6/ comes preinstalled on all HPUX systems.
+- # Also, there are symlinks from /usr/include/ and /usr/lib/ into
+- # /usr/{include,lib}/X11R6/, so that (if you don't use Xmu at all)
+- # you don't need any -I or -L arguments.
+- #
+- # On HPUX 9.x, /usr/{include,lib}/X11R5/ and /usr/contrib/X11R5/
+- # are the same division as 10.x. However, there are no symlinks to
+- # the X stuff from /usr/include/ and /usr/lib/, so -I and -L
+- # arguments are always necessary.
+- #
+- # However, X11R6 was available on HPUX 9.x as a patch: if that
+- # patch was installed, then all of X11R6 went in to
+- # /usr/contrib/X11R6/ (there was no /usr/{include,lib}/X11R6/.)
+- #
+- # HPUX 8.x was the same as 9.x, but was X11R4 instead (I don't know
+- # whether R5 was available as a patch; R6 undoubtedly was not.)
+- #
+- # So. We try and use the highest numbered pair of
+- # /usr/{include,lib}/X11R?/ and /usr/contrib/X11R?/{include,lib}/
+- # that are available. We do not mix and match different versions
+- # of X.
+- #
+- # Question I still don't know the answer to: (do you?)
+- #
+- # * On HPUX 9.x, where /usr/include/X11R5/ was standard, and
+- # /usr/contrib/X11R6/ could be installed as a patch, what was in
+- # that contrib directory? Did it contain so-called "standard"
+- # X11R6, or did it include Xaw and Xmu as well? If the former,
+- # where did one find Xaw and Xmu on 9.x R6 systems? Would this
+- # be a situation where one had to reach into the R5 headers and
+- # libs to find Xmu? That is, must both R6 and R5 directories
+- # be on the -I and -L lists in that case?
+- #
+- for version in X11R6 X11R5 X11R4 ; do
+- # if either pair of directories exists...
+- if test -d /usr/include/$version || test -d /usr/contrib/$version/include
+- then
+- # if contrib exists, use it...
+- if test -d /usr/contrib/$version/include ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/contrib/$version/include"
+- X_LIBS="$X_LIBS -L/usr/contrib/$version/lib"
+- fi
+- # if the "standard" one exists, use it.
+- if test -d /usr/include/$version ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/include/$version"
+- X_LIBS="$X_LIBS -L/usr/lib/$version"
+- fi
+- # since at least one of the pair exists, go no farther.
+- break
+- fi
+- done
+-
+- # Now find Motif. Thanks for not making xmkmf find this by
+- # default, you losers.
+- #
+- if test -d /usr/include/Motif2.1 ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/include/Motif2.1"
+- X_LIBS="$X_LIBS -L/usr/lib/Motif2.1"
+- elif test -d /usr/include/Motif1.2 ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/include/Motif1.2"
+- X_LIBS="$X_LIBS -L/usr/lib/Motif1.2"
+- elif test -d /usr/include/Motif1.1 ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/include/Motif1.1"
+- X_LIBS="$X_LIBS -L/usr/lib/Motif1.1"
+- fi
+-
+- # Now let's check for the pseudo-standard locations for OpenGL and XPM.
+- #
+- if test -d /opt/graphics/OpenGL/include ; then
+- # HP-UX 10.20 puts it here
+- X_CFLAGS="-I/opt/graphics/OpenGL/include $X_CFLAGS"
+- X_LIBS="-L/opt/graphics/OpenGL/lib $X_LIBS"
+- elif test -d /opt/Mesa/lib ; then
+- X_CFLAGS="-I/opt/Mesa/include $X_CFLAGS"
+- X_LIBS="-L/opt/Mesa/lib $X_LIBS"
+- fi
+-
+-
+- if test -d /opt/xpm/lib/X11 ; then
+- X_CFLAGS="-I/opt/xpm/include $X_CFLAGS"
+- X_LIBS="-L/opt/xpm/lib/X11 $X_LIBS"
+- fi
+-
+- # On HPUX, default to installing in /opt/xscreensaver/ instead of
+- # in /usr/local/, unless there is already an xscreensaver in
+- # /usr/local/bin/. This can be overridden with the --prefix arg
+- # to configure. I'm not sure this is the right thing to do, but
+- # Richard Lloyd says so...
+- #
+- if test \! -x /usr/local/bin/xscreensaver ; then
+- ac_default_prefix=/opt/xscreensaver
+- fi
+-
+- ;;
+- *-solaris*)
+-
+- # Thanks for not making xmkmf find this by default, pinheads.
+- # And thanks for moving things around again, too. Is this
+- # really the standard location now? What happened to the
+- # joke that this kind of thing went in /opt?
+- # cthomp says "answer: CDE (Common Disorganized Environment)"
+- #
+- if test -f /usr/dt/include/Xm/Xm.h ; then
+- X_CFLAGS="$X_CFLAGS -I/usr/dt/include"
+- MOTIF_LIBS="$MOTIF_LIBS -L/usr/dt/lib -R/usr/dt/lib"
+-
+- # Some versions of Slowlaris Motif require -lgen. But not all. Why?
+- AC_CHECK_LIB(gen, regcmp, [MOTIF_LIBS="$MOTIF_LIBS -lgen"])
+- fi
+-
+- ;;
+- *-darwin*)
+-
+- # On MacOS X (10.x with "fink"), many things are under /sw/.
+- #
+- if test -d /sw/include ; then
+- X_CFLAGS="-I/sw/include $X_CFLAGS"
+- X_LIBS="-L/sw/lib $X_LIBS"
+- fi
+- ;;
+- esac])
+-
+-
+-
+-###############################################################################
+-#
+-# Some utility functions to make checking for X things easier.
+-#
+-###############################################################################
+-
+-# Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
+-#
+-AC_DEFUN(AC_CHECK_X_HEADER, [
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+- AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+- CPPFLAGS="$ac_save_CPPFLAGS"])
+-
+-# Like AC_EGREP_HEADER, but it uses the already-computed -I directories.
+-#
+-AC_DEFUN(AC_EGREP_X_HEADER, [
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+- AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+- CPPFLAGS="$ac_save_CPPFLAGS"])
+-
+-# Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
+-#
+-AC_DEFUN(AC_TRY_X_COMPILE, [
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+- AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+- CPPFLAGS="$ac_save_CPPFLAGS"])
+-
+-
+-# Like AC_CHECK_LIB, but it uses the already-computed -I and -L directories.
+-# Use this sparingly; it probably doesn't work very well on X programs.
+-#
+-AC_DEFUN(AC_CHECK_X_LIB, [
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- ac_save_LDFLAGS="$LDFLAGS"
+-# ac_save_LIBS="$LIBS"
+-
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+- # note: $X_CFLAGS includes $x_includes
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-
+- if test \! -z "$libdir" ; then
+- LDFLAGS="$LDFLAGS -L$libdir"
+- fi
+- # note: $X_LIBS includes $x_libraries
+- LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
+-
+- AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
+- CPPFLAGS="$ac_save_CPPFLAGS"
+- LDFLAGS="$ac_save_LDFLAGS"
+-# LIBS="$ac_save_LIBS"
+- ])
+-
+-# Like AC_TRY_RUN, but it uses the already-computed -I directories.
+-# (But not the -L directories!)
+-#
+-AC_DEFUN(AC_TRY_X_RUN, [
+- ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+- AC_TRY_RUN([$1], [$2], [$3], [$4])
+- CPPFLAGS="$ac_save_CPPFLAGS"])
+-
+-
+-
+-# Usage: HANDLE_X_PATH_ARG([variable_name],
+-# [--command-line-option],
+-# [descriptive string])
+-#
+-# All of the --with options take three forms:
+-#
+-# --with-foo (or --with-foo=yes)
+-# --without-foo (or --with-foo=no)
+-# --with-foo=/DIR
+-#
+-# This function, HANDLE_X_PATH_ARG, deals with the /DIR case. When it sees
+-# a directory (string beginning with a slash) it checks to see whether
+-# /DIR/include and /DIR/lib exist, and adds them to $X_CFLAGS and $X_LIBS
+-# as appropriate.
+-#
+-AC_DEFUN(HANDLE_X_PATH_ARG, [
+- case "$[$1]" in
+- yes) ;;
+- no) ;;
+-
+- /*)
+- AC_MSG_CHECKING([for [$3] headers])
+- d=$[$1]/include
+- if test -d $d; then
+- X_CFLAGS="-I$d $X_CFLAGS"
+- AC_MSG_RESULT($d)
+- else
+- AC_MSG_RESULT(not found ($d: no such directory))
+- fi
+-
+- AC_MSG_CHECKING([for [$3] libs])
+- d=$[$1]/lib
+- if test -d $d; then
+- X_LIBS="-L$d $X_LIBS"
+- AC_MSG_RESULT($d)
+- else
+- AC_MSG_RESULT(not found ($d: no such directory))
+- fi
+-
+- # replace the directory string with "yes".
+- [$1]_req="yes"
+- [$1]=$[$1]_req
+- ;;
+-
+- *)
+- echo ""
+- echo "error: argument to [$2] must be \"yes\", \"no\", or a directory."
+- echo " If it is a directory, then \`DIR/include' will be added to"
+- echo " the -I list, and \`DIR/lib' will be added to the -L list."
+- exit 1
+- ;;
+- esac
+- ])
+-
+-
+-
+-###############################################################################
+-###############################################################################
+-#
+-# End of function definitions. Now start actually executing stuff.
+-#
+-###############################################################################
+-###############################################################################
+-
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
++AC_PROG_CC
++#AC_PROG_CC_ANSI
++#AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+ AC_NO_OBJECTIVE_C
+ AC_PROG_CPP
+ AC_C_CONST
+@@ -870,8 +100,8 @@
+
+ AC_PROG_INTLTOOL
+ GETTEXT_PACKAGE=xscreensaver
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+-AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE")
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[ This is the name of the gettext package to use. ])
++AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE", [ This is the same as GETTEXT_PACKAGE, but for the glade generated code ])
+ AC_SUBST(GETTEXT_PACKAGE)
+
+ ALL_LINGUAS="ca da de es et fi fr hu it ja ko nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
+@@ -898,7 +128,7 @@
+ XMU_SRCS=''
+ XMU_OBJS=''
+ XMU_LIBS='-lXmu'
+- AC_DEFINE(HAVE_XMU)
++ AC_DEFINE(HAVE_XMU, 1, [ Define this if you have the Xmu library. ])
+ fi
+
+
+@@ -1059,7 +289,7 @@
+ if test "$with_sgi" = yes; then
+ AC_CHECK_X_HEADER(X11/extensions/XScreenSaver.h,
+ [have_sgi=yes
+- AC_DEFINE(HAVE_SGI_SAVER_EXTENSION)],,
++ AC_DEFINE(HAVE_SGI_SAVER_EXTENSION, 1, [ Define this if you have the SGI SCREEN_SAVER extension. ])],,
+ [#include <X11/Xlib.h>])
+
+ elif test "$with_sgi" != no; then
+@@ -1111,7 +341,7 @@
+ fi
+
+ if test "$have_mit" = yes; then
+- AC_DEFINE(HAVE_MIT_SAVER_EXTENSION)
++ AC_DEFINE(HAVE_MIT_SAVER_EXTENSION, 1, [ Define this if you have the MIT-SCREEN-SAVER extension installed. ])
+ fi
+
+ fi
+@@ -1139,7 +369,7 @@
+ if test "$with_xidle" = yes; then
+ AC_CHECK_X_HEADER(X11/extensions/xidle.h,
+ [have_xidle=yes
+- AC_DEFINE(HAVE_XIDLE_EXTENSION)],,
++ AC_DEFINE(HAVE_XIDLE_EXTENSION, 1, [ Define this if you have the XIDLE extension installed.])],,
+ [#include <X11/Xlib.h>])
+ elif test "$with_xidle" != no; then
+ echo "error: must be yes or no: --with-xidle-ext=$with_xidle"
+@@ -1177,7 +407,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_sgivc" = yes; then
+- AC_DEFINE(HAVE_SGI_VC_EXTENSION)
++ AC_DEFINE(HAVE_SGI_VC_EXTENSION, 1, [ Define this if you have the SGI-VIDEO-CONTROL extension. ])
+ fi
+
+ elif test "$with_sgivc" != no; then
+@@ -1225,7 +455,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_dpms" = yes; then
+- AC_DEFINE(HAVE_DPMS_EXTENSION)
++ AC_DEFINE(HAVE_DPMS_EXTENSION, 1, [ Define this if you have the XDPMS extension. ])
+ fi
+
+ elif test "$with_dpms" != no; then
+@@ -1272,7 +502,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_xinerama" = yes; then
+- AC_DEFINE(HAVE_XINERAMA)
++ AC_DEFINE(HAVE_XINERAMA, 1, [ Define this if you have the Xinerama extension.])
+ fi
+
+ elif test "$with_xinerama" != no; then
+@@ -1312,7 +542,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_xf86vmode" = yes; then
+- AC_DEFINE(HAVE_XF86VMODE)
++ AC_DEFINE(HAVE_XF86VMODE, 1, [ Define this if you have the functions XF86VidModeGetModeLine() and XF86VidModeGetViewPort() ])
+ fi
+
+ elif test "$with_xf86vmode" != no; then
+@@ -1365,11 +595,11 @@
+
+ # if those tests succeeded, then we've really got the functions.
+ if test "$have_xf86gamma" = yes; then
+- AC_DEFINE(HAVE_XF86VMODE_GAMMA)
++ AC_DEFINE(HAVE_XF86VMODE_GAMMA, 1, [ Define this if you have the functions XF86VidModeGetGamma() and XF86VidModeSetGamma() ])
+ fi
+
+ if test "$have_xf86gamma_ramp" = yes; then
+- AC_DEFINE(HAVE_XF86VMODE_GAMMA_RAMP)
++ AC_DEFINE(HAVE_XF86VMODE_GAMMA_RAMP, 1, [ Define this if you have the functions XF86VidModeGetGammaRamp() and XF86VidModeSetGammaRamp() ])
+ fi
+
+ # pull in the lib, if we haven't already
+@@ -1431,7 +661,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_randr" = yes; then
+- AC_DEFINE(HAVE_RANDR)
++ AC_DEFINE(HAVE_RANDR, 1, [ Define this if you have the Resize and Rotate extension ])
+ fi
+
+ elif test "$with_randr" != no; then
+@@ -1454,7 +684,7 @@
+ [true], -lXext -lX11)
+ if test "$have_xf86miscsetgrabkeysstate" = yes ; then
+ SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
+- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
++ AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, 1, [ Define this if you have the XF86MiscSetGrabKeysState function ])
+ fi
+ fi
+
+@@ -1467,7 +697,7 @@
+
+ AC_MSG_CHECKING([for XHPDisableReset in X11/XHPlib.h])
+ AC_EGREP_X_HEADER(XHPDisableReset, X11/XHPlib.h,
+- [AC_DEFINE(HAVE_XHPDISABLERESET)
++ [AC_DEFINE(HAVE_XHPDISABLERESET, 1, [ Define this if you have the XHPDisableReset function ])
+ SAVER_LIBS="-lXhp11 $SAVER_LIBS"
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+@@ -1499,7 +729,7 @@
+ have_proc_interrupts=$ac_cv_have_proc_interrupts
+
+ if test "$have_proc_interrupts" = yes; then
+- AC_DEFINE(HAVE_PROC_INTERRUPTS)
++ AC_DEFINE(HAVE_PROC_INTERRUPTS, 1, [ Define this if you have a Linux-like /proc/interrupts file ])
+ fi
+
+ elif test "$with_proc_interrupts" != no; then
+@@ -1523,7 +753,7 @@
+ if test "$enable_locking" = yes; then
+ true
+ elif test "$enable_locking" = no; then
+- AC_DEFINE(NO_LOCKING)
++ AC_DEFINE(NO_LOCKING, 1, [Define this to remove the option of locking the screen at all. ] )
+ else
+ echo "error: must be yes or no: --enable-locking=$enable_locking"
+ exit 1
+@@ -1535,7 +765,7 @@
+ if test "$enable_locking" = yes; then
+ AC_MSG_RESULT(locking disabled: it doesn't work on MacOS X)
+ enable_locking=no
+- AC_DEFINE(NO_LOCKING)
++ AC_DEFINE(NO_LOCKING, 1, [ Define this to remove the option of locking the screen at all. ])
+ fi
+ fi
+
+@@ -1614,7 +844,7 @@
+ [ac_cv_pam=no])])
+ if test "$ac_cv_pam" = yes ; then
+ have_pam=yes
+- AC_DEFINE(HAVE_PAM)
++ AC_DEFINE(HAVE_PAM, 1, [ Define this option if you have PAM ])
+ PASSWD_LIBS="${PASSWD_LIBS} -lpam"
+
+ # libpam typically requires dlopen and dlsym. On FreeBSD,
+@@ -1648,7 +878,7 @@
+ if test "$ac_pam_strerror_args" = 1 ; then
+ AC_MSG_RESULT(one argument)
+ elif test "$ac_pam_strerror_args" = 2 ; then
+- AC_DEFINE(PAM_STRERROR_TWO_ARGS)
++ AC_DEFINE(PAM_STRERROR_TWO_ARGS, 1, [ Define if you have PAM and pam_strerror() requires two arguments. ])
+ AC_MSG_RESULT(two arguments)
+ else
+ AC_MSG_RESULT(unknown)
+@@ -1685,7 +915,7 @@
+
+ if test "$ac_cv_kerberos" = yes ; then
+ have_kerberos=yes
+- AC_DEFINE(HAVE_KERBEROS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [ Define this if you have Kerberos ])
+ fi
+
+ if test "$ac_cv_kerberos5" = yes ; then
+@@ -1705,8 +935,8 @@
+ [have_kerberos=no])
+ if test "$have_kerberos" = yes ; then
+ have_kerberos5=yes
+- AC_DEFINE(HAVE_KERBEROS)
+- AC_DEFINE(HAVE_KERBEROS5)
++ AC_DEFINE(HAVE_KERBEROS, 1, [ Define this if you have Kerberos ])
++ AC_DEFINE(HAVE_KERBEROS5, 1, [ Define this if you have Kerberos 5 ])
+ else
+ have_kerberos5=no
+ AC_MSG_WARN([Cannot find compat lib (libkrb4) needed to use Kerberos 5])
+@@ -1943,13 +1173,13 @@
+
+
+ if test "$have_shadow_adjunct" = yes ; then
+- AC_DEFINE(HAVE_ADJUNCT_PASSWD)
++ AC_DEFINE(HAVE_ADJUNCT_PASSWD, 1, [ Define this if your system is Solaris with ``adjunct'' passwords ])
+ elif test "$have_shadow_enhanced" = yes ; then
+- AC_DEFINE(HAVE_ENHANCED_PASSWD)
++ AC_DEFINE(HAVE_ENHANCED_PASSWD, 1, [ Define this if your system is Digital or SCO Unix with so-called ``Enhanced Security'' ])
+ elif test "$have_shadow_hpux" = yes ; then
+- AC_DEFINE(HAVE_HPUX_PASSWD)
++ AC_DEFINE(HAVE_HPUX_PASSWD, 1, [ Define this if you are running HPUX with so-called ``Secure Passwords'' ])
+ elif test "$have_shadow" = yes ; then
+- AC_DEFINE(HAVE_SHADOW_PASSWD)
++ AC_DEFINE(HAVE_SHADOW_PASSWD 1, [ Define this if your system uses `shadow' passwords ])
+ fi
+
+
+@@ -1983,7 +1213,7 @@
+ case "$with_passwd_helper" in
+ ""|no) : ;;
+ /*)
+- AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper")
++ AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper", [ Define a password helper to use ])
+ have_passwd_helper=yes;;
+ *)
+ echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2
+@@ -2017,7 +1247,7 @@
+ have_motif=no
+ AC_CHECK_X_HEADER(Xm/Xm.h,
+ [have_motif=yes
+- AC_DEFINE(HAVE_MOTIF)
++ AC_DEFINE(HAVE_MOTIF, 1, [ Define this if you have motif ])
+ MOTIF_LIBS="$MOTIF_LIBS -lXm"],,
+ [#include <stdlib.h>
+ #include <stdio.h>
+@@ -2026,7 +1256,7 @@
+
+
+ if test "$have_motif" = yes; then
+- AC_CHECK_X_HEADER(Xm/ComboBox.h, [AC_DEFINE(HAVE_XMCOMBOBOX)],,
++ AC_CHECK_X_HEADER(Xm/ComboBox.h, [AC_DEFINE(HAVE_XMCOMBOBOX, 1, [ Define this if you have Motif ])],,
+ [#include <stdlib.h>
+ #include <stdio.h>
+ #include <X11/Intrinsic.h>])
+@@ -2171,7 +1401,7 @@
+
+ if test "$have_gtk" = yes; then
+ have_gtk2=yes
+- AC_DEFINE(HAVE_GTK2)
++ AC_DEFINE(HAVE_GTK2, 1, [ Define this if you have GTK2 ])
+ else
+ if test -n "$ac_gtk_version_string" ; then
+ gtk2_halfassed="$ac_gtk_version_string"
+@@ -2205,7 +1435,7 @@
+ if test "$have_gnome" = no; then
+ pkgs="$old_pkgs"
+ else
+- AC_DEFINE(HAVE_CRAPPLET)
++ AC_DEFINE(HAVE_CRAPPLET, 1, [ Define this if you have the configuration appliet ])
+ fi
+ fi
+ fi
+@@ -2325,7 +1555,7 @@
+ if test "$have_gnome" = yes -a "$have_gtk" = yes; then
+ ac_gtk_config_cflags=$ac_gnome_config_cflags
+ ac_gtk_config_libs=$ac_gnome_config_libs
+- AC_DEFINE(HAVE_CRAPPLET)
++ AC_DEFINE(HAVE_CRAPPLET, 1, [ Define this if you have the configuration applet ])
+ fi
+
+ fi # end of {gnome,gtk}-config based tests
+@@ -2334,7 +1564,7 @@
+ # check for this function that was not in libcapplet 1.2.
+ # (only needed in Gnome/Gtk 1.x, not Gnome/Gtk 2.x)
+ AC_CHECK_X_LIB(capplet, capplet_widget_changes_are_immediate,
+- [AC_DEFINE(HAVE_CRAPPLET_IMMEDIATE)], [true],
++ [AC_DEFINE(HAVE_CRAPPLET_IMMEDIATE, 1, [ Define this if capplet_widget_changes_are_immediate ])], [true],
+ $ac_gnome_config_libs)
+ fi
+
+@@ -2364,7 +1594,7 @@
+ if test "$have_gtk" = yes; then
+ INCLUDES="$INCLUDES $ac_gtk_config_cflags"
+ GTK_LIBS="$GTK_LIBS $ac_gtk_config_libs"
+- AC_DEFINE(HAVE_GTK)
++ AC_DEFINE(HAVE_GTK, 1, [ Define this if you have GTK ])
+
+ if test "$have_gtk2" = yes; then
+ GTK_EXTRA_OBJS=""
+@@ -2533,7 +1763,7 @@
+ [have_xml=yes
+ xml_halfassed=no
+ XML_LIBS="$ac_xml_config_libs"
+- AC_DEFINE(HAVE_XML)],
++ AC_DEFINE(HAVE_XML,1,[ Define this if you have libxml ])],
+ [true],
+ $ac_xml_config_libs)
+ fi
+@@ -2541,9 +1771,9 @@
+ if test "$have_xml" = yes; then
+ INCLUDES="$INCLUDES $ac_xml_config_cflags"
+ GTK_LIBS="$GTK_LIBS $ac_xml_config_libs"
+- AC_DEFINE(HAVE_XML)
++ AC_DEFINE(HAVE_XML,1,[ Define this if you have libxml ])
+ if test "$have_old_xml" = yes; then
+- AC_DEFINE(HAVE_OLD_XML_HEADERS)
++ AC_DEFINE(HAVE_OLD_XML_HEADERS, 1, [ Define this if you have libxml1 ])
+ fi
+ fi
+
+@@ -2773,9 +2003,9 @@
+ gl_halfassed=yes
+ else
+ # linking works -- we can build the GL hacks.
+- AC_DEFINE(HAVE_GL)
++ AC_DEFINE(HAVE_GL, 1, [ Define this if you have OpenGL ])
+ if test "$ac_have_mesa_gl" = yes ; then
+- AC_DEFINE(HAVE_MESA_GL)
++ AC_DEFINE(HAVE_MESA_GL, 1, [ Define this if you have Mesa GL ])
+ fi
+ fi
+ fi
+@@ -2868,7 +2098,7 @@
+
+ # Check for OpenGL 1.1 features.
+ #
+- AC_CHECK_X_LIB($gl_lib_1, glBindTexture, [AC_DEFINE(HAVE_GLBINDTEXTURE)],
++ AC_CHECK_X_LIB($gl_lib_1, glBindTexture, [AC_DEFINE(HAVE_GLBINDTEXTURE, 1, [ Define this if you have OpenGL 1.1 ])],
+ [true], $GL_LIBS -lX11 -lXext -lm)
+ fi
+
+@@ -2951,9 +2181,9 @@
+ fi
+
+ if test "$have_gle" = yes ; then
+- AC_DEFINE(HAVE_GLE)
++ AC_DEFINE(HAVE_GLE, 1, [ Define this if you have GLE ])
+ if test "$have_gle3" = yes ; then
+- AC_DEFINE(HAVE_GLE3)
++ AC_DEFINE(HAVE_GLE3, 1, [ Define this if you have GLE3 ])
+ fi
+ fi
+
+@@ -2983,7 +2213,7 @@
+ if test "$with_xpm" = yes; then
+ AC_CHECK_X_HEADER(X11/xpm.h,
+ [have_xpm=yes
+- AC_DEFINE(HAVE_XPM)
++ AC_DEFINE(HAVE_XPM, 1, [ Define this if you have XPM ])
+ XPM_LIBS="-lXpm"],,
+ [#include <X11/Xlib.h>])
+ elif test "$with_xpm" != no; then
+@@ -3195,7 +2425,7 @@
+ if test "$have_gdk_pixbuf" = yes; then
+ INCLUDES="$INCLUDES $ac_gdk_pixbuf_config_cflags"
+ XPM_LIBS="$ac_gdk_pixbuf_config_libs"
+- AC_DEFINE(HAVE_GDK_PIXBUF)
++ AC_DEFINE(HAVE_GDK_PIXBUF, 1, [ Define this if you have GDK ])
+ else
+ have_gdk_pixbuf2=no
+ fi
+@@ -3236,7 +2466,7 @@
+ [have_jpeg=yes
+ jpeg_halfassed=no
+ JPEG_LIBS="-ljpeg"
+- AC_DEFINE(HAVE_JPEGLIB)])
++ AC_DEFINE(HAVE_JPEGLIB, 1, [ Define this if you have libjpeg ])])
+ fi
+ fi
+
+@@ -3251,7 +2481,7 @@
+ AC_CHECK_HEADERS(pty.h util.h)
+ AC_CHECK_X_LIB(util, forkpty,
+ [PTY_LIBS="-lutil"
+- AC_DEFINE(HAVE_FORKPTY)])
++ AC_DEFINE(HAVE_FORKPTY, 1, [ Define this if you have forkpty() ])])
+
+
+ ###############################################################################
+@@ -3305,7 +2535,7 @@
+
+ # if that succeeded, then we've really got it.
+ if test "$have_xshm" = yes; then
+- AC_DEFINE(HAVE_XSHM_EXTENSION)
++ AC_DEFINE(HAVE_XSHM_EXTENSION, 1, [ Define this if you have XSHM ])
+ fi
+
+ elif test "$with_xshm" != no; then
+@@ -3333,7 +2563,7 @@
+ AC_CHECK_X_HEADER(X11/extensions/Xdbe.h, [have_xdbe=yes],,
+ [#include <X11/Xlib.h>])
+ if test "$have_xdbe" = yes; then
+- AC_DEFINE(HAVE_DOUBLE_BUFFER_EXTENSION)
++ AC_DEFINE(HAVE_DOUBLE_BUFFER_EXTENSION, 1. [ Define this if you have double buffering ])
+ fi
+
+ elif test "$with_xdbe" != no; then
+@@ -3363,7 +2593,7 @@
+
+ if test "$with_readdisplay" = yes; then
+ AC_CHECK_X_HEADER(X11/extensions/readdisplay.h,
+- AC_DEFINE(HAVE_READ_DISPLAY_EXTENSION),,
++ AC_DEFINE(HAVE_READ_DISPLAY_EXTENSION,1, [ Define this if you have readdisplay.h ]),,
+ [#include <X11/Xlib.h>])
+ elif test "$with_readdisplay" != no; then
+ echo "error: must be yes or no: --with-readdisplay=$with_readdisplay"
+@@ -3462,7 +2692,7 @@
+ unset ac_cv_path_fortune_tmp
+ unset fortune_tmp
+
+-AC_DEFINE_UNQUOTED(FORTUNE_PROGRAM, "$ac_cv_fortune_program")
++AC_DEFINE_UNQUOTED(FORTUNE_PROGRAM, "$ac_cv_fortune_program", [ define your fortune program ])
+
+
+ ###############################################################################
+--- xscreensaver-4.16/m4/macros.m4 1969-12-31 17:00:00.000000000 -0700
++++ xscreensaver-4.16.new/m4/macros.m4 2004-08-06 13:25:10.605913416 -0700
+@@ -0,0 +1,759 @@
++###############################################################################
++#
++# Function to figure out how to run the compiler.
++#
++###############################################################################
++
++AC_DEFUN(AC_PROG_CC_ANSI,
++ [AC_PROG_CC
++
++ if test -z "$GCC"; then
++ AC_MSG_CHECKING(how to request ANSI compilation)
++ case "$host" in
++ *-hpux* )
++ AC_MSG_RESULT(HPUX: adding -Ae)
++ CC="$CC -Ae"
++ ;;
++ *-aix* )
++ AC_MSG_RESULT(AIX: adding -qlanglvl=ansi -qhalt=e)
++ CC="$CC -qlanglvl=ansi -qhalt=e"
++ ;;
++
++ *-dec-* )
++ AC_MSG_RESULT(DEC: adding -std1 -ieee)
++ CC="$CC -std1"
++ ;;
++
++ *)
++ AC_MSG_RESULT(no idea)
++ ;;
++ esac
++ fi
++
++ OBJCC="$CC"
++
++ AC_MSG_CHECKING([whether the compiler works on ANSI C])
++ AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
++ AC_MSG_RESULT(yes),
++ AC_MSG_RESULT(no)
++ AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
++ AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
++
++ if test -n "$GCC"; then
++ AC_MSG_RESULT(Turning on gcc compiler warnings.)
++ CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs"
++ OBJCC="$OBJCC -Wall"
++ # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
++ # and then perhaps we can do without -pedantic?
++ else
++ case "$host" in
++ *-irix5* |*-irix6.[0-3]* )
++ AC_MSG_RESULT(Turning on SGI compiler warnings.)
++ CC="$CC -fullwarn -use_readonly_const -rdata_shared -g3"
++ ;;
++# *-dec-osf* )
++# if test -z "$GCC"; then
++# AC_MSG_RESULT(Turning on DEC C compiler warnings.)
++# CC="$CC -migrate -w0 -verbose -warnprotos"
++# fi
++# ;;
++ esac
++ fi
++])
++
++###############################################################################
++#
++# Functions to figure out how to disable // comments in ANSI C code.
++#
++# (With recent gcc, this is done with "-std=c89". With older gcc, this
++# is done by passing "-lang-c89" to cpp, by passing "-Wp,-lang-c89" to
++# gcc. Old gcc doesn't support -std, and new gcc doesn't support -lang.
++# so much for compatibility!)
++#
++# UPDATE: apparently there is NO WAY to tell gcc 3.2.2 to require that
++# declarations preceed statements, without resorting to "-pedantic".
++# This means that there is no way to get gcc3 to issue warnings that
++# ensure that your code complies with the ANSI/ISO C89 standard, without
++# also drowning in totally useless warnings. Thank you master may I
++# have another.
++#
++# So, I give up, let's just use -pedantic.
++#
++###############################################################################
++
++AC_DEFUN(AC_GCC_ACCEPTS_STD,
++ [if test -n "$GCC"; then
++ AC_CACHE_CHECK([whether gcc accepts -std],
++ ac_cv_gcc_accepts_std,
++ [if ( ( gcc -E -std=c89 - </dev/null >/dev/null ) 2>&1 | \
++ grep unrecognized >/dev/null ); then
++ ac_cv_gcc_accepts_std=no
++ else
++ ac_cv_gcc_accepts_std=yes
++ fi])
++ ac_gcc_accepts_std="$ac_cv_gcc_accepts_std"
++ fi
++])
++
++AC_DEFUN(AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE,
++ [if test -n "$GCC"; then
++ AC_GCC_ACCEPTS_STD
++ AC_MSG_RESULT(Disabling C++ comments in ANSI C code.)
++ #
++ # The reason that // comments are banned from xscreensaver is that gcc is
++ # basically the only compiler in the world that supports them in C code.
++ # All other vendors support them only in their C++ compilers, not in their
++ # ANSI C compilers. This means that it's a portability problem: every time
++ # these comments have snuck into the xscreensaver source code, I've gotten
++ # complaints about it the next day. So we turn off support for them in gcc
++ # as well to prevent them from accidentially slipping in.
++ #
++ if test "$ac_gcc_accepts_std" = yes ; then
++ #
++ # -std=c89 defines __STRICT_ANSI__, which we don't want.
++ # (That appears to be the only additional preprocessor symbol
++ # it defines, in addition to the syntax changes it makes.)
++ #
++ # -std=gnu89 is no good, because // comments were a GNU extension
++ # before they were in the ANSI C 99 spec... (gcc 2.96 permits //
++ # with -std=gnu89 but not with -std=c89.)
++ #
++ CC="$CC -std=c89 -U__STRICT_ANSI__"
++ else
++ # The old way:
++ CC="$CC -Wp,-lang-c89"
++ fi
++ fi
++])
++
++
++###############################################################################
++#
++# Function to figure out how to turn off Objective C on MacOS X.
++# (We have to do this to work around an Apple-specific gcc bug.)
++#
++###############################################################################
++
++AC_DEFUN(AC_GCC_ACCEPTS_NO_CPP_PRECOMP,
++ [if test -n "$GCC"; then
++ AC_CACHE_CHECK([whether gcc accepts -no-cpp-precomp],
++ ac_cv_gcc_accepts_no_cpp_precomp,
++ [if ( ( gcc -E -no-cpp-precomp - </dev/null >/dev/null ) 2>&1 | \
++ grep unrecognized >/dev/null ); then
++ ac_cv_gcc_accepts_no_cpp_precomp=no
++ else
++ ac_cv_gcc_accepts_no_cpp_precomp=yes
++ fi])
++ ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
++ fi
++])
++
++AC_DEFUN(AC_NO_OBJECTIVE_C,
++ [if test -n "$GCC"; then
++ AC_GCC_ACCEPTS_NO_CPP_PRECOMP
++ if test "$ac_gcc_accepts_no_cpp_precomp" = yes ; then
++ AC_MSG_RESULT(Disabling Objective C extensions in ANSI C code.)
++ CC="$CC -no-cpp-precomp"
++ fi
++ fi
++])
++
++
++###############################################################################
++#
++# Function to figure out how to create directory trees.
++#
++###############################################################################
++
++AC_DEFUN(AC_PROG_INSTALL_DIRS,
++ [AC_CACHE_CHECK([whether "\${INSTALL} -d" creates intermediate directories],
++ ac_cv_install_d_creates_dirs,
++ [ac_cv_install_d_creates_dirs=no
++ rm -rf conftestdir
++ if mkdir conftestdir; then
++ cd conftestdir 2>/dev/null
++ ${INSTALL} -d `pwd`/dir1/dir2 >/dev/null 2>&1
++ if test -d dir1/dir2/. ; then
++ ac_cv_install_d_creates_dirs=yes
++ fi
++ cd .. 2>/dev/null
++ rm -rf conftestdir
++ fi
++ ])
++
++ if test "$ac_cv_install_d_creates_dirs" = no ; then
++ AC_CACHE_CHECK([whether "mkdir -p" creates intermediate directories],
++ ac_cv_mkdir_p_creates_dirs,
++ [ac_cv_mkdir_p_creates_dirs=no
++ rm -rf conftestdir
++ if mkdir conftestdir; then
++ cd conftestdir 2>/dev/null
++ mkdir -p dir1/dir2 >/dev/null 2>&1
++ if test -d dir1/dir2/. ; then
++ ac_cv_mkdir_p_creates_dirs=yes
++ fi
++ cd .. 2>/dev/null
++ rm -rf conftestdir
++ fi
++ ])
++ fi
++
++ if test "$ac_cv_install_d_creates_dirs" = yes ; then
++ INSTALL_DIRS='${INSTALL} -d'
++ elif test "$ac_cv_mkdir_p_creates_dirs" = yes ; then
++ INSTALL_DIRS='mkdir -p'
++ else
++ # any other ideas?
++ INSTALL_DIRS='${INSTALL} -d'
++ fi
++])
++
++
++###############################################################################
++#
++# Function to check whether gettimeofday() exists, and how to call it.
++# This may define HAVE_GETTIMEOFDAY and GETTIMEOFDAY_TWO_ARGS.
++#
++###############################################################################
++
++AC_DEFUN(AC_GETTIMEOFDAY_ARGS,
++ [AC_MSG_CHECKING(how to call gettimeofday)
++ AC_CACHE_VAL(ac_cv_gettimeofday_args,
++ [AC_TRY_COMPILE([#include <stdlib.h>
++ #include <sys/time.h>],
++ [struct timeval tv; struct timezone tzp;
++ gettimeofday(&tv, &tzp);],
++ [ac_gettimeofday_args=2],
++ [AC_TRY_COMPILE([#include <stdlib.h>
++ #include <sys/time.h>],
++ [struct timeval tv; gettimeofday(&tv);],
++ [ac_gettimeofday_args=1],
++ [ac_gettimeofday_args=0])])
++ ac_cv_gettimeofday_args=$ac_gettimeofday_args])
++ ac_gettimeofday_args=$ac_cv_gettimeofday_args
++ if test "$ac_gettimeofday_args" = 1 ; then
++ AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [ Define if you have the gettimeofday function.])
++ AC_MSG_RESULT(one argument)
++ elif test "$ac_gettimeofday_args" = 2 ; then
++ AC_DEFINE(HAVE_GETTIMEOFDAY, 1[ Define if you have the gettimeofday function ])
++ AC_DEFINE(GETTIMEOFDAY_TWO_ARGS, 1, [ Define if gettimeofday requires two arguments.])
++ AC_MSG_RESULT(two arguments)
++ else
++ AC_MSG_RESULT(unknown)
++ fi
++])
++
++
++###############################################################################
++#
++# Function to find perl5 (defines PERL and PERL_VERSION.)
++#
++###############################################################################
++
++# M4 sucks!! perl sucks too!!
++changequote(X,Y)
++perl_version_cmd='print $]'
++changequote([,])
++
++AC_DEFUN(AC_PROG_PERL,
++ [AC_PATH_PROGS(PERL, [perl5 perl],,)
++ if test -z "$PERL" ; then
++ PERL_VERSION=0
++ else
++ AC_CACHE_CHECK([perl version], ac_cv_perl_version,
++ [ac_cv_perl_version=`$PERL -e "$perl_version_cmd"`])
++ PERL_VERSION=$ac_cv_perl_version
++ fi
++ ])
++
++
++###############################################################################
++#
++# Function to demand "bc". Losers.
++#
++###############################################################################
++
++AC_DEFUN(AC_DEMAND_BC,
++ [ac_bc_result=`echo 6+9 | bc 2>/dev/null`
++ AC_MSG_CHECKING([for bc])
++ if test "$ac_bc_result" = "15" ; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ echo ''
++ AC_MSG_ERROR([Your system doesn't have \"bc\", which has been a standard
++ part of Unix since the 1970s. Come back when your vendor
++ has grown a clue.])
++ fi
++ ])
++
++###############################################################################
++#
++# Functions to check how to do ICMP PING requests.
++#
++###############################################################################
++
++AC_DEFUN(AC_CHECK_ICMP,
++ [AC_CACHE_CHECK([for struct icmp], ac_cv_have_icmp,
++ [AC_TRY_COMPILE([#include <stdlib.h>
++ #include <stdio.h>
++ #include <math.h>
++ #include <unistd.h>
++ #include <limits.h>
++ #include <signal.h>
++ #include <fcntl.h>
++ #include <sys/types.h>
++ #include <sys/time.h>
++ #include <sys/ipc.h>
++ #include <sys/shm.h>
++ #include <sys/socket.h>
++ #include <netinet/in_systm.h>
++ #include <netinet/in.h>
++ #include <netinet/ip.h>
++ #include <netinet/ip_icmp.h>
++ #include <netinet/udp.h>
++ #include <arpa/inet.h>
++ #include <netdb.h>],
++ [struct icmp i;
++ struct sockaddr s;
++ struct sockaddr_in si;
++ struct ip ip;
++ i.icmp_type = ICMP_ECHO;
++ i.icmp_code = 0;
++ i.icmp_cksum = 0;
++ i.icmp_id = 0;
++ i.icmp_seq = 0;
++ si.sin_family = AF_INET;
++ #if defined(__DECC) || defined(_IP_VHL)
++ ip.ip_vhl = 0;
++ #else
++ ip.ip_hl = 0;
++ #endif
++ ],
++ [ac_cv_have_icmp=yes],
++ [ac_cv_have_icmp=no])])
++ if test "$ac_cv_have_icmp" = yes ; then
++ AC_DEFINE(HAVE_ICMP, 1 [ Define this if you do pings with a `struct icmp' and a `icmp_id' slot. ])
++ fi])
++
++AC_DEFUN(AC_CHECK_ICMPHDR,
++ [AC_CACHE_CHECK([for struct icmphdr], ac_cv_have_icmphdr,
++ [AC_TRY_COMPILE([#include <stdlib.h>
++ #include <stdio.h>
++ #include <math.h>
++ #include <unistd.h>
++ #include <limits.h>
++ #include <signal.h>
++ #include <fcntl.h>
++ #include <sys/types.h>
++ #include <sys/time.h>
++ #include <sys/ipc.h>
++ #include <sys/shm.h>
++ #include <sys/socket.h>
++ #include <netinet/in_systm.h>
++ #include <netinet/in.h>
++ #include <netinet/ip.h>
++ #include <netinet/ip_icmp.h>
++ #include <netinet/udp.h>
++ #include <arpa/inet.h>
++ #include <netdb.h>],
++ [struct icmphdr i;
++ struct sockaddr s;
++ struct sockaddr_in si;
++ struct ip ip;
++ i.type = ICMP_ECHO;
++ i.code = 0;
++ i.checksum = 0;
++ i.un.echo.id = 0;
++ i.un.echo.sequence = 0;
++ si.sin_family = AF_INET;
++ ip.ip_hl = 0;],
++ [ac_cv_have_icmphdr=yes],
++ [ac_cv_have_icmphdr=no])])
++ if test "$ac_cv_have_icmphdr" = yes ; then
++ AC_DEFINE(HAVE_ICMPHDR, 1, [ Define this if you do pings with a `struct icmphdr' and a `un.echo.id' slot. ])
++ fi])
++
++
++###############################################################################
++#
++# Functions to check for various X11 crap.
++#
++###############################################################################
++
++# Try and find the app-defaults directory.
++# It sucks that autoconf doesn't do this already...
++#
++AC_DEFUN(AC_PATH_X_APP_DEFAULTS_XMKMF,[
++ rm -fr conftestdir
++ if mkdir conftestdir; then
++ cd conftestdir 2>/dev/null
++ # Make sure to not put "make" in the Imakefile rules, since we grep it out.
++ cat > Imakefile <<'EOF'
++acfindx:
++ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"'
++EOF
++ if (xmkmf) >/dev/null 2>&1 && test -f Makefile; then
++ # GNU make sometimes prints "make[1]: Entering...", which'd confuse us.
++ eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++ fi
++ cd .. 2>/dev/null
++ rm -fr conftestdir
++ fi])
++
++AC_DEFUN(AC_PATH_X_APP_DEFAULTS_DIRECT,[
++ # Look for the directory under a standard set of common directories.
++ # Check X11 before X11Rn because it's often a symlink to the current release.
++ for ac_dir in \
++ /usr/X11/lib/app-defaults \
++ /usr/X11R6/lib/app-defaults \
++ /usr/X11R6/lib/X11/app-defaults \
++ /usr/X11R5/lib/app-defaults \
++ /usr/X11R5/lib/X11/app-defaults \
++ /usr/X11R4/lib/app-defaults \
++ /usr/X11R4/lib/X11/app-defaults \
++ \
++ /usr/lib/X11/app-defaults \
++ /usr/lib/X11R6/app-defaults \
++ /usr/lib/X11R5/app-defaults \
++ /usr/lib/X11R4/app-defaults \
++ \
++ /usr/local/X11/lib/app-defaults \
++ /usr/local/X11R6/lib/app-defaults \
++ /usr/local/X11R5/lib/app-defaults \
++ /usr/local/X11R4/lib/app-defaults \
++ \
++ /usr/local/lib/X11/app-defaults \
++ /usr/local/lib/X11R6/app-defaults \
++ /usr/local/lib/X11R6/X11/app-defaults \
++ /usr/local/lib/X11R5/app-defaults \
++ /usr/local/lib/X11R5/X11/app-defaults \
++ /usr/local/lib/X11R4/app-defaults \
++ /usr/local/lib/X11R4/X11/app-defaults \
++ \
++ /usr/X386/lib/X11/app-defaults \
++ /usr/x386/lib/X11/app-defaults \
++ /usr/XFree86/lib/X11/app-defaults \
++ \
++ /usr/lib/X11/app-defaults \
++ /usr/local/lib/X11/app-defaults \
++ /usr/unsupported/lib/X11/app-defaults \
++ /usr/athena/lib/X11/app-defaults \
++ /usr/local/x11r5/lib/X11/app-defaults \
++ /usr/lpp/Xamples/lib/X11/app-defaults \
++ /lib/usr/lib/X11/app-defaults \
++ \
++ /usr/openwin/lib/app-defaults \
++ /usr/openwin/lib/X11/app-defaults \
++ /usr/openwin/share/lib/app-defaults \
++ /usr/openwin/share/lib/X11/app-defaults \
++ \
++ /X11R6/lib/app-defaults \
++ /X11R5/lib/app-defaults \
++ /X11R4/lib/app-defaults \
++ ; \
++ do
++ if test -d "$ac_dir"; then
++ ac_x_app_defaults=$ac_dir
++ break
++ fi
++ done
++])
++
++AC_DEFUN(AC_PATH_X_APP_DEFAULTS,
++ [AC_REQUIRE_CPP()
++ AC_CACHE_CHECK([for X app-defaults directory], ac_cv_x_app_defaults,
++ [AC_PATH_X_APP_DEFAULTS_XMKMF
++ if test x"$ac_x_app_defaults" = x; then
++ AC_PATH_X_APP_DEFAULTS_DIRECT
++ fi
++ if test x"$ac_x_app_defaults" = x; then
++ ac_cv_x_app_defaults="/usr/lib/X11/app-defaults"
++ else
++ # Record where we found app-defaults for the cache.
++ ac_cv_x_app_defaults="$ac_x_app_defaults"
++ fi])
++ eval ac_x_app_defaults="$ac_cv_x_app_defaults"])
++
++
++AC_DEFUN(AC_XPOINTER,
++ [AC_CACHE_CHECK([for XPointer], ac_cv_xpointer,
++ [AC_TRY_X_COMPILE([#include <X11/Xlib.h>],
++ [XPointer foo = (XPointer) 0;],
++ [ac_cv_xpointer=yes],
++ [ac_cv_xpointer=no])])
++ if test "$ac_cv_xpointer" != yes; then
++ AC_DEFINE(XPointer,[char*], [ Define this to char* if you're using X11R4 or earlier. ])
++ fi])
++
++
++# Random special-cases for X on certain pathological OSes.
++# You know who you are.
++#
++AC_DEFUN(AC_X_RANDOM_PATHS,
++ [case "$host" in
++ *-hpux*)
++
++ # The following arcana was gleaned from conversations with
++ # Eric Schwartz <erics@col.hp.com>:
++ #
++ # On HPUX 10.x, the parts of X that HP considers "standard" live in
++ # /usr/{include,lib}/X11R6/. The parts that HP doesn't consider
++ # "standard", notably, Xaw and Xmu, live in /usr/contrib/X11R6/.
++ # Yet /usr/contrib/X11R6/ comes preinstalled on all HPUX systems.
++ # Also, there are symlinks from /usr/include/ and /usr/lib/ into
++ # /usr/{include,lib}/X11R6/, so that (if you don't use Xmu at all)
++ # you don't need any -I or -L arguments.
++ #
++ # On HPUX 9.x, /usr/{include,lib}/X11R5/ and /usr/contrib/X11R5/
++ # are the same division as 10.x. However, there are no symlinks to
++ # the X stuff from /usr/include/ and /usr/lib/, so -I and -L
++ # arguments are always necessary.
++ #
++ # However, X11R6 was available on HPUX 9.x as a patch: if that
++ # patch was installed, then all of X11R6 went in to
++ # /usr/contrib/X11R6/ (there was no /usr/{include,lib}/X11R6/.)
++ #
++ # HPUX 8.x was the same as 9.x, but was X11R4 instead (I don't know
++ # whether R5 was available as a patch; R6 undoubtedly was not.)
++ #
++ # So. We try and use the highest numbered pair of
++ # /usr/{include,lib}/X11R?/ and /usr/contrib/X11R?/{include,lib}/
++ # that are available. We do not mix and match different versions
++ # of X.
++ #
++ # Question I still don't know the answer to: (do you?)
++ #
++ # * On HPUX 9.x, where /usr/include/X11R5/ was standard, and
++ # /usr/contrib/X11R6/ could be installed as a patch, what was in
++ # that contrib directory? Did it contain so-called "standard"
++ # X11R6, or did it include Xaw and Xmu as well? If the former,
++ # where did one find Xaw and Xmu on 9.x R6 systems? Would this
++ # be a situation where one had to reach into the R5 headers and
++ # libs to find Xmu? That is, must both R6 and R5 directories
++ # be on the -I and -L lists in that case?
++ #
++ for version in X11R6 X11R5 X11R4 ; do
++ # if either pair of directories exists...
++ if test -d /usr/include/$version || test -d /usr/contrib/$version/include
++ then
++ # if contrib exists, use it...
++ if test -d /usr/contrib/$version/include ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/contrib/$version/include"
++ X_LIBS="$X_LIBS -L/usr/contrib/$version/lib"
++ fi
++ # if the "standard" one exists, use it.
++ if test -d /usr/include/$version ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/include/$version"
++ X_LIBS="$X_LIBS -L/usr/lib/$version"
++ fi
++ # since at least one of the pair exists, go no farther.
++ break
++ fi
++ done
++
++ # Now find Motif. Thanks for not making xmkmf find this by
++ # default, you losers.
++ #
++ if test -d /usr/include/Motif2.1 ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/include/Motif2.1"
++ X_LIBS="$X_LIBS -L/usr/lib/Motif2.1"
++ elif test -d /usr/include/Motif1.2 ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/include/Motif1.2"
++ X_LIBS="$X_LIBS -L/usr/lib/Motif1.2"
++ elif test -d /usr/include/Motif1.1 ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/include/Motif1.1"
++ X_LIBS="$X_LIBS -L/usr/lib/Motif1.1"
++ fi
++
++ # Now let's check for the pseudo-standard locations for OpenGL and XPM.
++ #
++ if test -d /opt/graphics/OpenGL/include ; then
++ # HP-UX 10.20 puts it here
++ X_CFLAGS="-I/opt/graphics/OpenGL/include $X_CFLAGS"
++ X_LIBS="-L/opt/graphics/OpenGL/lib $X_LIBS"
++ elif test -d /opt/Mesa/lib ; then
++ X_CFLAGS="-I/opt/Mesa/include $X_CFLAGS"
++ X_LIBS="-L/opt/Mesa/lib $X_LIBS"
++ fi
++
++
++ if test -d /opt/xpm/lib/X11 ; then
++ X_CFLAGS="-I/opt/xpm/include $X_CFLAGS"
++ X_LIBS="-L/opt/xpm/lib/X11 $X_LIBS"
++ fi
++
++ # On HPUX, default to installing in /opt/xscreensaver/ instead of
++ # in /usr/local/, unless there is already an xscreensaver in
++ # /usr/local/bin/. This can be overridden with the --prefix arg
++ # to configure. I'm not sure this is the right thing to do, but
++ # Richard Lloyd says so...
++ #
++ if test \! -x /usr/local/bin/xscreensaver ; then
++ ac_default_prefix=/opt/xscreensaver
++ fi
++
++ ;;
++ *-solaris*)
++
++ # Thanks for not making xmkmf find this by default, pinheads.
++ # And thanks for moving things around again, too. Is this
++ # really the standard location now? What happened to the
++ # joke that this kind of thing went in /opt?
++ # cthomp says "answer: CDE (Common Disorganized Environment)"
++ #
++ if test -f /usr/dt/include/Xm/Xm.h ; then
++ X_CFLAGS="$X_CFLAGS -I/usr/dt/include"
++ MOTIF_LIBS="$MOTIF_LIBS -L/usr/dt/lib -R/usr/dt/lib"
++
++ # Some versions of Slowlaris Motif require -lgen. But not all. Why?
++ AC_CHECK_LIB(gen, regcmp, [MOTIF_LIBS="$MOTIF_LIBS -lgen"])
++ fi
++
++ ;;
++ *-darwin*)
++
++ # On MacOS X (10.x with "fink"), many things are under /sw/.
++ #
++ if test -d /sw/include ; then
++ X_CFLAGS="-I/sw/include $X_CFLAGS"
++ X_LIBS="-L/sw/lib $X_LIBS"
++ fi
++ ;;
++ esac])
++
++
++
++###############################################################################
++#
++# Some utility functions to make checking for X things easier.
++#
++###############################################################################
++
++# Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
++#
++AC_DEFUN(AC_CHECK_X_HEADER, [
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ if test \! -z "$includedir" ; then
++ CPPFLAGS="$CPPFLAGS -I$includedir"
++ fi
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
++ CPPFLAGS="$ac_save_CPPFLAGS"])
++
++# Like AC_EGREP_HEADER, but it uses the already-computed -I directories.
++#
++AC_DEFUN(AC_EGREP_X_HEADER, [
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ if test \! -z "$includedir" ; then
++ CPPFLAGS="$CPPFLAGS -I$includedir"
++ fi
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
++ CPPFLAGS="$ac_save_CPPFLAGS"])
++
++# Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
++#
++AC_DEFUN(AC_TRY_X_COMPILE, [
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ if test \! -z "$includedir" ; then
++ CPPFLAGS="$CPPFLAGS -I$includedir"
++ fi
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
++ CPPFLAGS="$ac_save_CPPFLAGS"])
++
++
++# Like AC_CHECK_LIB, but it uses the already-computed -I and -L directories.
++# Use this sparingly; it probably doesn't work very well on X programs.
++#
++AC_DEFUN(AC_CHECK_X_LIB, [
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ ac_save_LDFLAGS="$LDFLAGS"
++# ac_save_LIBS="$LIBS"
++
++ if test \! -z "$includedir" ; then
++ CPPFLAGS="$CPPFLAGS -I$includedir"
++ fi
++ # note: $X_CFLAGS includes $x_includes
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++
++ if test \! -z "$libdir" ; then
++ LDFLAGS="$LDFLAGS -L$libdir"
++ fi
++ # note: $X_LIBS includes $x_libraries
++ LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
++
++ AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ LDFLAGS="$ac_save_LDFLAGS"
++# LIBS="$ac_save_LIBS"
++ ])
++
++# Like AC_TRY_RUN, but it uses the already-computed -I directories.
++# (But not the -L directories!)
++#
++AC_DEFUN(AC_TRY_X_RUN, [
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ if test \! -z "$includedir" ; then
++ CPPFLAGS="$CPPFLAGS -I$includedir"
++ fi
++ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++ AC_TRY_RUN([$1], [$2], [$3], [$4])
++ CPPFLAGS="$ac_save_CPPFLAGS"])
++
++
++
++# Usage: HANDLE_X_PATH_ARG([variable_name],
++# [--command-line-option],
++# [descriptive string])
++#
++# All of the --with options take three forms:
++#
++# --with-foo (or --with-foo=yes)
++# --without-foo (or --with-foo=no)
++# --with-foo=/DIR
++#
++# This function, HANDLE_X_PATH_ARG, deals with the /DIR case. When it sees
++# a directory (string beginning with a slash) it checks to see whether
++# /DIR/include and /DIR/lib exist, and adds them to $X_CFLAGS and $X_LIBS
++# as appropriate.
++#
++AC_DEFUN(HANDLE_X_PATH_ARG, [
++ case "$[$1]" in
++ yes) ;;
++ no) ;;
++
++ /*)
++ AC_MSG_CHECKING([for [$3] headers])
++ d=$[$1]/include
++ if test -d $d; then
++ X_CFLAGS="-I$d $X_CFLAGS"
++ AC_MSG_RESULT($d)
++ else
++ AC_MSG_RESULT(not found ($d: no such directory))
++ fi
++
++ AC_MSG_CHECKING([for [$3] libs])
++ d=$[$1]/lib
++ if test -d $d; then
++ X_LIBS="-L$d $X_LIBS"
++ AC_MSG_RESULT($d)
++ else
++ AC_MSG_RESULT(not found ($d: no such directory))
++ fi
++
++ # replace the directory string with "yes".
++ [$1]_req="yes"
++ [$1]=$[$1]_req
++ ;;
++
++ *)
++ echo ""
++ echo "error: argument to [$2] must be \"yes\", \"no\", or a directory."
++ echo " If it is a directory, then \`DIR/include' will be added to"
++ echo " the -I list, and \`DIR/lib' will be added to the -L list."
++ exit 1
++ ;;
++ esac
++ ])
diff --git a/recipes/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch b/recipes/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
new file mode 100644
index 0000000000..723d8bd956
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
@@ -0,0 +1,72 @@
+--- xscreensaver-4.22/configure.in.orig 2007-12-23 18:33:43.000000000 +0000
++++ xscreensaver-4.22/configure.in 2007-12-23 18:35:33.000000000 +0000
+@@ -944,9 +944,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -955,9 +952,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -966,9 +960,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -982,9 +973,6 @@
+ ac_save_LDFLAGS="$LDFLAGS"
+ # ac_save_LIBS="$LIBS"
+
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ # note: $X_CFLAGS includes $x_includes
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+@@ -1005,9 +993,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ AC_TRY_RUN([$1], [$2], [$3], [$4])
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -2763,9 +2748,6 @@
+ EOF
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+ mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3395,9 +3377,6 @@
+ DEPEND_DEFINES=
+
+
+-if test \! -z "$includedir" ; then
+- INCLUDES="$INCLUDES -I$includedir"
+-fi
+
+ if test \! -z "$libdir" ; then
+ LDFLAGS="$LDFLAGS -L$libdir"
diff --git a/recipes/xscreensaver/xscreensaver-4.22/configure.in.patch b/recipes/xscreensaver/xscreensaver-4.22/configure.in.patch
new file mode 100644
index 0000000000..1538315e3b
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver-4.22/configure.in.patch
@@ -0,0 +1,15 @@
+--- xscreensaver-4.22~/configure.in 2005-08-26 10:00:58.000000000 -0700
++++ xscreensaver-4.22/configure.in 2005-08-26 10:01:27.000000000 -0700
+@@ -1080,9 +1080,9 @@
+
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+-AC_NO_OBJECTIVE_C
++#AC_PROG_CC_ANSI
++#AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
++#AC_NO_OBJECTIVE_C
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/recipes/xscreensaver/xscreensaver-5.07/configure.in.patch b/recipes/xscreensaver/xscreensaver-5.07/configure.in.patch
new file mode 100644
index 0000000000..384b134037
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver-5.07/configure.in.patch
@@ -0,0 +1,91 @@
+--- /tmp/configure.in 2008-08-21 12:56:59.000000000 +0200
++++ xscreensaver-5.07/configure.in 2008-08-21 13:06:16.293198000 +0200
+@@ -952,9 +952,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+@@ -964,9 +961,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+@@ -976,9 +970,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+@@ -993,9 +984,6 @@
+ ac_save_LDFLAGS="$LDFLAGS"
+ # ac_save_LIBS="$LIBS"
+
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ # note: $X_CFLAGS includes $x_includes
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+@@ -1018,9 +1006,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_RUN([$1], [$2], [$3], [$4])
+@@ -1099,11 +1084,8 @@
+
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+ AC_NO_LONG_STRING_WARNINGS
+ AC_NO_MISPLACED_DECLARATIONS
+-AC_NO_OBJECTIVE_C
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+@@ -2831,9 +2813,6 @@
+ EOF
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+ mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3515,16 +3494,6 @@
+ DEPEND_FLAGS=
+ DEPEND_DEFINES=
+
+-
+-if test \! -z "$includedir" ; then
+- INCLUDES="$INCLUDES -I$includedir"
+-fi
+-
+-if test \! -z "$libdir" ; then
+- LDFLAGS="$LDFLAGS -L$libdir"
+-fi
+-
+-
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
+ if test "$have_motif" = yes; then
diff --git a/recipes/xscreensaver/xscreensaver-5.07/glfix.patch b/recipes/xscreensaver/xscreensaver-5.07/glfix.patch
new file mode 100644
index 0000000000..a91aa488ee
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver-5.07/glfix.patch
@@ -0,0 +1,20 @@
+--- /tmp/Makefile.in 2008-12-07 14:52:59.000000000 +0100
++++ xscreensaver-5.07/hacks/glx/Makefile.in 2008-12-07 14:53:25.000000000 +0100
+@@ -409,7 +409,7 @@
+
+ $(UTIL_OBJS):
+ cd $(UTILS_BIN) ; \
+- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++ $(MAKE) $(@F) CC="$(CXX)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+ $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
+ cd $(HACK_BIN) ; $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
+@@ -426,7 +426,7 @@
+ HELPER_OBJS = xscreensaver-gl-helper.o $(UTILS_BIN)/visual-gl.o \
+ $(UTILS_BIN)/visual.o $(UTILS_BIN)/resources.o
+ xscreensaver-gl-helper: $(HELPER_OBJS)
+- $(CC) $(LDFLAGS) -o $@ $(HELPER_OBJS) $(LIBS) $(X_LIBS) $(HACK_POST2)
++ $(CXX) $(LDFLAGS) -o $@ $(HELPER_OBJS) $(LIBS) $(X_LIBS) $(HACK_POST2)
+
+
+ # These hacks use a slightly-differently-compiled variant of xlockmore.c.
diff --git a/recipes/xscreensaver/xscreensaver.inc b/recipes/xscreensaver/xscreensaver.inc
new file mode 100644
index 0000000000..a4925ac108
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver.inc
@@ -0,0 +1,87 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "*The* screensaver package for X11"
+HOMEPAGE = "http://www.jwz.org/xscreensaver/"
+SECTION = "x11-misc"
+LICENSE = "BSD"
+DEPENDS = "intltool mesa freeglut virtual/libx11 gtk+ libxml2 libglade"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
+EXTRA_OECONF=" --with-xml \
+ --with-gtk \
+ --disable-locking \
+ --without-pixbuf \
+ --with-jpeg \
+ --with-xpm \
+ --with-randr-ext \
+ --with-gl \
+ --without-gle \
+ --with-xshm-ext \
+ --with-setuid-hacks \
+"
+
+PACKAGES =+ " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command ${datadir}/applications \
+ ${libdir}/X11/"
+
+FILES_${PN}-dbg += "${libexecdir}/xscreensaver/.debug"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+ ${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_configure_prepend() {
+ sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+
+ export includedir="/lib"
+ sed -i -e s:AC_PROG_CC:AC_PROG_CXX:g configure.in
+ echo AC_PROG_CXX >> configure.in
+ export CC="${CXX}"
+}
+
+do_compile() {
+ oe_runmake CC="${CC}" LD="${CXX}" CC_HACK="${CXX}" GNOME_DATADIR=${datadir} all
+}
+
+fakeroot do_install() {
+ unset KDEDIR
+ oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+ install_prefix=${D} install
+
+ oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+ # Install the defaults file
+ install -d ${D}/${libdir}/X11/app-defaults
+ install -m 0644 ${WORKDIR}/XScreenSaver ${D}/${libdir}/X11/app-defaults
+}
+
+PACKAGES_DYNAMIC = "xscreensaver-hack-*"
+
+python populate_packages_prepend () {
+ hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+ do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+ metapkg = "xscreensaver-hacks"
+ bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+ bb.data.setVar('FILES_' + metapkg, "", d)
+ blacklist = [ 'xscreensaver-locale', 'xscreensaver-dev', 'xscreensaver-dbg', 'xscreensaver-doc', 'xscreensaver-extra' ]
+ metapkg_rdepends = []
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
+ for pkg in packages[1:]:
+ if not pkg in blacklist and not pkg in metapkg_rdepends:
+ metapkg_rdepends.append(pkg)
+ bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+ bb.data.setVar('DESCRIPTION_' + metapkg, 'Xscreensaver hacks meta package', d)
+ packages.append(metapkg)
+ bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
+
diff --git a/recipes/xscreensaver/xscreensaver_4.16.bb b/recipes/xscreensaver/xscreensaver_4.16.bb
new file mode 100644
index 0000000000..7696c4733c
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver_4.16.bb
@@ -0,0 +1,61 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "*The* screensaver package for X11"
+HOMEPAGE = "http://www.jwz.org/xscreensaver/"
+SECTION = "x11-misc"
+LICENSE = "BSD"
+DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
+PR = "r1"
+
+BROKEN = "1"
+# upstream is at 4.22 now - patches do not apply
+
+SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+ file://fixes.patch;patch=1 \
+ file://configure.patch;patch=1 \
+ file://XScreenSaver"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+ --with-jpeg --with-xpm"
+
+PACKAGES =+ " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+ /usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+ ${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_compile() {
+ oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+ unset KDEDIR
+ oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+ install_prefix=${D} install
+
+ oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+ # Install the defaults file
+ install -d ${D}/usr/X11R6/lib/X11/app-defaults
+ install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+}
+
+PACKAGES_DYNAMIC = "xscreensaver-hack-*"
+
+python populate_packages_prepend () {
+ hackdir = bb.data.expand('${libdir}/xscreensaver', d)
+ do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}
diff --git a/recipes/xscreensaver/xscreensaver_4.22.bb b/recipes/xscreensaver/xscreensaver_4.22.bb
new file mode 100644
index 0000000000..cac3776724
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver_4.22.bb
@@ -0,0 +1,66 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "*The* screensaver package for X11"
+HOMEPAGE = "http://www.jwz.org/xscreensaver/"
+SECTION = "x11-misc"
+LICENSE = "BSD"
+DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
+
+PR = "r1"
+
+SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+ file://fixes.patch;patch=1 \
+ file://configure.in.patch;patch=1 \
+ file://configure.in-includedir.patch;patch=1 \
+ file://XScreenSaver"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+ --with-jpeg --with-xpm"
+
+PACKAGES =+ " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+ /usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+ ${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_configure_prepend() {
+ sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+
+ export includedir="/lib"
+}
+
+do_compile() {
+ oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+ unset KDEDIR
+ oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+ install_prefix=${D} install
+
+ oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+ # Install the defaults file
+ install -d ${D}/usr/X11R6/lib/X11/app-defaults
+ install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+}
+
+PACKAGES_DYNAMIC = "xscreensaver-hack-*"
+
+python populate_packages_prepend () {
+ hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+ do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}
diff --git a/recipes/xscreensaver/xscreensaver_5.07.bb b/recipes/xscreensaver/xscreensaver_5.07.bb
new file mode 100644
index 0000000000..8932b6fd3c
--- /dev/null
+++ b/recipes/xscreensaver/xscreensaver_5.07.bb
@@ -0,0 +1,9 @@
+require xscreensaver.inc
+PR = "r2"
+
+SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+ file://configure.in.patch;patch=1 \
+ file://glfix.patch;patch=1 \
+ file://XScreenSaver"
+
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-27 18:45:12 +0000