From badef32037f52f79abc1f1440b786cd71afdf270 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 6 Sep 2024 14:42:37 +0200 Subject: 6.09 --- .gitignore | 6 +- INSTALL | 15 +- Makefile.in | 77 +- README | 123 +- README.hacking | 7 +- aclocal.m4 | 3667 +- config.h.in | 133 +- config.rpath | 684 + configure | 19918 +- configure.ac | 683 +- driver/.gdbinit | 27 - driver/Makefile.in | 263 +- driver/XScreenSaver.ad.in | 514 +- driver/XScreenSaver_Xm_ad.h | 108 + driver/XScreenSaver_ad.h | 551 + driver/atoms.c | 9 +- driver/atoms.h | 5 +- driver/atomswm.c | 20 +- driver/auth.h | 4 +- driver/blurb.c | 27 +- driver/clientmsg.c | 108 +- driver/compile_axp.com | 15 - driver/compile_decc.com | 15 - driver/demo-Gtk-conf.c | 524 +- driver/demo-Gtk-conf.h | 54 +- driver/demo-Gtk.c | 6228 +- driver/demo-Xm.c | 19 +- driver/demo.ui | 2630 + driver/dialog.c | 385 +- driver/dpms.c | 117 +- driver/exts.c | 15 +- driver/fade.c | 108 +- driver/fade.h | 8 + driver/gresource.xml | 7 + driver/link_axp.com | 15 - driver/link_decc.com | 15 - driver/lock.c | 2276 - driver/mlstring.c | 229 - driver/mlstring.h | 57 - driver/passwd-helper.c | 158 - driver/passwd-pam.c | 18 +- driver/passwd-pwent.c | 7 +- driver/pdf2jpeg.m | 152 - driver/pdf2jpeg.man | 43 - driver/prefs.ui | 518 + driver/prefsw.c | 276 +- driver/remote.c | 9 +- driver/screens.c | 249 +- driver/screensaver-properties.desktop.in | 8 - driver/stderr.c | 560 - driver/subprocs.c | 105 +- driver/test-grab.c | 11 +- driver/test-randr.c | 112 +- driver/test-screens.c | 2 +- driver/test-xinput.c | 708 +- driver/types.h | 12 +- driver/vms_axp.opt | 5 - driver/vms_axp_12.opt | 5 - driver/vms_decc.opt | 5 - driver/vms_decc_12.opt | 5 - driver/windows.c | 77 +- driver/xinput.c | 186 +- driver/xinput.h | 2 +- driver/xscreensaver-auth.c | 92 +- driver/xscreensaver-auth.man | 4 +- driver/xscreensaver-command.c | 47 +- driver/xscreensaver-command.man | 47 +- driver/xscreensaver-demo.glade2.in | 3136 - driver/xscreensaver-demo.glade2p | 19 - driver/xscreensaver-demo.man | 402 - driver/xscreensaver-getimage-desktop | 174 - driver/xscreensaver-getimage-desktop.man | 55 - driver/xscreensaver-getimage-file | 1317 - driver/xscreensaver-getimage-file.man | 66 - driver/xscreensaver-getimage-video | 144 - driver/xscreensaver-getimage-video.man | 51 - driver/xscreensaver-getimage.man | 73 - driver/xscreensaver-gfx.c | 47 +- driver/xscreensaver-gfx.man | 5 +- driver/xscreensaver-settings.desktop.in | 9 + driver/xscreensaver-settings.man | 145 +- driver/xscreensaver-systemd.c | 1406 +- driver/xscreensaver-systemd.man | 69 +- driver/xscreensaver-text | 899 - driver/xscreensaver-text.man | 85 - driver/xscreensaver.c | 214 +- driver/xscreensaver.desktop.in | 9 + driver/xscreensaver.man | 605 +- driver/xscreensaver.service.in | 18 + driver/xscreensaver.ui | 2994 - hacks/.gdbinit | 12 - hacks/Makefile.in | 3465 - hacks/README | 9 - hacks/abstractile.c | 1614 - hacks/abstractile.man | 52 - hacks/analogtv-cli.c | 1126 - hacks/analogtv.c | 2453 - hacks/analogtv.h | 346 - hacks/anemone.c | 451 - hacks/anemone.man | 74 - hacks/anemotaxis.c | 758 - hacks/anemotaxis.man | 78 - hacks/ant.c | 1350 - hacks/ant.man | 96 - hacks/apollonian.c | 819 - hacks/apollonian.man | 70 - hacks/apple2-main.c | 1911 - hacks/apple2.c | 885 - hacks/apple2.h | 121 - hacks/apple2.man | 197 - hacks/asm6502.c | 2274 - hacks/asm6502.h | 181 - hacks/attraction.c | 1114 - hacks/attraction.man | 204 - hacks/automata.h | 64 - hacks/barcode.c | 2029 - hacks/barcode.man | 61 - hacks/binaryring.c | 589 - hacks/binaryring.man | 88 - hacks/blaster.c | 1193 - hacks/blaster.man | 65 - hacks/blitspin.c | 466 - hacks/blitspin.man | 96 - hacks/bouboule.c | 858 - hacks/bouboule.man | 80 - hacks/boxfit.c | 567 - hacks/boxfit.man | 102 - hacks/braid.c | 443 - hacks/braid.man | 69 - hacks/bsod.c | 7005 - hacks/bsod.man | 136 - hacks/bubbles-default.c | 154 - hacks/bubbles.c | 1467 - hacks/bubbles.h | 199 - hacks/bubbles.man | 127 - hacks/bumps.c | 706 - hacks/bumps.man | 80 - hacks/ccurve.c | 871 - hacks/ccurve.man | 60 - hacks/celtic.c | 1140 - hacks/celtic.man | 64 - hacks/check-configs.pl | 1262 - hacks/cloudlife.c | 439 - hacks/cloudlife.man | 87 - hacks/compass.c | 997 - hacks/compass.man | 57 - hacks/compile_axp.com | 158 - hacks/compile_decc.com | 158 - hacks/config/README | 265 - hacks/config/abstractile.xml | 36 - hacks/config/anemone.xml | 61 - hacks/config/anemotaxis.xml | 39 - hacks/config/ant.xml | 74 - hacks/config/antinspect.xml | 25 - hacks/config/antmaze.xml | 23 - hacks/config/antspotlight.xml | 25 - hacks/config/apollonian.xml | 42 - hacks/config/apple2.xml | 65 - hacks/config/atlantis.xml | 50 - hacks/config/attraction.xml | 87 - hacks/config/atunnel.xml | 26 - hacks/config/barcode.xml | 35 - hacks/config/beats.xml | 42 - hacks/config/binaryring.xml | 31 - hacks/config/blaster.xml | 63 - hacks/config/blinkbox.xml | 35 - hacks/config/blitspin.xml | 46 - hacks/config/blocktube.xml | 33 - hacks/config/boing.xml | 51 - hacks/config/bouboule.xml | 33 - hacks/config/bouncingcow.xml | 36 - hacks/config/boxed.xml | 58 - hacks/config/boxfit.xml | 65 - hacks/config/braid.xml | 39 - hacks/config/bsod.xml | 114 - hacks/config/bubble3d.xml | 30 - hacks/config/bubbles.xml | 42 - hacks/config/bumps.xml | 36 - hacks/config/cage.xml | 27 - hacks/config/carousel.xml | 57 - hacks/config/ccurve.xml | 32 - hacks/config/celtic.xml | 32 - hacks/config/circuit.xml | 37 - hacks/config/cityflow.xml | 55 - hacks/config/cloudlife.xml | 41 - hacks/config/co____9.xml | 38 - hacks/config/companioncube.xml | 56 - hacks/config/compass.xml | 24 - hacks/config/coral.xml | 36 - hacks/config/covid19.xml | 38 - hacks/config/crackberg.xml | 52 - hacks/config/critical.xml | 31 - hacks/config/crumbler.xml | 49 - hacks/config/crystal.xml | 48 - hacks/config/cube21.xml | 77 - hacks/config/cubenetic.xml | 67 - hacks/config/cubestack.xml | 44 - hacks/config/cubestorm.xml | 53 - hacks/config/cubetwist.xml | 46 - hacks/config/cubicgrid.xml | 37 - hacks/config/cwaves.xml | 31 - hacks/config/cynosure.xml | 32 - hacks/config/dangerball.xml | 37 - hacks/config/decayscreen.xml | 48 - hacks/config/deco.xml | 45 - hacks/config/deepstars.xml | 31 - hacks/config/deluxe.xml | 39 - hacks/config/demon.xml | 41 - hacks/config/discoball.xml | 37 - hacks/config/discrete.xml | 32 - hacks/config/distort.xml | 53 - hacks/config/dnalogo.xml | 38 - hacks/config/drift.xml | 31 - hacks/config/dymaxionmap.xml | 79 - hacks/config/endgame.xml | 29 - hacks/config/energystream.xml | 26 - hacks/config/engine.xml | 44 - hacks/config/epicycle.xml | 68 - hacks/config/eruption.xml | 53 - hacks/config/esper.xml | 46 - hacks/config/etruscanvenus.xml | 143 - hacks/config/euler2d.xml | 53 - hacks/config/extrusion.xml | 44 - hacks/config/fadeplot.xml | 35 - hacks/config/fiberlamp.xml | 31 - hacks/config/filmleader.xml | 42 - hacks/config/fireworkx.xml | 30 - hacks/config/flag.xml | 41 - hacks/config/flame.xml | 39 - hacks/config/flipflop.xml | 52 - hacks/config/flipscreen3d.xml | 27 - hacks/config/fliptext.xml | 55 - hacks/config/flow.xml | 60 - hacks/config/fluidballs.xml | 55 - hacks/config/flurry.xml | 29 - hacks/config/flyingtoasters.xml | 43 - hacks/config/fontglide.xml | 54 - hacks/config/forest.xml | 30 - hacks/config/fuzzyflakes.xml | 66 - hacks/config/galaxy.xml | 36 - hacks/config/gears.xml | 39 - hacks/config/geodesic.xml | 61 - hacks/config/geodesicgears.xml | 41 - hacks/config/gflux.xml | 61 - hacks/config/gibson.xml | 65 - hacks/config/glblur.xml | 46 - hacks/config/glcells.xml | 64 - hacks/config/gleidescope.xml | 41 - hacks/config/glforestfire.xml | 46 - hacks/config/glhanoi.xml | 54 - hacks/config/glitchpeg.xml | 38 - hacks/config/glknots.xml | 63 - hacks/config/glmatrix.xml | 53 - hacks/config/glplanet.xml | 52 - hacks/config/glschool.xml | 45 - hacks/config/glslideshow.xml | 55 - hacks/config/glsnake.xml | 56 - hacks/config/gltext.xml | 51 - hacks/config/goop.xml | 65 - hacks/config/grav.xml | 36 - hacks/config/gravitywell.xml | 44 - hacks/config/greynetic.xml | 25 - hacks/config/halftone.xml | 61 - hacks/config/halo.xml | 42 - hacks/config/handsy.xml | 58 - hacks/config/headroom.xml | 48 - hacks/config/helix.xml | 27 - hacks/config/hexadrop.xml | 60 - hacks/config/hexstrut.xml | 48 - hacks/config/hilbert.xml | 77 - hacks/config/hopalong.xml | 64 - hacks/config/hydrostat.xml | 76 - hacks/config/hyperball.xml | 66 - hacks/config/hypercube.xml | 77 - hacks/config/hypertorus.xml | 120 - hacks/config/hypnowheel.xml | 54 - hacks/config/ifs.xml | 65 - hacks/config/imsmap.xml | 46 - hacks/config/interaggregate.xml | 33 - hacks/config/interference.xml | 57 - hacks/config/intermomentary.xml | 37 - hacks/config/jigglypuff.xml | 95 - hacks/config/jigsaw.xml | 51 - hacks/config/juggle.xml | 60 - hacks/config/juggler3d.xml | 55 - hacks/config/julia.xml | 39 - hacks/config/kaleidescope.xml | 42 - hacks/config/kaleidocycle.xml | 57 - hacks/config/klein.xml | 135 - hacks/config/kumppa.xml | 32 - hacks/config/lament.xml | 29 - hacks/config/laser.xml | 38 - hacks/config/lavalite.xml | 90 - hacks/config/lcdscrub.xml | 58 - hacks/config/lightning.xml | 30 - hacks/config/lisa.xml | 50 - hacks/config/lissie.xml | 52 - hacks/config/lmorph.xml | 51 - hacks/config/lockward.xml | 67 - hacks/config/loop.xml | 37 - hacks/config/m6502.xml | 55 - hacks/config/maze.xml | 71 - hacks/config/maze3d.xml | 122 - hacks/config/memscroller.xml | 35 - hacks/config/menger.xml | 51 - hacks/config/metaballs.xml | 53 - hacks/config/mirrorblob.xml | 75 - hacks/config/mismunch.xml | 44 - hacks/config/moebius.xml | 29 - hacks/config/moebiusgears.xml | 47 - hacks/config/moire.xml | 38 - hacks/config/moire2.xml | 34 - hacks/config/molecule.xml | 60 - hacks/config/morph3d.xml | 34 - hacks/config/mountain.xml | 31 - hacks/config/munch.xml | 63 - hacks/config/nerverot.xml | 62 - hacks/config/noof.xml | 23 - hacks/config/noseguy.xml | 19 - hacks/config/pacman.xml | 28 - hacks/config/pedal.xml | 33 - hacks/config/peepers.xml | 47 - hacks/config/penetrate.xml | 34 - hacks/config/penrose.xml | 55 - hacks/config/petri.xml | 83 - hacks/config/phosphor.xml | 49 - hacks/config/photopile.xml | 65 - hacks/config/piecewise.xml | 45 - hacks/config/pinion.xml | 49 - hacks/config/pipes.xml | 49 - hacks/config/polyhedra.xml | 201 - hacks/config/polyominoes.xml | 36 - hacks/config/polytopes.xml | 112 - hacks/config/pong.xml | 46 - hacks/config/popsquares.xml | 56 - hacks/config/projectiveplane.xml | 157 - hacks/config/providence.xml | 29 - hacks/config/pulsar.xml | 42 - hacks/config/pyro.xml | 37 - hacks/config/qix.xml | 74 - hacks/config/quasicrystal.xml | 56 - hacks/config/queens.xml | 31 - hacks/config/raverhoop.xml | 54 - hacks/config/razzledazzle.xml | 66 - hacks/config/rd-bomb.xml | 67 - hacks/config/rdbomb.xml | 1 - hacks/config/ripples.xml | 54 - hacks/config/rocks.xml | 45 - hacks/config/romanboy.xml | 132 - hacks/config/rorschach.xml | 36 - hacks/config/rotor.xml | 40 - hacks/config/rotzoomer.xml | 43 - hacks/config/rubik.xml | 39 - hacks/config/rubikblocks.xml | 67 - hacks/config/sballs.xml | 37 - hacks/config/scooter.xml | 42 - hacks/config/shadebobs.xml | 38 - hacks/config/sierpinski.xml | 37 - hacks/config/sierpinski3d.xml | 34 - hacks/config/skytentacles.xml | 71 - hacks/config/slidescreen.xml | 54 - hacks/config/slip.xml | 43 - hacks/config/sonar.xml | 85 - hacks/config/speedmine.xml | 62 - hacks/config/sphere.xml | 30 - hacks/config/sphereeversion.xml | 98 - hacks/config/spheremonics.xml | 60 - hacks/config/spiral.xml | 38 - hacks/config/splitflap.xml | 72 - hacks/config/splodesic.xml | 32 - hacks/config/spotlight.xml | 34 - hacks/config/sproingies.xml | 36 - hacks/config/squiral.xml | 51 - hacks/config/stairs.xml | 25 - hacks/config/starfish.xml | 43 - hacks/config/starwars.xml | 63 - hacks/config/stonerview.xml | 27 - hacks/config/strange.xml | 58 - hacks/config/substrate.xml | 47 - hacks/config/superquadrics.xml | 36 - hacks/config/surfaces.xml | 75 - hacks/config/swirl.xml | 33 - hacks/config/t3d.xml | 60 - hacks/config/tangram.xml | 45 - hacks/config/tessellimage.xml | 66 - hacks/config/testx11.xml | 17 - hacks/config/thornbird.xml | 37 - hacks/config/timetunnel.xml | 42 - hacks/config/topblock.xml | 64 - hacks/config/triangle.xml | 28 - hacks/config/tronbit.xml | 41 - hacks/config/truchet.xml | 41 - hacks/config/twang.xml | 61 - hacks/config/unicrud.xml | 44 - hacks/config/unknownpleasures.xml | 68 - hacks/config/vermiculate.xml | 22 - hacks/config/vfeedback.xml | 39 - hacks/config/vidwhacker.xml | 32 - hacks/config/vigilance.xml | 30 - hacks/config/vines.xml | 30 - hacks/config/voronoi.xml | 63 - hacks/config/wander.xml | 55 - hacks/config/webcollage.xml | 56 - hacks/config/whirlwindwarp.xml | 28 - hacks/config/whirlygig.xml | 90 - hacks/config/winduprobot.xml | 62 - hacks/config/worm.xml | 39 - hacks/config/wormhole.xml | 31 - hacks/config/xanalogtv.xml | 48 - hacks/config/xflame.xml | 34 - hacks/config/xjack.xml | 25 - hacks/config/xlyap.xml | 52 - hacks/config/xmatrix.xml | 68 - hacks/config/xrayswarm.xml | 23 - hacks/config/xspirograph.xml | 32 - hacks/config/xss.dtd | 109 - hacks/config/xss.xsd | 375 - hacks/config/zoom.xml | 54 - hacks/coral.c | 318 - hacks/coral.man | 64 - hacks/critical.c | 461 - hacks/critical.man | 94 - hacks/crystal.c | 1285 - hacks/crystal.man | 81 - hacks/cwaves.c | 218 - hacks/cwaves.man | 76 - hacks/cynosure.c | 448 - hacks/cynosure.man | 64 - hacks/decayscreen.c | 399 - hacks/decayscreen.man | 92 - hacks/deco.c | 341 - hacks/deco.man | 105 - hacks/delaunay.c | 303 - hacks/delaunay.h | 48 - hacks/deluxe.c | 478 - hacks/deluxe.man | 72 - hacks/demon.c | 952 - hacks/demon.man | 69 - hacks/discrete.c | 440 - hacks/discrete.man | 61 - hacks/distort.c | 897 - hacks/distort.man | 137 - hacks/drift.c | 673 - hacks/drift.man | 79 - hacks/epicycle.c | 798 - hacks/epicycle.man | 167 - hacks/eruption.c | 607 - hacks/eruption.man | 77 - hacks/euler2d.c | 887 - hacks/euler2d.man | 69 - hacks/euler2d.tex | 337 - hacks/fadeplot.c | 233 - hacks/fadeplot.man | 65 - hacks/fiberlamp.c | 474 - hacks/fiberlamp.man | 65 - hacks/filmleader.c | 561 - hacks/filmleader.man | 69 - hacks/fireworkx.c | 879 - hacks/fireworkx.man | 88 - hacks/flag.c | 573 - hacks/flag.man | 92 - hacks/flame.c | 468 - hacks/flame.man | 74 - hacks/flow.c | 1211 - hacks/flow.man | 137 - hacks/fluidballs.c | 877 - hacks/fluidballs.man | 90 - hacks/fontglide.c | 2582 - hacks/fontglide.man | 124 - hacks/fonts/Makefile.in | 96 - hacks/fonts/OCRAStd.otf | Bin 30636 -> 0 bytes hacks/fonts/SpecialElite.ttf | Bin 166224 -> 0 bytes hacks/fonts/clacon.ttf | Bin 103892 -> 0 bytes hacks/fonts/gallant12x22.ttf | Bin 25644 -> 0 bytes hacks/fonts/luximr.ttf | Bin 71784 -> 0 bytes hacks/forest.c | 240 - hacks/forest.man | 62 - hacks/fps.c | 300 - hacks/fps.h | 31 - hacks/fpsI.h | 40 - hacks/fuzzyflakes.c | 654 - hacks/fuzzyflakes.man | 112 - hacks/galaxy.c | 451 - hacks/galaxy.man | 87 - hacks/glitchpeg.c | 465 - hacks/glitchpeg.man | 79 - hacks/glx/Makefile.in | 4757 - hacks/glx/README | 9 - hacks/glx/antinspect.c | 695 - hacks/glx/antinspect.man | 56 - hacks/glx/antmaze.c | 1611 - hacks/glx/antmaze.man | 52 - hacks/glx/ants.h | 45 - hacks/glx/antspotlight.c | 796 - hacks/glx/antspotlight.man | 56 - hacks/glx/atlantis.c | 578 - hacks/glx/atlantis.h | 118 - hacks/glx/atlantis.man | 78 - hacks/glx/atunnel.c | 314 - hacks/glx/atunnel.man | 70 - hacks/glx/b_draw.c | 239 - hacks/glx/b_lockglue.c | 238 - hacks/glx/b_sphere.c | 219 - hacks/glx/beats.c | 439 - hacks/glx/beats.man | 75 - hacks/glx/blinkbox.c | 614 - hacks/glx/blinkbox.man | 73 - hacks/glx/blocktube.c | 453 - hacks/glx/blocktube.man | 73 - hacks/glx/boing.c | 665 - hacks/glx/boing.man | 105 - hacks/glx/bouncingcow.c | 648 - hacks/glx/bouncingcow.man | 78 - hacks/glx/boxed.c | 1360 - hacks/glx/boxed.h | 4116 - hacks/glx/boxed.man | 56 - hacks/glx/bubble3d.c | 281 - hacks/glx/bubble3d.h | 88 - hacks/glx/bubble3d.man | 62 - hacks/glx/buildlwo.c | 98 - hacks/glx/buildlwo.h | 24 - hacks/glx/cage.c | 497 - hacks/glx/cage.man | 61 - hacks/glx/carousel.c | 958 - hacks/glx/carousel.man | 109 - hacks/glx/chessgames.h | 343 - hacks/glx/chessmodels.c | 1720 - hacks/glx/chessmodels.h | 44 - hacks/glx/circuit.c | 2105 - hacks/glx/circuit.man | 72 - hacks/glx/cityflow.c | 560 - hacks/glx/cityflow.man | 77 - hacks/glx/companion.c | 604 - hacks/glx/companion_disc.c | 9593 - hacks/glx/companion_heart.c | 653 - hacks/glx/companion_quad.c | 389 - hacks/glx/companioncube.man | 85 - hacks/glx/covid19.c | 656 - hacks/glx/covid19.man | 72 - hacks/glx/cow_face.c | 341 - hacks/glx/cow_hide.c | 13055 -- hacks/glx/cow_hoofs.c | 1037 - hacks/glx/cow_horns.c | 1025 - hacks/glx/cow_tail.c | 464 - hacks/glx/cow_udder.c | 1520 - hacks/glx/crackberg.c | 1483 - hacks/glx/crackberg.man | 123 - hacks/glx/crumbler.c | 922 - hacks/glx/crumbler.man | 77 - hacks/glx/cube21.c | 942 - hacks/glx/cube21.man | 147 - hacks/glx/cubenetic.c | 615 - hacks/glx/cubenetic.man | 89 - hacks/glx/cubestack.c | 470 - hacks/glx/cubestack.man | 72 - hacks/glx/cubestorm.c | 484 - hacks/glx/cubestorm.man | 77 - hacks/glx/cubetwist.c | 596 - hacks/glx/cubetwist.man | 80 - hacks/glx/cubicgrid.c | 320 - hacks/glx/cubicgrid.man | 88 - hacks/glx/curlicue.h | 261 - hacks/glx/dangerball.c | 375 - hacks/glx/dangerball.man | 72 - hacks/glx/deepstars.c | 384 - hacks/glx/deepstars.man | 57 - hacks/glx/discoball.c | 708 - hacks/glx/discoball.man | 72 - hacks/glx/dnalogo.c | 3656 - hacks/glx/dnapizza.h | 122 - hacks/glx/dolphin.c | 2061 - hacks/glx/dropshadow.c | 178 - hacks/glx/dropshadow.h | 34 - hacks/glx/dxf2gl.pl | 736 - hacks/glx/dymaxionmap-coords.c | 685 - hacks/glx/dymaxionmap-coords.h | 6 - hacks/glx/dymaxionmap.c | 1652 - hacks/glx/dymaxionmap.man | 117 - hacks/glx/e_textures.h | 1478 - hacks/glx/endgame.c | 983 - hacks/glx/endgame.man | 72 - hacks/glx/energystream.c | 535 - hacks/glx/energystream.man | 56 - hacks/glx/engine.c | 1014 - hacks/glx/engine.man | 80 - hacks/glx/erase-gl.c | 38 - hacks/glx/esper.c | 2481 - hacks/glx/esper.man | 68 - hacks/glx/etruscanvenus.c | 2776 - hacks/glx/etruscanvenus.man | 372 - hacks/glx/extrusion-helix2.c | 47 - hacks/glx/extrusion-helix3.c | 46 - hacks/glx/extrusion-helix4.c | 63 - hacks/glx/extrusion-joinoffset.c | 148 - hacks/glx/extrusion-screw.c | 114 - hacks/glx/extrusion-taper.c | 218 - hacks/glx/extrusion-twistoid.c | 215 - hacks/glx/extrusion.c | 551 - hacks/glx/extrusion.h | 47 - hacks/glx/extrusion.man | 71 - hacks/glx/flipflop.c | 875 - hacks/glx/flipflop.man | 95 - hacks/glx/flipscreen3d.c | 523 - hacks/glx/flipscreen3d.man | 61 - hacks/glx/fliptext.c | 1003 - hacks/glx/fliptext.man | 114 - hacks/glx/flurry-smoke.c | 1441 - hacks/glx/flurry-spark.c | 285 - hacks/glx/flurry-star.c | 106 - hacks/glx/flurry-texture.c | 225 - hacks/glx/flurry.c | 549 - hacks/glx/flurry.h | 286 - hacks/glx/flurry.man | 73 - hacks/glx/flyingtoasters.c | 905 - hacks/glx/flyingtoasters.man | 90 - hacks/glx/fps-gl.c | 94 - hacks/glx/gears.c | 952 - hacks/glx/gears.man | 79 - hacks/glx/geodesic.c | 824 - hacks/glx/geodesic.man | 79 - hacks/glx/geodesicgears.c | 1801 - hacks/glx/geodesicgears.man | 78 - hacks/glx/gflux.c | 798 - hacks/glx/gflux.man | 111 - hacks/glx/gibson.c | 1333 - hacks/glx/gibson.man | 88 - hacks/glx/glblur.c | 629 - hacks/glx/glblur.man | 76 - hacks/glx/glcells.c | 1381 - hacks/glx/glcells.man | 97 - hacks/glx/gleidescope.c | 1619 - hacks/glx/gleidescope.man | 77 - hacks/glx/glforestfire.c | 1088 - hacks/glx/glforestfire.man | 117 - hacks/glx/glhanoi.c | 2091 - hacks/glx/glhanoi.man | 83 - hacks/glx/glknots.c | 454 - hacks/glx/glknots.man | 81 - hacks/glx/gllist.c | 127 - hacks/glx/gllist.h | 29 - hacks/glx/glmatrix.c | 1076 - hacks/glx/glmatrix.man | 116 - hacks/glx/glplanet.c | 1007 - hacks/glx/glplanet.man | 85 - hacks/glx/glschool.c | 228 - hacks/glx/glschool.h | 17 - hacks/glx/glschool.man | 126 - hacks/glx/glschool_alg.c | 364 - hacks/glx/glschool_alg.h | 126 - hacks/glx/glschool_gl.c | 274 - hacks/glx/glschool_gl.h | 30 - hacks/glx/glsl-utils.c | 391 - hacks/glx/glsl-utils.h | 73 - hacks/glx/glslideshow.c | 1308 - hacks/glx/glslideshow.man | 131 - hacks/glx/glsnake.c | 2685 - hacks/glx/glsnake.man | 94 - hacks/glx/gltext.c | 618 - hacks/glx/gltext.man | 143 - hacks/glx/gltrackball.c | 327 - hacks/glx/gltrackball.h | 73 - hacks/glx/glut_mroman.h | 2456 - hacks/glx/glut_roman.h | 2455 - hacks/glx/glut_stroke.c | 49 - hacks/glx/glut_swidth.c | 65 - hacks/glx/glutstroke.h | 47 - hacks/glx/grab-ximage.c | 1187 - hacks/glx/grab-ximage.h | 127 - hacks/glx/gravitywell.c | 769 - hacks/glx/gravitywell.man | 64 - hacks/glx/handsy.c | 1173 - hacks/glx/handsy.dxf | 67706 ------- hacks/glx/handsy.man | 76 - hacks/glx/handsy_anim.h | 805 - hacks/glx/handsy_model.c | 6684 - hacks/glx/headroom.c | 559 - hacks/glx/headroom.dxf | 259600 -------------------------- hacks/glx/headroom.man | 72 - hacks/glx/headroom_model.c | 26005 --- hacks/glx/hexstrut.c | 513 - hacks/glx/hexstrut.man | 77 - hacks/glx/hilbert.c | 1164 - hacks/glx/hilbert.man | 103 - hacks/glx/hydrostat.c | 816 - hacks/glx/hydrostat.man | 103 - hacks/glx/hypertorus.c | 1983 - hacks/glx/hypertorus.man | 214 - hacks/glx/hypnowheel.c | 334 - hacks/glx/hypnowheel.man | 80 - hacks/glx/involute.c | 976 - hacks/glx/involute.h | 78 - hacks/glx/jigglypuff.c | 1124 - hacks/glx/jigglypuff.man | 121 - hacks/glx/jigsaw.c | 1511 - hacks/glx/jigsaw.man | 90 - hacks/glx/juggler3d.c | 3024 - hacks/glx/juggler3d.man | 183 - hacks/glx/kaleidocycle.c | 583 - hacks/glx/kaleidocycle.man | 83 - hacks/glx/klein.c | 3581 - hacks/glx/klein.man | 340 - hacks/glx/lament.c | 1800 - hacks/glx/lament.dxf | 163404 ---------------- hacks/glx/lament.man | 68 - hacks/glx/lament_model.c | 16258 -- hacks/glx/lavalite.c | 1550 - hacks/glx/lavalite.man | 147 - hacks/glx/lockward.c | 963 - hacks/glx/lockward.man | 79 - hacks/glx/marching.c | 628 - hacks/glx/marching.h | 48 - hacks/glx/maze3d.c | 1954 - hacks/glx/maze3d.man | 116 - hacks/glx/menger.c | 573 - hacks/glx/menger.man | 78 - hacks/glx/mirrorblob.c | 1840 - hacks/glx/mirrorblob.man | 107 - hacks/glx/moebius.c | 793 - hacks/glx/moebius.man | 65 - hacks/glx/moebiusgears.c | 445 - hacks/glx/moebiusgears.man | 86 - hacks/glx/molecule.c | 1720 - hacks/glx/molecule.man | 160 - hacks/glx/molecules.sh | 23 - hacks/glx/morph3d.c | 840 - hacks/glx/morph3d.man | 57 - hacks/glx/noof.c | 529 - hacks/glx/noof.man | 52 - hacks/glx/normals.c | 49 - hacks/glx/normals.h | 32 - hacks/glx/peepers.c | 1471 - hacks/glx/peepers.man | 80 - hacks/glx/photopile.c | 855 - hacks/glx/photopile.man | 113 - hacks/glx/pinion.c | 1486 - hacks/glx/pinion.man | 82 - hacks/glx/pipeobjs.c | 3264 - hacks/glx/pipes.c | 1207 - hacks/glx/pipes.man | 85 - hacks/glx/polyhedra-gl.c | 686 - hacks/glx/polyhedra.c | 2458 - hacks/glx/polyhedra.h | 52 - hacks/glx/polyhedra.man | 124 - hacks/glx/polytopes.c | 3193 - hacks/glx/polytopes.man | 207 - hacks/glx/projectiveplane.c | 2664 - hacks/glx/projectiveplane.man | 424 - hacks/glx/providence.c | 810 - hacks/glx/providence.man | 66 - hacks/glx/pulsar.c | 507 - hacks/glx/pulsar.man | 102 - hacks/glx/quasicrystal.c | 493 - hacks/glx/quasicrystal.man | 83 - hacks/glx/queens.c | 607 - hacks/glx/queens.man | 66 - hacks/glx/quickhull.c | 1367 - hacks/glx/quickhull.h | 52 - hacks/glx/raverhoop.c | 788 - hacks/glx/raverhoop.man | 83 - hacks/glx/razzledazzle.c | 727 - hacks/glx/razzledazzle.man | 76 - hacks/glx/robot-wireframe.c | 154 - hacks/glx/robot-wireframe.dxf | 1160 - hacks/glx/robot.c | 18539 -- hacks/glx/robot.dxf | 185616 ------------------ hacks/glx/romanboy.c | 2586 - hacks/glx/romanboy.man | 412 - hacks/glx/rotator.c | 274 - hacks/glx/rotator.h | 60 - hacks/glx/rubik.c | 2155 - hacks/glx/rubik.man | 69 - hacks/glx/rubikblocks.c | 650 - hacks/glx/rubikblocks.man | 117 - hacks/glx/s1_1.c | 1733 - hacks/glx/s1_2.c | 1733 - hacks/glx/s1_3.c | 1733 - hacks/glx/s1_4.c | 1733 - hacks/glx/s1_5.c | 1733 - hacks/glx/s1_6.c | 1733 - hacks/glx/s1_b.c | 505 - hacks/glx/sballs.c | 829 - hacks/glx/sballs.man | 112 - hacks/glx/seccam.c | 1388 - hacks/glx/seccam.dxf | 13606 -- hacks/glx/shark.c | 1395 - hacks/glx/ships.c | 4976 - hacks/glx/ships.dxf | 49148 ----- hacks/glx/sierpinski3d.c | 578 - hacks/glx/sierpinski3d.man | 67 - hacks/glx/skytentacles.c | 1123 - hacks/glx/skytentacles.man | 102 - hacks/glx/sonar-icmp.c | 1789 - hacks/glx/sonar-sim.c | 112 - hacks/glx/sonar.c | 1277 - hacks/glx/sonar.h | 71 - hacks/glx/sonar.man | 170 - hacks/glx/sphere.c | 141 - hacks/glx/sphere.h | 24 - hacks/glx/sphereeversion.c | 3339 - hacks/glx/sphereeversion.man | 256 - hacks/glx/spheremonics.c | 925 - hacks/glx/spheremonics.man | 92 - hacks/glx/splitflap.c | 1426 - hacks/glx/splitflap.dxf | 1658 - hacks/glx/splitflap.man | 98 - hacks/glx/splitflap_obj.c | 200 - hacks/glx/splodesic.c | 644 - hacks/glx/splodesic.man | 69 - hacks/glx/sproingies.c | 902 - hacks/glx/sproingies.h | 43 - hacks/glx/sproingies.man | 68 - hacks/glx/sproingiewrap.c | 225 - hacks/glx/stairs.c | 600 - hacks/glx/stairs.man | 56 - hacks/glx/starwars.c | 1082 - hacks/glx/starwars.h | 363 - hacks/glx/starwars.man | 170 - hacks/glx/starwars.txt | 466 - hacks/glx/stonerview-move.c | 147 - hacks/glx/stonerview-move.h | 32 - hacks/glx/stonerview-osc.c | 341 - hacks/glx/stonerview-osc.h | 175 - hacks/glx/stonerview-view.c | 119 - hacks/glx/stonerview.c | 155 - hacks/glx/stonerview.h | 55 - hacks/glx/stonerview.man | 53 - hacks/glx/superquadrics.c | 810 - hacks/glx/superquadrics.man | 70 - hacks/glx/surfaces.c | 652 - hacks/glx/surfaces.man | 127 - hacks/glx/swim.c | 232 - hacks/glx/tangram.c | 1073 - hacks/glx/tangram.man | 67 - hacks/glx/tangram_shapes.c | 225 - hacks/glx/tangram_shapes.h | 15 - hacks/glx/teapot.c | 273 - hacks/glx/teapot.h | 7 - hacks/glx/teapot2.h | 6330 - hacks/glx/texfont.c | 1429 - hacks/glx/texfont.h | 84 - hacks/glx/timetunnel.c | 1258 - hacks/glx/timetunnel.man | 105 - hacks/glx/toast.c | 190 - hacks/glx/toast.dxf | 1814 - hacks/glx/toast2.c | 214 - hacks/glx/toast2.dxf | 2054 - hacks/glx/toaster.c | 376 - hacks/glx/toaster.dxf | 3674 - hacks/glx/toaster_base.c | 130 - hacks/glx/toaster_base.dxf | 1214 - hacks/glx/toaster_handle.c | 64 - hacks/glx/toaster_handle.dxf | 554 - hacks/glx/toaster_handle2.c | 40 - hacks/glx/toaster_handle2.dxf | 314 - hacks/glx/toaster_jet.c | 178 - hacks/glx/toaster_jet.dxf | 1694 - hacks/glx/toaster_knob.c | 76 - hacks/glx/toaster_knob.dxf | 674 - hacks/glx/toaster_slots.c | 106 - hacks/glx/toaster_slots.dxf | 974 - hacks/glx/toaster_wing.c | 43 - hacks/glx/toaster_wing.dxf | 344 - hacks/glx/topblock.c | 889 - hacks/glx/topblock.h | 45 - hacks/glx/topblock.man | 170 - hacks/glx/trackball.c | 331 - hacks/glx/trackball.h | 82 - hacks/glx/tronbit.c | 547 - hacks/glx/tronbit.man | 79 - hacks/glx/tronbit_idle1.c | 247 - hacks/glx/tronbit_idle2.c | 175 - hacks/glx/tronbit_no.c | 1087 - hacks/glx/tronbit_yes.c | 31 - hacks/glx/tube.c | 387 - hacks/glx/tube.h | 32 - hacks/glx/tunnel_draw.c | 493 - hacks/glx/tunnel_draw.h | 11 - hacks/glx/unicrud.c | 978 - hacks/glx/unicrud.man | 74 - hacks/glx/unknownpleasures.c | 770 - hacks/glx/unknownpleasures.man | 96 - hacks/glx/vigilance.c | 1170 - hacks/glx/vigilance.man | 57 - hacks/glx/voronoi.c | 557 - hacks/glx/voronoi.man | 88 - hacks/glx/vrml2gl.pl | 361 - hacks/glx/wfront2gl.pl | 361 - hacks/glx/whale.c | 1887 - hacks/glx/winduprobot.c | 2504 - hacks/glx/winduprobot.man | 85 - hacks/glx/xlock-gl-utils.c | 379 - hacks/glx/xscreensaver-gl-helper.c | 74 - hacks/glx/xscreensaver-gl-helper.man | 33 - hacks/glx/xscreensaver-gl-visual.c | 87 - hacks/glx/xscreensaver-gl-visual.man | 33 - hacks/glx/zalgo.txt | 30 - hacks/goop.c | 650 - hacks/goop.man | 84 - hacks/grav.c | 356 - hacks/grav.man | 78 - hacks/greynetic.c | 296 - hacks/greynetic.man | 56 - hacks/halftone.c | 409 - hacks/halftone.man | 83 - hacks/halo.c | 453 - hacks/halo.man | 75 - hacks/helix.c | 357 - hacks/helix.man | 62 - hacks/hexadrop.c | 445 - hacks/hexadrop.man | 74 - hacks/hopalong.c | 555 - hacks/hopalong.man | 82 - hacks/hyperball.c | 2463 - hacks/hyperball.man | 88 - hacks/hypercube.c | 575 - hacks/hypercube.man | 97 - hacks/ifs.c | 550 - hacks/ifs.man | 111 - hacks/images/6x10font.png | Bin 1968 -> 0 bytes hacks/images/Makefile | 63 - hacks/images/Makefile.in | 63 - hacks/images/amiga.png | Bin 1136 -> 0 bytes hacks/images/android.png | Bin 1091 -> 0 bytes hacks/images/apple.png | Bin 1562 -> 0 bytes hacks/images/apple2font.png | Bin 651 -> 0 bytes hacks/images/atari.png | Bin 148 -> 0 bytes hacks/images/atm.png | Bin 982 -> 0 bytes hacks/images/blocktube.png | Bin 23571 -> 0 bytes hacks/images/bob.png | Bin 1491 -> 0 bytes hacks/images/brick1.png | Bin 8544 -> 0 bytes hacks/images/brick2.png | Bin 688 -> 0 bytes hacks/images/bubbles/blood.pov | 24 - hacks/images/bubbles/blood1.png | Bin 583 -> 0 bytes hacks/images/bubbles/blood10.png | Bin 8605 -> 0 bytes hacks/images/bubbles/blood11.png | Bin 11682 -> 0 bytes hacks/images/bubbles/blood2.png | Bin 781 -> 0 bytes hacks/images/bubbles/blood3.png | Bin 1020 -> 0 bytes hacks/images/bubbles/blood4.png | Bin 1276 -> 0 bytes hacks/images/bubbles/blood5.png | Bin 1768 -> 0 bytes hacks/images/bubbles/blood6.png | Bin 2612 -> 0 bytes hacks/images/bubbles/blood7.png | Bin 3571 -> 0 bytes hacks/images/bubbles/blood8.png | Bin 5076 -> 0 bytes hacks/images/bubbles/blood9.png | Bin 6324 -> 0 bytes hacks/images/bubbles/blue.pov | 22 - hacks/images/bubbles/blue1.png | Bin 583 -> 0 bytes hacks/images/bubbles/blue10.png | Bin 7064 -> 0 bytes hacks/images/bubbles/blue11.png | Bin 9455 -> 0 bytes hacks/images/bubbles/blue2.png | Bin 781 -> 0 bytes hacks/images/bubbles/blue3.png | Bin 1018 -> 0 bytes hacks/images/bubbles/blue4.png | Bin 1184 -> 0 bytes hacks/images/bubbles/blue5.png | Bin 1626 -> 0 bytes hacks/images/bubbles/blue6.png | Bin 2354 -> 0 bytes hacks/images/bubbles/blue7.png | Bin 3133 -> 0 bytes hacks/images/bubbles/blue8.png | Bin 4300 -> 0 bytes hacks/images/bubbles/blue9.png | Bin 5286 -> 0 bytes hacks/images/bubbles/glass.pov | 27 - hacks/images/bubbles/glass1.png | Bin 583 -> 0 bytes hacks/images/bubbles/glass10.png | Bin 6805 -> 0 bytes hacks/images/bubbles/glass11.png | Bin 9200 -> 0 bytes hacks/images/bubbles/glass2.png | Bin 781 -> 0 bytes hacks/images/bubbles/glass3.png | Bin 1018 -> 0 bytes hacks/images/bubbles/glass4.png | Bin 1045 -> 0 bytes hacks/images/bubbles/glass5.png | Bin 1425 -> 0 bytes hacks/images/bubbles/glass6.png | Bin 2110 -> 0 bytes hacks/images/bubbles/glass7.png | Bin 2856 -> 0 bytes hacks/images/bubbles/glass8.png | Bin 4014 -> 0 bytes hacks/images/bubbles/glass9.png | Bin 4996 -> 0 bytes hacks/images/bubbles/jade.pov | 24 - hacks/images/bubbles/jade1.png | Bin 583 -> 0 bytes hacks/images/bubbles/jade10.png | Bin 7853 -> 0 bytes hacks/images/bubbles/jade11.png | Bin 10816 -> 0 bytes hacks/images/bubbles/jade2.png | Bin 781 -> 0 bytes hacks/images/bubbles/jade3.png | Bin 1018 -> 0 bytes hacks/images/bubbles/jade4.png | Bin 1202 -> 0 bytes hacks/images/bubbles/jade5.png | Bin 1670 -> 0 bytes hacks/images/bubbles/jade6.png | Bin 2416 -> 0 bytes hacks/images/bubbles/jade7.png | Bin 3255 -> 0 bytes hacks/images/bubbles/jade8.png | Bin 4670 -> 0 bytes hacks/images/bubbles/jade9.png | Bin 5758 -> 0 bytes hacks/images/chromesphere.png | Bin 33091 -> 0 bytes hacks/images/dvd.png | Bin 2727 -> 0 bytes hacks/images/earth.png | Bin 433159 -> 0 bytes hacks/images/earth_flat.png | Bin 16698 -> 0 bytes hacks/images/earth_night.png | Bin 390020 -> 0 bytes hacks/images/gnome1.png | Bin 17901 -> 0 bytes hacks/images/gnome2.png | Bin 1867 -> 0 bytes hacks/images/ground.png | Bin 13299 -> 0 bytes hacks/images/hmac.png | Bin 439 -> 0 bytes hacks/images/iris.png | Bin 143843 -> 0 bytes hacks/images/jigglymap.png | Bin 29863 -> 0 bytes hacks/images/lament512.png | Bin 566651 -> 0 bytes hacks/images/logo-180.png | Bin 8734 -> 0 bytes hacks/images/logo-32.png | Bin 1614 -> 0 bytes hacks/images/logo-360.png | Bin 27394 -> 0 bytes hacks/images/logo-50.png | Bin 2030 -> 0 bytes hacks/images/m6502/amiga.asm | 120 - hacks/images/m6502/breakout.asm | 195 - hacks/images/m6502/byterun.asm | 100 - hacks/images/m6502/cellular-30.asm | 67 - hacks/images/m6502/cellular-600.asm | 209 - hacks/images/m6502/colors.asm | 46 - hacks/images/m6502/crunch6502.asm | 292 - hacks/images/m6502/demoscene.asm | 457 - hacks/images/m6502/disco.asm | 23 - hacks/images/m6502/dmsc.asm | 130 - hacks/images/m6502/dmsc.txt | 768 - hacks/images/m6502/dragon-fractal.asm | 49 - hacks/images/m6502/fullscreenlogo.asm | 107 - hacks/images/m6502/greynetic.asm | 96 - hacks/images/m6502/keftal.asm | 82 - hacks/images/m6502/life.asm | 127 - hacks/images/m6502/lines.asm | 313 - hacks/images/m6502/matrix.asm | 67 - hacks/images/m6502/noise.asm | 16 - hacks/images/m6502/random-walk.asm | 82 - hacks/images/m6502/random.asm | 11 - hacks/images/m6502/random2.asm | 11 - hacks/images/m6502/rorschach.asm | 124 - hacks/images/m6502/santa.asm | 142 - hacks/images/m6502/selfmodify.asm | 12 - hacks/images/m6502/sflake.asm | 320 - hacks/images/m6502/sierpinski.asm | 24 - hacks/images/m6502/sierpinsky.asm | 131 - hacks/images/m6502/softsprite.asm | 132 - hacks/images/m6502/spacer.asm | 235 - hacks/images/m6502/starfield2d.asm | 50 - hacks/images/m6502/texture.asm | 393 - hacks/images/m6502/wave6502.asm | 164 - hacks/images/m6502/zookeeper.asm | 109 - hacks/images/mac.png | Bin 211 -> 0 bytes hacks/images/macbomb.png | Bin 697 -> 0 bytes hacks/images/matrix1.png | Bin 29412 -> 0 bytes hacks/images/matrix1b.png | Bin 11525 -> 0 bytes hacks/images/matrix2.png | Bin 27982 -> 0 bytes hacks/images/matrix2b.png | Bin 11468 -> 0 bytes hacks/images/matrix3.png | Bin 125539 -> 0 bytes hacks/images/molecules/adenine.pdb | 37 - hacks/images/molecules/adrenochrome.pdb | 55 - hacks/images/molecules/bucky.pdb | 156 - hacks/images/molecules/caffeine.pdb | 54 - hacks/images/molecules/capsaicin.pdb | 49 - hacks/images/molecules/chlordecone.pdb | 49 - hacks/images/molecules/cocaine.pdb | 93 - hacks/images/molecules/codeine.pdb | 93 - hacks/images/molecules/cyclohexane.pdb | 151 - hacks/images/molecules/cytosine.pdb | 33 - hacks/images/molecules/dna.pdb | 972 - hacks/images/molecules/dodecahedrane.pdb | 87 - hacks/images/molecules/dthc.pdb | 107 - hacks/images/molecules/dynamite.pdb | 47 - hacks/images/molecules/glycol.pdb | 27 - hacks/images/molecules/guanine.pdb | 39 - hacks/images/molecules/heroin.pdb | 107 - hacks/images/molecules/hexahelicene.pdb | 90 - hacks/images/molecules/ibuprofen.pdb | 72 - hacks/images/molecules/lsd.pdb | 104 - hacks/images/molecules/menthol.pdb | 69 - hacks/images/molecules/mescaline.pdb | 71 - hacks/images/molecules/methamphetamine.pdb | 88 - hacks/images/molecules/morphine.pdb | 87 - hacks/images/molecules/nicotine.pdb | 59 - hacks/images/molecules/novocaine.pdb | 81 - hacks/images/molecules/olestra.pdb | 913 - hacks/images/molecules/penicillin.pdb | 89 - hacks/images/molecules/salvinorin.pdb | 92 - hacks/images/molecules/sarin.pdb | 43 - hacks/images/molecules/strychnine.pdb | 101 - hacks/images/molecules/sucrose.pdb | 97 - hacks/images/molecules/thalidomide.pdb | 65 - hacks/images/molecules/thymine.pdb | 37 - hacks/images/molecules/viagra.pdb | 133 - hacks/images/molecules/vitaminb6.pdb | 56 - hacks/images/molecules/vitaminc.pdb | 47 - hacks/images/molecules/vx.pdb | 92 - hacks/images/noseguy/nose-f1.png | Bin 454 -> 0 bytes hacks/images/noseguy/nose-f2.png | Bin 397 -> 0 bytes hacks/images/noseguy/nose-f3.png | Bin 396 -> 0 bytes hacks/images/noseguy/nose-f4.png | Bin 448 -> 0 bytes hacks/images/noseguy/nose-l1.png | Bin 388 -> 0 bytes hacks/images/noseguy/nose-l2.png | Bin 470 -> 0 bytes hacks/images/noseguy/nose-r1.png | Bin 386 -> 0 bytes hacks/images/noseguy/nose-r2.png | Bin 467 -> 0 bytes hacks/images/osx_10_2.png | Bin 53621 -> 0 bytes hacks/images/osx_10_3.png | Bin 28292 -> 0 bytes hacks/images/pacman.png | Bin 2695 -> 0 bytes hacks/images/ransomware.png | Bin 976 -> 0 bytes hacks/images/sball-bg.png | Bin 31249 -> 0 bytes hacks/images/sball.png | Bin 2334 -> 0 bytes hacks/images/scales.png | Bin 8573 -> 0 bytes hacks/images/sclera.png | Bin 230321 -> 0 bytes hacks/images/sea-texture.png | Bin 6933 -> 0 bytes hacks/images/som.png | Bin 7593 -> 0 bytes hacks/images/start.png | Bin 1153 -> 0 bytes hacks/images/sun.png | Bin 415 -> 0 bytes hacks/images/testcard_bbcf.png | Bin 67094 -> 0 bytes hacks/images/testcard_pm5544.png | Bin 20774 -> 0 bytes hacks/images/testcard_rca.png | Bin 96263 -> 0 bytes hacks/images/timetunnel0.png | Bin 35798 -> 0 bytes hacks/images/timetunnel1.png | Bin 131957 -> 0 bytes hacks/images/timetunnel2.png | Bin 50547 -> 0 bytes hacks/images/toast.png | Bin 11667 -> 0 bytes hacks/images/tree.png | Bin 5944 -> 0 bytes hacks/images/tunnel0.png | Bin 6996 -> 0 bytes hacks/images/tunnel1.png | Bin 3449 -> 0 bytes hacks/images/tunnel2.png | Bin 11424 -> 0 bytes hacks/images/tunnel3.png | Bin 6725 -> 0 bytes hacks/images/tunnel4.png | Bin 3297 -> 0 bytes hacks/images/tunnel5.png | Bin 3340 -> 0 bytes hacks/images/tunnelstar.png | Bin 23414 -> 0 bytes hacks/images/win10_spinner.gif | Bin 64501 -> 0 bytes hacks/images/wood.png | Bin 2130 -> 0 bytes hacks/images/wood2.png | Bin 3274 -> 0 bytes hacks/imsmap.c | 425 - hacks/imsmap.man | 64 - hacks/interaggregate.c | 988 - hacks/interaggregate.man | 72 - hacks/interference.c | 1000 - hacks/interference.man | 86 - hacks/intermomentary.c | 593 - hacks/intermomentary.man | 82 - hacks/juggle.c | 2797 - hacks/juggle.man | 181 - hacks/julia.c | 442 - hacks/julia.man | 81 - hacks/kaleidescope.c | 505 - hacks/kaleidescope.man | 76 - hacks/kumppa.c | 536 - hacks/kumppa.man | 65 - hacks/laser.c | 355 - hacks/laser.man | 68 - hacks/lcdscrub.c | 398 - hacks/lcdscrub.man | 73 - hacks/lightning.c | 601 - hacks/lightning.man | 62 - hacks/link_axp.com | 107 - hacks/link_decc.com | 107 - hacks/lisa.c | 739 - hacks/lisa.man | 71 - hacks/lissie.c | 322 - hacks/lissie.man | 69 - hacks/ljlatest | 1 - hacks/ljlatest.man | 61 - hacks/lmorph.c | 579 - hacks/lmorph.man | 65 - hacks/loop.c | 1694 - hacks/loop.man | 65 - hacks/m6502.c | 304 - hacks/m6502.sh | 26 - hacks/maze.c | 1678 - hacks/maze.man | 148 - hacks/memscroller.c | 622 - hacks/memscroller.man | 78 - hacks/metaballs.c | 437 - hacks/metaballs.man | 73 - hacks/moire.c | 252 - hacks/moire.man | 68 - hacks/moire2.c | 362 - hacks/moire2.man | 63 - hacks/mountain.c | 282 - hacks/mountain.man | 60 - hacks/munch.c | 461 - hacks/munch.man | 141 - hacks/munge-ad.pl | 239 - hacks/nerverot.c | 1358 - hacks/nerverot.man | 132 - hacks/noseguy.c | 715 - hacks/noseguy.man | 84 - hacks/pacman.c | 1473 - hacks/pacman.h | 212 - hacks/pacman.man | 67 - hacks/pacman_ai.c | 878 - hacks/pacman_ai.h | 32 - hacks/pacman_level.c | 773 - hacks/pacman_level.h | 33 - hacks/pedal.c | 338 - hacks/pedal.man | 60 - hacks/penetrate.c | 1018 - hacks/penetrate.man | 85 - hacks/penrose.c | 1341 - hacks/penrose.man | 106 - hacks/petri.c | 776 - hacks/petri.man | 129 - hacks/phosphor.c | 1514 - hacks/phosphor.man | 165 - hacks/piecewise.c | 1031 - hacks/piecewise.man | 77 - hacks/polyominoes.c | 2369 - hacks/polyominoes.man | 65 - hacks/pong.c | 1120 - hacks/pong.man | 86 - hacks/popsquares.c | 309 - hacks/pyro.c | 372 - hacks/pyro.man | 64 - hacks/qix.c | 641 - hacks/qix.man | 132 - hacks/rd-bomb.c | 570 - hacks/rd-bomb.man | 100 - hacks/recanim.c | 480 - hacks/recanim.h | 32 - hacks/ripples.c | 1131 - hacks/ripples.man | 96 - hacks/rocks.c | 561 - hacks/rocks.man | 90 - hacks/rorschach.c | 215 - hacks/rorschach.man | 75 - hacks/rotor.c | 389 - hacks/rotor.man | 68 - hacks/rotzoomer.c | 603 - hacks/rotzoomer.man | 88 - hacks/scooter.c | 957 - hacks/scooter.man | 79 - hacks/screenhack.c | 1013 - hacks/screenhack.h | 68 - hacks/screenhackI.h | 218 - hacks/shadebobs.c | 473 - hacks/shadebobs.man | 65 - hacks/sierpinski.c | 213 - hacks/sierpinski.man | 69 - hacks/slidescreen.c | 512 - hacks/slidescreen.man | 97 - hacks/slip.c | 375 - hacks/slip.man | 86 - hacks/speedmine.c | 1658 - hacks/speedmine.man | 208 - hacks/sphere.c | 303 - hacks/sphere.man | 62 - hacks/spiral.c | 330 - hacks/spiral.man | 71 - hacks/spotlight.c | 356 - hacks/spotlight.man | 80 - hacks/squiral.c | 296 - hacks/squiral.man | 80 - hacks/starfish.c | 563 - hacks/starfish.man | 84 - hacks/strange.c | 1341 - hacks/strange.man | 79 - hacks/substrate.c | 779 - hacks/substrate.man | 73 - hacks/swirl.c | 1445 - hacks/swirl.man | 70 - hacks/t3d.c | 990 - hacks/t3d.man | 131 - hacks/tessellimage.c | 1012 - hacks/tessellimage.man | 86 - hacks/testx11.c | 967 - hacks/thornbird.c | 264 - hacks/thornbird.man | 64 - hacks/triangle.c | 354 - hacks/triangle.man | 56 - hacks/truchet.c | 540 - hacks/truchet.man | 139 - hacks/twang.c | 783 - hacks/twang.man | 132 - hacks/vermiculate.c | 1222 - hacks/vermiculate.man | 48 - hacks/vfeedback.c | 620 - hacks/vfeedback.man | 71 - hacks/vidwhacker | 497 - hacks/vidwhacker.man | 89 - hacks/vines.c | 179 - hacks/vines.man | 66 - hacks/vms_axp.opt | 4 - hacks/vms_axp_12.opt | 4 - hacks/vms_decc.opt | 4 - hacks/vms_decc_12.opt | 4 - hacks/wander.c | 281 - hacks/wander.man | 76 - hacks/webcollage | 4049 - hacks/webcollage-cocoa.m | 428 - hacks/webcollage-helper-cocoa.m | 510 - hacks/webcollage-helper.c | 604 - hacks/webcollage.man | 240 - hacks/whirlwindwarp.c | 508 - hacks/whirlwindwarp.man | 64 - hacks/whirlygig.c | 740 - hacks/whirlygig.man | 137 - hacks/worm.c | 433 - hacks/worm.man | 65 - hacks/wormhole.c | 730 - hacks/wormhole.man | 69 - hacks/xanalogtv.c | 688 - hacks/xanalogtv.man | 84 - hacks/xflame.c | 825 - hacks/xflame.man | 72 - hacks/ximage-loader.c | 695 - hacks/ximage-loader.h | 37 - hacks/xjack.c | 501 - hacks/xjack.man | 52 - hacks/xlockmore.c | 794 - hacks/xlockmore.h | 254 - hacks/xlockmoreI.h | 187 - hacks/xlyap.c | 1938 - hacks/xlyap.man | 223 - hacks/xmatrix.c | 1871 - hacks/xmatrix.man | 136 - hacks/xml2man.pl | 266 - hacks/xrayswarm.c | 1225 - hacks/xrayswarm.man | 50 - hacks/xscreensaver-getimage-file | 1342 - hacks/xscreensaver-getimage-file.man | 63 - hacks/xscreensaver-getimage-video | 141 - hacks/xscreensaver-getimage-video.man | 51 - hacks/xscreensaver-getimage.c | 2068 - hacks/xscreensaver-getimage.man | 76 - hacks/xscreensaver-sgigl.c | 266 - hacks/xscreensaver-text | 1000 - hacks/xscreensaver-text.man | 88 - hacks/xspirograph.c | 334 - hacks/xspirograph.man | 71 - hacks/xsublim.c | 804 - hacks/xsublim.man | 91 - hacks/zoom.c | 291 - hacks/zoom.man | 111 - jwxyz/Makefile.in | 6 +- jwxyz/jwxyz-android.c | 6 +- jwxyz/jwxyz-cocoa.m | 2 +- jwxyz/jwxyz-common.c | 15 +- jwxyz/jwxyz.m | 13 +- jwxyz/jwzgles.c | 37 +- jwxyz/jwzglesI.h | 3 +- po/ChangeLog | 300 - po/Makefile.in.in | 390 - po/POTFILES.in | 272 - po/da.po | 9938 - po/de.po | 9219 - po/es.po | 10021 - po/et.po | 8995 - po/fi.po | 8939 - po/fr.po | 9248 - po/hu.po | 9760 - po/it.po | 8967 - po/ja.po | 11306 -- po/ko.po | 9340 - po/nb.po | 9071 - po/nl.po | 10290 - po/pl.po | 9387 - po/pt.po | 9995 - po/pt_BR.po | 9563 - po/ru.po | 10240 - po/sk.po | 9242 - po/sv.po | 11236 -- po/update.sh | 24 - po/vi.po | 9347 - po/wa.po | 9138 - po/zh_CN.po | 9513 - po/zh_TW.po | 9358 - utils/Makefile.in | 38 +- utils/async_netdb.c | 7 +- utils/compile_axp.com | 34 - utils/compile_decc.com | 34 - utils/fade.h | 21 - utils/font-retry.c | 27 +- utils/grabclient.c | 114 +- utils/grabclient.h | 91 + utils/grabscreen.c | 924 - utils/grabscreen.h | 109 - utils/images/logo-512.png | Bin 0 -> 10950 bytes utils/images/logo.eps | 8058 - utils/images/screensaver-cmndln.png | Bin 1040 -> 0 bytes utils/images/screensaver-colorselector.png | Bin 1104 -> 0 bytes utils/images/screensaver-diagnostic.png | Bin 1307 -> 0 bytes utils/images/screensaver-locking.png | Bin 944 -> 0 bytes utils/images/screensaver-power.png | Bin 973 -> 0 bytes utils/images/screensaver-snap.png | Bin 1272 -> 0 bytes utils/pow2.c | 7 +- utils/pow2.h | 8 + utils/resources.c | 1 + utils/screenshot.c | 331 + utils/screenshot.h | 34 + utils/thread_util.c | 16 +- utils/utf8wc.c | 39 +- utils/version.h | 6 +- utils/visual-gl.c | 19 +- utils/xft.c | 3 + utils/xft.h | 13 +- utils/xftwrap.c | 2 - xscreensaver.spec | 195 +- 1377 files changed, 28662 insertions(+), 1508127 deletions(-) create mode 100755 config.rpath delete mode 100644 driver/.gdbinit create mode 100644 driver/XScreenSaver_Xm_ad.h create mode 100644 driver/XScreenSaver_ad.h delete mode 100644 driver/compile_axp.com delete mode 100644 driver/compile_decc.com create mode 100644 driver/demo.ui create mode 100644 driver/gresource.xml delete mode 100644 driver/link_axp.com delete mode 100644 driver/link_decc.com delete mode 100644 driver/lock.c delete mode 100644 driver/mlstring.c delete mode 100644 driver/mlstring.h delete mode 100644 driver/passwd-helper.c delete mode 100644 driver/pdf2jpeg.m delete mode 100644 driver/pdf2jpeg.man create mode 100644 driver/prefs.ui delete mode 100644 driver/screensaver-properties.desktop.in delete mode 100644 driver/stderr.c delete mode 100644 driver/vms_axp.opt delete mode 100644 driver/vms_axp_12.opt delete mode 100644 driver/vms_decc.opt delete mode 100644 driver/vms_decc_12.opt delete mode 100644 driver/xscreensaver-demo.glade2.in delete mode 100644 driver/xscreensaver-demo.glade2p delete mode 100644 driver/xscreensaver-demo.man delete mode 100755 driver/xscreensaver-getimage-desktop delete mode 100644 driver/xscreensaver-getimage-desktop.man delete mode 100755 driver/xscreensaver-getimage-file delete mode 100644 driver/xscreensaver-getimage-file.man delete mode 100755 driver/xscreensaver-getimage-video delete mode 100644 driver/xscreensaver-getimage-video.man delete mode 100644 driver/xscreensaver-getimage.man create mode 100755 driver/xscreensaver-settings.desktop.in delete mode 100755 driver/xscreensaver-text delete mode 100644 driver/xscreensaver-text.man create mode 100755 driver/xscreensaver.desktop.in create mode 100644 driver/xscreensaver.service.in delete mode 100644 driver/xscreensaver.ui delete mode 100644 hacks/.gdbinit delete mode 100644 hacks/Makefile.in delete mode 100644 hacks/README delete mode 100644 hacks/abstractile.c delete mode 100644 hacks/abstractile.man delete mode 100644 hacks/analogtv-cli.c delete mode 100644 hacks/analogtv.c delete mode 100644 hacks/analogtv.h delete mode 100644 hacks/anemone.c delete mode 100644 hacks/anemone.man delete mode 100644 hacks/anemotaxis.c delete mode 100644 hacks/anemotaxis.man delete mode 100644 hacks/ant.c delete mode 100644 hacks/ant.man delete mode 100644 hacks/apollonian.c delete mode 100644 hacks/apollonian.man delete mode 100644 hacks/apple2-main.c delete mode 100644 hacks/apple2.c delete mode 100644 hacks/apple2.h delete mode 100644 hacks/apple2.man delete mode 100644 hacks/asm6502.c delete mode 100644 hacks/asm6502.h delete mode 100644 hacks/attraction.c delete mode 100644 hacks/attraction.man delete mode 100644 hacks/automata.h delete mode 100644 hacks/barcode.c delete mode 100644 hacks/barcode.man delete mode 100644 hacks/binaryring.c delete mode 100644 hacks/binaryring.man delete mode 100644 hacks/blaster.c delete mode 100644 hacks/blaster.man delete mode 100644 hacks/blitspin.c delete mode 100644 hacks/blitspin.man delete mode 100644 hacks/bouboule.c delete mode 100644 hacks/bouboule.man delete mode 100644 hacks/boxfit.c delete mode 100644 hacks/boxfit.man delete mode 100644 hacks/braid.c delete mode 100644 hacks/braid.man delete mode 100644 hacks/bsod.c delete mode 100644 hacks/bsod.man delete mode 100644 hacks/bubbles-default.c delete mode 100644 hacks/bubbles.c delete mode 100644 hacks/bubbles.h delete mode 100644 hacks/bubbles.man delete mode 100644 hacks/bumps.c delete mode 100644 hacks/bumps.man delete mode 100644 hacks/ccurve.c delete mode 100644 hacks/ccurve.man delete mode 100644 hacks/celtic.c delete mode 100644 hacks/celtic.man delete mode 100755 hacks/check-configs.pl delete mode 100644 hacks/cloudlife.c delete mode 100644 hacks/cloudlife.man delete mode 100644 hacks/compass.c delete mode 100644 hacks/compass.man delete mode 100644 hacks/compile_axp.com delete mode 100644 hacks/compile_decc.com delete mode 100644 hacks/config/README delete mode 100644 hacks/config/abstractile.xml delete mode 100644 hacks/config/anemone.xml delete mode 100644 hacks/config/anemotaxis.xml delete mode 100644 hacks/config/ant.xml delete mode 100644 hacks/config/antinspect.xml delete mode 100644 hacks/config/antmaze.xml delete mode 100644 hacks/config/antspotlight.xml delete mode 100644 hacks/config/apollonian.xml delete mode 100644 hacks/config/apple2.xml delete mode 100644 hacks/config/atlantis.xml delete mode 100644 hacks/config/attraction.xml delete mode 100644 hacks/config/atunnel.xml delete mode 100644 hacks/config/barcode.xml delete mode 100644 hacks/config/beats.xml delete mode 100644 hacks/config/binaryring.xml delete mode 100644 hacks/config/blaster.xml delete mode 100644 hacks/config/blinkbox.xml delete mode 100644 hacks/config/blitspin.xml delete mode 100644 hacks/config/blocktube.xml delete mode 100644 hacks/config/boing.xml delete mode 100644 hacks/config/bouboule.xml delete mode 100644 hacks/config/bouncingcow.xml delete mode 100644 hacks/config/boxed.xml delete mode 100644 hacks/config/boxfit.xml delete mode 100644 hacks/config/braid.xml delete mode 100644 hacks/config/bsod.xml delete mode 100644 hacks/config/bubble3d.xml delete mode 100644 hacks/config/bubbles.xml delete mode 100644 hacks/config/bumps.xml delete mode 100644 hacks/config/cage.xml delete mode 100644 hacks/config/carousel.xml delete mode 100644 hacks/config/ccurve.xml delete mode 100644 hacks/config/celtic.xml delete mode 100644 hacks/config/circuit.xml delete mode 100644 hacks/config/cityflow.xml delete mode 100644 hacks/config/cloudlife.xml delete mode 100644 hacks/config/co____9.xml delete mode 100644 hacks/config/companioncube.xml delete mode 100644 hacks/config/compass.xml delete mode 100644 hacks/config/coral.xml delete mode 100644 hacks/config/covid19.xml delete mode 100644 hacks/config/crackberg.xml delete mode 100644 hacks/config/critical.xml delete mode 100644 hacks/config/crumbler.xml delete mode 100644 hacks/config/crystal.xml delete mode 100644 hacks/config/cube21.xml delete mode 100644 hacks/config/cubenetic.xml delete mode 100644 hacks/config/cubestack.xml delete mode 100644 hacks/config/cubestorm.xml delete mode 100644 hacks/config/cubetwist.xml delete mode 100644 hacks/config/cubicgrid.xml delete mode 100644 hacks/config/cwaves.xml delete mode 100644 hacks/config/cynosure.xml delete mode 100644 hacks/config/dangerball.xml delete mode 100644 hacks/config/decayscreen.xml delete mode 100644 hacks/config/deco.xml delete mode 100644 hacks/config/deepstars.xml delete mode 100644 hacks/config/deluxe.xml delete mode 100644 hacks/config/demon.xml delete mode 100644 hacks/config/discoball.xml delete mode 100644 hacks/config/discrete.xml delete mode 100644 hacks/config/distort.xml delete mode 100644 hacks/config/dnalogo.xml delete mode 100644 hacks/config/drift.xml delete mode 100644 hacks/config/dymaxionmap.xml delete mode 100644 hacks/config/endgame.xml delete mode 100644 hacks/config/energystream.xml delete mode 100644 hacks/config/engine.xml delete mode 100644 hacks/config/epicycle.xml delete mode 100644 hacks/config/eruption.xml delete mode 100644 hacks/config/esper.xml delete mode 100644 hacks/config/etruscanvenus.xml delete mode 100644 hacks/config/euler2d.xml delete mode 100644 hacks/config/extrusion.xml delete mode 100644 hacks/config/fadeplot.xml delete mode 100644 hacks/config/fiberlamp.xml delete mode 100644 hacks/config/filmleader.xml delete mode 100644 hacks/config/fireworkx.xml delete mode 100644 hacks/config/flag.xml delete mode 100644 hacks/config/flame.xml delete mode 100644 hacks/config/flipflop.xml delete mode 100644 hacks/config/flipscreen3d.xml delete mode 100644 hacks/config/fliptext.xml delete mode 100644 hacks/config/flow.xml delete mode 100644 hacks/config/fluidballs.xml delete mode 100644 hacks/config/flurry.xml delete mode 100644 hacks/config/flyingtoasters.xml delete mode 100644 hacks/config/fontglide.xml delete mode 100644 hacks/config/forest.xml delete mode 100644 hacks/config/fuzzyflakes.xml delete mode 100644 hacks/config/galaxy.xml delete mode 100644 hacks/config/gears.xml delete mode 100644 hacks/config/geodesic.xml delete mode 100644 hacks/config/geodesicgears.xml delete mode 100644 hacks/config/gflux.xml delete mode 100644 hacks/config/gibson.xml delete mode 100644 hacks/config/glblur.xml delete mode 100644 hacks/config/glcells.xml delete mode 100644 hacks/config/gleidescope.xml delete mode 100644 hacks/config/glforestfire.xml delete mode 100644 hacks/config/glhanoi.xml delete mode 100644 hacks/config/glitchpeg.xml delete mode 100644 hacks/config/glknots.xml delete mode 100644 hacks/config/glmatrix.xml delete mode 100644 hacks/config/glplanet.xml delete mode 100644 hacks/config/glschool.xml delete mode 100644 hacks/config/glslideshow.xml delete mode 100644 hacks/config/glsnake.xml delete mode 100644 hacks/config/gltext.xml delete mode 100644 hacks/config/goop.xml delete mode 100644 hacks/config/grav.xml delete mode 100644 hacks/config/gravitywell.xml delete mode 100644 hacks/config/greynetic.xml delete mode 100644 hacks/config/halftone.xml delete mode 100644 hacks/config/halo.xml delete mode 100644 hacks/config/handsy.xml delete mode 100644 hacks/config/headroom.xml delete mode 100644 hacks/config/helix.xml delete mode 100644 hacks/config/hexadrop.xml delete mode 100644 hacks/config/hexstrut.xml delete mode 100644 hacks/config/hilbert.xml delete mode 100644 hacks/config/hopalong.xml delete mode 100644 hacks/config/hydrostat.xml delete mode 100644 hacks/config/hyperball.xml delete mode 100644 hacks/config/hypercube.xml delete mode 100644 hacks/config/hypertorus.xml delete mode 100644 hacks/config/hypnowheel.xml delete mode 100644 hacks/config/ifs.xml delete mode 100644 hacks/config/imsmap.xml delete mode 100644 hacks/config/interaggregate.xml delete mode 100644 hacks/config/interference.xml delete mode 100644 hacks/config/intermomentary.xml delete mode 100644 hacks/config/jigglypuff.xml delete mode 100644 hacks/config/jigsaw.xml delete mode 100644 hacks/config/juggle.xml delete mode 100644 hacks/config/juggler3d.xml delete mode 100644 hacks/config/julia.xml delete mode 100644 hacks/config/kaleidescope.xml delete mode 100644 hacks/config/kaleidocycle.xml delete mode 100644 hacks/config/klein.xml delete mode 100644 hacks/config/kumppa.xml delete mode 100644 hacks/config/lament.xml delete mode 100644 hacks/config/laser.xml delete mode 100644 hacks/config/lavalite.xml delete mode 100644 hacks/config/lcdscrub.xml delete mode 100644 hacks/config/lightning.xml delete mode 100644 hacks/config/lisa.xml delete mode 100644 hacks/config/lissie.xml delete mode 100644 hacks/config/lmorph.xml delete mode 100644 hacks/config/lockward.xml delete mode 100644 hacks/config/loop.xml delete mode 100644 hacks/config/m6502.xml delete mode 100644 hacks/config/maze.xml delete mode 100755 hacks/config/maze3d.xml delete mode 100644 hacks/config/memscroller.xml delete mode 100644 hacks/config/menger.xml delete mode 100644 hacks/config/metaballs.xml delete mode 100644 hacks/config/mirrorblob.xml delete mode 100644 hacks/config/mismunch.xml delete mode 100644 hacks/config/moebius.xml delete mode 100644 hacks/config/moebiusgears.xml delete mode 100644 hacks/config/moire.xml delete mode 100644 hacks/config/moire2.xml delete mode 100644 hacks/config/molecule.xml delete mode 100644 hacks/config/morph3d.xml delete mode 100644 hacks/config/mountain.xml delete mode 100644 hacks/config/munch.xml delete mode 100644 hacks/config/nerverot.xml delete mode 100644 hacks/config/noof.xml delete mode 100644 hacks/config/noseguy.xml delete mode 100644 hacks/config/pacman.xml delete mode 100644 hacks/config/pedal.xml delete mode 100644 hacks/config/peepers.xml delete mode 100644 hacks/config/penetrate.xml delete mode 100644 hacks/config/penrose.xml delete mode 100644 hacks/config/petri.xml delete mode 100644 hacks/config/phosphor.xml delete mode 100644 hacks/config/photopile.xml delete mode 100644 hacks/config/piecewise.xml delete mode 100644 hacks/config/pinion.xml delete mode 100644 hacks/config/pipes.xml delete mode 100644 hacks/config/polyhedra.xml delete mode 100644 hacks/config/polyominoes.xml delete mode 100644 hacks/config/polytopes.xml delete mode 100644 hacks/config/pong.xml delete mode 100644 hacks/config/popsquares.xml delete mode 100644 hacks/config/projectiveplane.xml delete mode 100644 hacks/config/providence.xml delete mode 100644 hacks/config/pulsar.xml delete mode 100644 hacks/config/pyro.xml delete mode 100644 hacks/config/qix.xml delete mode 100644 hacks/config/quasicrystal.xml delete mode 100644 hacks/config/queens.xml delete mode 100644 hacks/config/raverhoop.xml delete mode 100644 hacks/config/razzledazzle.xml delete mode 100644 hacks/config/rd-bomb.xml delete mode 120000 hacks/config/rdbomb.xml delete mode 100644 hacks/config/ripples.xml delete mode 100644 hacks/config/rocks.xml delete mode 100644 hacks/config/romanboy.xml delete mode 100644 hacks/config/rorschach.xml delete mode 100644 hacks/config/rotor.xml delete mode 100644 hacks/config/rotzoomer.xml delete mode 100644 hacks/config/rubik.xml delete mode 100644 hacks/config/rubikblocks.xml delete mode 100644 hacks/config/sballs.xml delete mode 100644 hacks/config/scooter.xml delete mode 100644 hacks/config/shadebobs.xml delete mode 100644 hacks/config/sierpinski.xml delete mode 100644 hacks/config/sierpinski3d.xml delete mode 100644 hacks/config/skytentacles.xml delete mode 100644 hacks/config/slidescreen.xml delete mode 100644 hacks/config/slip.xml delete mode 100644 hacks/config/sonar.xml delete mode 100644 hacks/config/speedmine.xml delete mode 100644 hacks/config/sphere.xml delete mode 100644 hacks/config/sphereeversion.xml delete mode 100644 hacks/config/spheremonics.xml delete mode 100644 hacks/config/spiral.xml delete mode 100644 hacks/config/splitflap.xml delete mode 100644 hacks/config/splodesic.xml delete mode 100644 hacks/config/spotlight.xml delete mode 100644 hacks/config/sproingies.xml delete mode 100644 hacks/config/squiral.xml delete mode 100644 hacks/config/stairs.xml delete mode 100644 hacks/config/starfish.xml delete mode 100644 hacks/config/starwars.xml delete mode 100644 hacks/config/stonerview.xml delete mode 100644 hacks/config/strange.xml delete mode 100644 hacks/config/substrate.xml delete mode 100644 hacks/config/superquadrics.xml delete mode 100644 hacks/config/surfaces.xml delete mode 100644 hacks/config/swirl.xml delete mode 100644 hacks/config/t3d.xml delete mode 100644 hacks/config/tangram.xml delete mode 100644 hacks/config/tessellimage.xml delete mode 100644 hacks/config/testx11.xml delete mode 100644 hacks/config/thornbird.xml delete mode 100644 hacks/config/timetunnel.xml delete mode 100644 hacks/config/topblock.xml delete mode 100644 hacks/config/triangle.xml delete mode 100644 hacks/config/tronbit.xml delete mode 100644 hacks/config/truchet.xml delete mode 100644 hacks/config/twang.xml delete mode 100644 hacks/config/unicrud.xml delete mode 100644 hacks/config/unknownpleasures.xml delete mode 100644 hacks/config/vermiculate.xml delete mode 100644 hacks/config/vfeedback.xml delete mode 100644 hacks/config/vidwhacker.xml delete mode 100644 hacks/config/vigilance.xml delete mode 100644 hacks/config/vines.xml delete mode 100644 hacks/config/voronoi.xml delete mode 100644 hacks/config/wander.xml delete mode 100644 hacks/config/webcollage.xml delete mode 100644 hacks/config/whirlwindwarp.xml delete mode 100644 hacks/config/whirlygig.xml delete mode 100644 hacks/config/winduprobot.xml delete mode 100644 hacks/config/worm.xml delete mode 100644 hacks/config/wormhole.xml delete mode 100644 hacks/config/xanalogtv.xml delete mode 100644 hacks/config/xflame.xml delete mode 100644 hacks/config/xjack.xml delete mode 100644 hacks/config/xlyap.xml delete mode 100644 hacks/config/xmatrix.xml delete mode 100644 hacks/config/xrayswarm.xml delete mode 100644 hacks/config/xspirograph.xml delete mode 100644 hacks/config/xss.dtd delete mode 100644 hacks/config/xss.xsd delete mode 100644 hacks/config/zoom.xml delete mode 100644 hacks/coral.c delete mode 100644 hacks/coral.man delete mode 100644 hacks/critical.c delete mode 100644 hacks/critical.man delete mode 100644 hacks/crystal.c delete mode 100644 hacks/crystal.man delete mode 100644 hacks/cwaves.c delete mode 100644 hacks/cwaves.man delete mode 100644 hacks/cynosure.c delete mode 100644 hacks/cynosure.man delete mode 100644 hacks/decayscreen.c delete mode 100644 hacks/decayscreen.man delete mode 100644 hacks/deco.c delete mode 100644 hacks/deco.man delete mode 100644 hacks/delaunay.c delete mode 100644 hacks/delaunay.h delete mode 100644 hacks/deluxe.c delete mode 100644 hacks/deluxe.man delete mode 100644 hacks/demon.c delete mode 100644 hacks/demon.man delete mode 100644 hacks/discrete.c delete mode 100644 hacks/discrete.man delete mode 100644 hacks/distort.c delete mode 100644 hacks/distort.man delete mode 100644 hacks/drift.c delete mode 100644 hacks/drift.man delete mode 100644 hacks/epicycle.c delete mode 100644 hacks/epicycle.man delete mode 100644 hacks/eruption.c delete mode 100644 hacks/eruption.man delete mode 100644 hacks/euler2d.c delete mode 100644 hacks/euler2d.man delete mode 100644 hacks/euler2d.tex delete mode 100644 hacks/fadeplot.c delete mode 100644 hacks/fadeplot.man delete mode 100644 hacks/fiberlamp.c delete mode 100644 hacks/fiberlamp.man delete mode 100644 hacks/filmleader.c delete mode 100644 hacks/filmleader.man delete mode 100644 hacks/fireworkx.c delete mode 100644 hacks/fireworkx.man delete mode 100644 hacks/flag.c delete mode 100644 hacks/flag.man delete mode 100644 hacks/flame.c delete mode 100644 hacks/flame.man delete mode 100644 hacks/flow.c delete mode 100644 hacks/flow.man delete mode 100644 hacks/fluidballs.c delete mode 100644 hacks/fluidballs.man delete mode 100644 hacks/fontglide.c delete mode 100644 hacks/fontglide.man delete mode 100644 hacks/fonts/Makefile.in delete mode 100644 hacks/fonts/OCRAStd.otf delete mode 100644 hacks/fonts/SpecialElite.ttf delete mode 100644 hacks/fonts/clacon.ttf delete mode 100644 hacks/fonts/gallant12x22.ttf delete mode 100644 hacks/fonts/luximr.ttf delete mode 100644 hacks/forest.c delete mode 100644 hacks/forest.man delete mode 100644 hacks/fps.c delete mode 100644 hacks/fps.h delete mode 100644 hacks/fpsI.h delete mode 100644 hacks/fuzzyflakes.c delete mode 100644 hacks/fuzzyflakes.man delete mode 100644 hacks/galaxy.c delete mode 100644 hacks/galaxy.man delete mode 100644 hacks/glitchpeg.c delete mode 100644 hacks/glitchpeg.man delete mode 100644 hacks/glx/Makefile.in delete mode 100644 hacks/glx/README delete mode 100644 hacks/glx/antinspect.c delete mode 100644 hacks/glx/antinspect.man delete mode 100644 hacks/glx/antmaze.c delete mode 100644 hacks/glx/antmaze.man delete mode 100644 hacks/glx/ants.h delete mode 100644 hacks/glx/antspotlight.c delete mode 100644 hacks/glx/antspotlight.man delete mode 100644 hacks/glx/atlantis.c delete mode 100644 hacks/glx/atlantis.h delete mode 100644 hacks/glx/atlantis.man delete mode 100644 hacks/glx/atunnel.c delete mode 100644 hacks/glx/atunnel.man delete mode 100644 hacks/glx/b_draw.c delete mode 100644 hacks/glx/b_lockglue.c delete mode 100644 hacks/glx/b_sphere.c delete mode 100644 hacks/glx/beats.c delete mode 100644 hacks/glx/beats.man delete mode 100644 hacks/glx/blinkbox.c delete mode 100644 hacks/glx/blinkbox.man delete mode 100644 hacks/glx/blocktube.c delete mode 100644 hacks/glx/blocktube.man delete mode 100644 hacks/glx/boing.c delete mode 100644 hacks/glx/boing.man delete mode 100644 hacks/glx/bouncingcow.c delete mode 100644 hacks/glx/bouncingcow.man delete mode 100644 hacks/glx/boxed.c delete mode 100644 hacks/glx/boxed.h delete mode 100644 hacks/glx/boxed.man delete mode 100644 hacks/glx/bubble3d.c delete mode 100644 hacks/glx/bubble3d.h delete mode 100644 hacks/glx/bubble3d.man delete mode 100644 hacks/glx/buildlwo.c delete mode 100644 hacks/glx/buildlwo.h delete mode 100644 hacks/glx/cage.c delete mode 100644 hacks/glx/cage.man delete mode 100644 hacks/glx/carousel.c delete mode 100644 hacks/glx/carousel.man delete mode 100644 hacks/glx/chessgames.h delete mode 100644 hacks/glx/chessmodels.c delete mode 100644 hacks/glx/chessmodels.h delete mode 100644 hacks/glx/circuit.c delete mode 100644 hacks/glx/circuit.man delete mode 100644 hacks/glx/cityflow.c delete mode 100644 hacks/glx/cityflow.man delete mode 100644 hacks/glx/companion.c delete mode 100644 hacks/glx/companion_disc.c delete mode 100644 hacks/glx/companion_heart.c delete mode 100644 hacks/glx/companion_quad.c delete mode 100644 hacks/glx/companioncube.man delete mode 100644 hacks/glx/covid19.c delete mode 100644 hacks/glx/covid19.man delete mode 100644 hacks/glx/cow_face.c delete mode 100644 hacks/glx/cow_hide.c delete mode 100644 hacks/glx/cow_hoofs.c delete mode 100644 hacks/glx/cow_horns.c delete mode 100644 hacks/glx/cow_tail.c delete mode 100644 hacks/glx/cow_udder.c delete mode 100644 hacks/glx/crackberg.c delete mode 100644 hacks/glx/crackberg.man delete mode 100644 hacks/glx/crumbler.c delete mode 100644 hacks/glx/crumbler.man delete mode 100644 hacks/glx/cube21.c delete mode 100644 hacks/glx/cube21.man delete mode 100644 hacks/glx/cubenetic.c delete mode 100644 hacks/glx/cubenetic.man delete mode 100644 hacks/glx/cubestack.c delete mode 100644 hacks/glx/cubestack.man delete mode 100644 hacks/glx/cubestorm.c delete mode 100644 hacks/glx/cubestorm.man delete mode 100644 hacks/glx/cubetwist.c delete mode 100644 hacks/glx/cubetwist.man delete mode 100644 hacks/glx/cubicgrid.c delete mode 100644 hacks/glx/cubicgrid.man delete mode 100644 hacks/glx/curlicue.h delete mode 100644 hacks/glx/dangerball.c delete mode 100644 hacks/glx/dangerball.man delete mode 100644 hacks/glx/deepstars.c delete mode 100644 hacks/glx/deepstars.man delete mode 100644 hacks/glx/discoball.c delete mode 100644 hacks/glx/discoball.man delete mode 100644 hacks/glx/dnalogo.c delete mode 100644 hacks/glx/dnapizza.h delete mode 100644 hacks/glx/dolphin.c delete mode 100644 hacks/glx/dropshadow.c delete mode 100644 hacks/glx/dropshadow.h delete mode 100755 hacks/glx/dxf2gl.pl delete mode 100644 hacks/glx/dymaxionmap-coords.c delete mode 100644 hacks/glx/dymaxionmap-coords.h delete mode 100644 hacks/glx/dymaxionmap.c delete mode 100644 hacks/glx/dymaxionmap.man delete mode 100644 hacks/glx/e_textures.h delete mode 100644 hacks/glx/endgame.c delete mode 100644 hacks/glx/endgame.man delete mode 100644 hacks/glx/energystream.c delete mode 100644 hacks/glx/energystream.man delete mode 100644 hacks/glx/engine.c delete mode 100644 hacks/glx/engine.man delete mode 100644 hacks/glx/erase-gl.c delete mode 100644 hacks/glx/esper.c delete mode 100644 hacks/glx/esper.man delete mode 100644 hacks/glx/etruscanvenus.c delete mode 100644 hacks/glx/etruscanvenus.man delete mode 100644 hacks/glx/extrusion-helix2.c delete mode 100644 hacks/glx/extrusion-helix3.c delete mode 100644 hacks/glx/extrusion-helix4.c delete mode 100644 hacks/glx/extrusion-joinoffset.c delete mode 100644 hacks/glx/extrusion-screw.c delete mode 100644 hacks/glx/extrusion-taper.c delete mode 100644 hacks/glx/extrusion-twistoid.c delete mode 100644 hacks/glx/extrusion.c delete mode 100644 hacks/glx/extrusion.h delete mode 100644 hacks/glx/extrusion.man delete mode 100644 hacks/glx/flipflop.c delete mode 100644 hacks/glx/flipflop.man delete mode 100644 hacks/glx/flipscreen3d.c delete mode 100644 hacks/glx/flipscreen3d.man delete mode 100644 hacks/glx/fliptext.c delete mode 100644 hacks/glx/fliptext.man delete mode 100644 hacks/glx/flurry-smoke.c delete mode 100644 hacks/glx/flurry-spark.c delete mode 100644 hacks/glx/flurry-star.c delete mode 100644 hacks/glx/flurry-texture.c delete mode 100644 hacks/glx/flurry.c delete mode 100644 hacks/glx/flurry.h delete mode 100644 hacks/glx/flurry.man delete mode 100644 hacks/glx/flyingtoasters.c delete mode 100644 hacks/glx/flyingtoasters.man delete mode 100644 hacks/glx/fps-gl.c delete mode 100644 hacks/glx/gears.c delete mode 100644 hacks/glx/gears.man delete mode 100644 hacks/glx/geodesic.c delete mode 100644 hacks/glx/geodesic.man delete mode 100644 hacks/glx/geodesicgears.c delete mode 100644 hacks/glx/geodesicgears.man delete mode 100644 hacks/glx/gflux.c delete mode 100644 hacks/glx/gflux.man delete mode 100644 hacks/glx/gibson.c delete mode 100644 hacks/glx/gibson.man delete mode 100644 hacks/glx/glblur.c delete mode 100644 hacks/glx/glblur.man delete mode 100644 hacks/glx/glcells.c delete mode 100644 hacks/glx/glcells.man delete mode 100644 hacks/glx/gleidescope.c delete mode 100644 hacks/glx/gleidescope.man delete mode 100644 hacks/glx/glforestfire.c delete mode 100644 hacks/glx/glforestfire.man delete mode 100644 hacks/glx/glhanoi.c delete mode 100644 hacks/glx/glhanoi.man delete mode 100644 hacks/glx/glknots.c delete mode 100644 hacks/glx/glknots.man delete mode 100644 hacks/glx/gllist.c delete mode 100644 hacks/glx/gllist.h delete mode 100644 hacks/glx/glmatrix.c delete mode 100644 hacks/glx/glmatrix.man delete mode 100644 hacks/glx/glplanet.c delete mode 100644 hacks/glx/glplanet.man delete mode 100644 hacks/glx/glschool.c delete mode 100644 hacks/glx/glschool.h delete mode 100644 hacks/glx/glschool.man delete mode 100644 hacks/glx/glschool_alg.c delete mode 100644 hacks/glx/glschool_alg.h delete mode 100644 hacks/glx/glschool_gl.c delete mode 100644 hacks/glx/glschool_gl.h delete mode 100644 hacks/glx/glsl-utils.c delete mode 100644 hacks/glx/glsl-utils.h delete mode 100644 hacks/glx/glslideshow.c delete mode 100644 hacks/glx/glslideshow.man delete mode 100644 hacks/glx/glsnake.c delete mode 100644 hacks/glx/glsnake.man delete mode 100644 hacks/glx/gltext.c delete mode 100644 hacks/glx/gltext.man delete mode 100644 hacks/glx/gltrackball.c delete mode 100644 hacks/glx/gltrackball.h delete mode 100644 hacks/glx/glut_mroman.h delete mode 100644 hacks/glx/glut_roman.h delete mode 100644 hacks/glx/glut_stroke.c delete mode 100644 hacks/glx/glut_swidth.c delete mode 100644 hacks/glx/glutstroke.h delete mode 100644 hacks/glx/grab-ximage.c delete mode 100644 hacks/glx/grab-ximage.h delete mode 100644 hacks/glx/gravitywell.c delete mode 100644 hacks/glx/gravitywell.man delete mode 100644 hacks/glx/handsy.c delete mode 100644 hacks/glx/handsy.dxf delete mode 100644 hacks/glx/handsy.man delete mode 100644 hacks/glx/handsy_anim.h delete mode 100644 hacks/glx/handsy_model.c delete mode 100644 hacks/glx/headroom.c delete mode 100644 hacks/glx/headroom.dxf delete mode 100644 hacks/glx/headroom.man delete mode 100644 hacks/glx/headroom_model.c delete mode 100644 hacks/glx/hexstrut.c delete mode 100644 hacks/glx/hexstrut.man delete mode 100644 hacks/glx/hilbert.c delete mode 100644 hacks/glx/hilbert.man delete mode 100644 hacks/glx/hydrostat.c delete mode 100644 hacks/glx/hydrostat.man delete mode 100644 hacks/glx/hypertorus.c delete mode 100644 hacks/glx/hypertorus.man delete mode 100644 hacks/glx/hypnowheel.c delete mode 100644 hacks/glx/hypnowheel.man delete mode 100644 hacks/glx/involute.c delete mode 100644 hacks/glx/involute.h delete mode 100644 hacks/glx/jigglypuff.c delete mode 100644 hacks/glx/jigglypuff.man delete mode 100644 hacks/glx/jigsaw.c delete mode 100644 hacks/glx/jigsaw.man delete mode 100644 hacks/glx/juggler3d.c delete mode 100644 hacks/glx/juggler3d.man delete mode 100644 hacks/glx/kaleidocycle.c delete mode 100644 hacks/glx/kaleidocycle.man delete mode 100644 hacks/glx/klein.c delete mode 100644 hacks/glx/klein.man delete mode 100644 hacks/glx/lament.c delete mode 100644 hacks/glx/lament.dxf delete mode 100644 hacks/glx/lament.man delete mode 100644 hacks/glx/lament_model.c delete mode 100644 hacks/glx/lavalite.c delete mode 100644 hacks/glx/lavalite.man delete mode 100644 hacks/glx/lockward.c delete mode 100644 hacks/glx/lockward.man delete mode 100644 hacks/glx/marching.c delete mode 100644 hacks/glx/marching.h delete mode 100755 hacks/glx/maze3d.c delete mode 100644 hacks/glx/maze3d.man delete mode 100644 hacks/glx/menger.c delete mode 100644 hacks/glx/menger.man delete mode 100644 hacks/glx/mirrorblob.c delete mode 100644 hacks/glx/mirrorblob.man delete mode 100644 hacks/glx/moebius.c delete mode 100644 hacks/glx/moebius.man delete mode 100644 hacks/glx/moebiusgears.c delete mode 100644 hacks/glx/moebiusgears.man delete mode 100644 hacks/glx/molecule.c delete mode 100644 hacks/glx/molecule.man delete mode 100755 hacks/glx/molecules.sh delete mode 100644 hacks/glx/morph3d.c delete mode 100644 hacks/glx/morph3d.man delete mode 100644 hacks/glx/noof.c delete mode 100644 hacks/glx/noof.man delete mode 100644 hacks/glx/normals.c delete mode 100644 hacks/glx/normals.h delete mode 100644 hacks/glx/peepers.c delete mode 100644 hacks/glx/peepers.man delete mode 100644 hacks/glx/photopile.c delete mode 100644 hacks/glx/photopile.man delete mode 100644 hacks/glx/pinion.c delete mode 100644 hacks/glx/pinion.man delete mode 100644 hacks/glx/pipeobjs.c delete mode 100644 hacks/glx/pipes.c delete mode 100644 hacks/glx/pipes.man delete mode 100644 hacks/glx/polyhedra-gl.c delete mode 100644 hacks/glx/polyhedra.c delete mode 100644 hacks/glx/polyhedra.h delete mode 100644 hacks/glx/polyhedra.man delete mode 100644 hacks/glx/polytopes.c delete mode 100644 hacks/glx/polytopes.man delete mode 100644 hacks/glx/projectiveplane.c delete mode 100644 hacks/glx/projectiveplane.man delete mode 100644 hacks/glx/providence.c delete mode 100644 hacks/glx/providence.man delete mode 100644 hacks/glx/pulsar.c delete mode 100644 hacks/glx/pulsar.man delete mode 100644 hacks/glx/quasicrystal.c delete mode 100644 hacks/glx/quasicrystal.man delete mode 100644 hacks/glx/queens.c delete mode 100644 hacks/glx/queens.man delete mode 100644 hacks/glx/quickhull.c delete mode 100644 hacks/glx/quickhull.h delete mode 100644 hacks/glx/raverhoop.c delete mode 100644 hacks/glx/raverhoop.man delete mode 100644 hacks/glx/razzledazzle.c delete mode 100644 hacks/glx/razzledazzle.man delete mode 100644 hacks/glx/robot-wireframe.c delete mode 100644 hacks/glx/robot-wireframe.dxf delete mode 100644 hacks/glx/robot.c delete mode 100644 hacks/glx/robot.dxf delete mode 100644 hacks/glx/romanboy.c delete mode 100644 hacks/glx/romanboy.man delete mode 100644 hacks/glx/rotator.c delete mode 100644 hacks/glx/rotator.h delete mode 100644 hacks/glx/rubik.c delete mode 100644 hacks/glx/rubik.man delete mode 100644 hacks/glx/rubikblocks.c delete mode 100644 hacks/glx/rubikblocks.man delete mode 100644 hacks/glx/s1_1.c delete mode 100644 hacks/glx/s1_2.c delete mode 100644 hacks/glx/s1_3.c delete mode 100644 hacks/glx/s1_4.c delete mode 100644 hacks/glx/s1_5.c delete mode 100644 hacks/glx/s1_6.c delete mode 100644 hacks/glx/s1_b.c delete mode 100644 hacks/glx/sballs.c delete mode 100644 hacks/glx/sballs.man delete mode 100644 hacks/glx/seccam.c delete mode 100644 hacks/glx/seccam.dxf delete mode 100644 hacks/glx/shark.c delete mode 100644 hacks/glx/ships.c delete mode 100644 hacks/glx/ships.dxf delete mode 100644 hacks/glx/sierpinski3d.c delete mode 100644 hacks/glx/sierpinski3d.man delete mode 100644 hacks/glx/skytentacles.c delete mode 100644 hacks/glx/skytentacles.man delete mode 100644 hacks/glx/sonar-icmp.c delete mode 100644 hacks/glx/sonar-sim.c delete mode 100644 hacks/glx/sonar.c delete mode 100644 hacks/glx/sonar.h delete mode 100644 hacks/glx/sonar.man delete mode 100644 hacks/glx/sphere.c delete mode 100644 hacks/glx/sphere.h delete mode 100644 hacks/glx/sphereeversion.c delete mode 100644 hacks/glx/sphereeversion.man delete mode 100644 hacks/glx/spheremonics.c delete mode 100644 hacks/glx/spheremonics.man delete mode 100644 hacks/glx/splitflap.c delete mode 100644 hacks/glx/splitflap.dxf delete mode 100644 hacks/glx/splitflap.man delete mode 100644 hacks/glx/splitflap_obj.c delete mode 100644 hacks/glx/splodesic.c delete mode 100644 hacks/glx/splodesic.man delete mode 100644 hacks/glx/sproingies.c delete mode 100644 hacks/glx/sproingies.h delete mode 100644 hacks/glx/sproingies.man delete mode 100644 hacks/glx/sproingiewrap.c delete mode 100644 hacks/glx/stairs.c delete mode 100644 hacks/glx/stairs.man delete mode 100644 hacks/glx/starwars.c delete mode 100644 hacks/glx/starwars.h delete mode 100644 hacks/glx/starwars.man delete mode 100644 hacks/glx/starwars.txt delete mode 100644 hacks/glx/stonerview-move.c delete mode 100644 hacks/glx/stonerview-move.h delete mode 100644 hacks/glx/stonerview-osc.c delete mode 100644 hacks/glx/stonerview-osc.h delete mode 100644 hacks/glx/stonerview-view.c delete mode 100644 hacks/glx/stonerview.c delete mode 100644 hacks/glx/stonerview.h delete mode 100644 hacks/glx/stonerview.man delete mode 100644 hacks/glx/superquadrics.c delete mode 100644 hacks/glx/superquadrics.man delete mode 100644 hacks/glx/surfaces.c delete mode 100644 hacks/glx/surfaces.man delete mode 100644 hacks/glx/swim.c delete mode 100644 hacks/glx/tangram.c delete mode 100644 hacks/glx/tangram.man delete mode 100644 hacks/glx/tangram_shapes.c delete mode 100644 hacks/glx/tangram_shapes.h delete mode 100644 hacks/glx/teapot.c delete mode 100644 hacks/glx/teapot.h delete mode 100644 hacks/glx/teapot2.h delete mode 100644 hacks/glx/texfont.c delete mode 100644 hacks/glx/texfont.h delete mode 100644 hacks/glx/timetunnel.c delete mode 100644 hacks/glx/timetunnel.man delete mode 100644 hacks/glx/toast.c delete mode 100644 hacks/glx/toast.dxf delete mode 100644 hacks/glx/toast2.c delete mode 100644 hacks/glx/toast2.dxf delete mode 100644 hacks/glx/toaster.c delete mode 100644 hacks/glx/toaster.dxf delete mode 100644 hacks/glx/toaster_base.c delete mode 100644 hacks/glx/toaster_base.dxf delete mode 100644 hacks/glx/toaster_handle.c delete mode 100644 hacks/glx/toaster_handle.dxf delete mode 100644 hacks/glx/toaster_handle2.c delete mode 100644 hacks/glx/toaster_handle2.dxf delete mode 100644 hacks/glx/toaster_jet.c delete mode 100644 hacks/glx/toaster_jet.dxf delete mode 100644 hacks/glx/toaster_knob.c delete mode 100644 hacks/glx/toaster_knob.dxf delete mode 100644 hacks/glx/toaster_slots.c delete mode 100644 hacks/glx/toaster_slots.dxf delete mode 100644 hacks/glx/toaster_wing.c delete mode 100644 hacks/glx/toaster_wing.dxf delete mode 100644 hacks/glx/topblock.c delete mode 100644 hacks/glx/topblock.h delete mode 100644 hacks/glx/topblock.man delete mode 100644 hacks/glx/trackball.c delete mode 100644 hacks/glx/trackball.h delete mode 100644 hacks/glx/tronbit.c delete mode 100644 hacks/glx/tronbit.man delete mode 100644 hacks/glx/tronbit_idle1.c delete mode 100644 hacks/glx/tronbit_idle2.c delete mode 100644 hacks/glx/tronbit_no.c delete mode 100644 hacks/glx/tronbit_yes.c delete mode 100644 hacks/glx/tube.c delete mode 100644 hacks/glx/tube.h delete mode 100644 hacks/glx/tunnel_draw.c delete mode 100644 hacks/glx/tunnel_draw.h delete mode 100644 hacks/glx/unicrud.c delete mode 100644 hacks/glx/unicrud.man delete mode 100644 hacks/glx/unknownpleasures.c delete mode 100644 hacks/glx/unknownpleasures.man delete mode 100644 hacks/glx/vigilance.c delete mode 100644 hacks/glx/vigilance.man delete mode 100644 hacks/glx/voronoi.c delete mode 100644 hacks/glx/voronoi.man delete mode 100755 hacks/glx/vrml2gl.pl delete mode 100755 hacks/glx/wfront2gl.pl delete mode 100644 hacks/glx/whale.c delete mode 100644 hacks/glx/winduprobot.c delete mode 100644 hacks/glx/winduprobot.man delete mode 100644 hacks/glx/xlock-gl-utils.c delete mode 100644 hacks/glx/xscreensaver-gl-helper.c delete mode 100644 hacks/glx/xscreensaver-gl-helper.man delete mode 100644 hacks/glx/xscreensaver-gl-visual.c delete mode 100644 hacks/glx/xscreensaver-gl-visual.man delete mode 100644 hacks/glx/zalgo.txt delete mode 100644 hacks/goop.c delete mode 100644 hacks/goop.man delete mode 100644 hacks/grav.c delete mode 100644 hacks/grav.man delete mode 100644 hacks/greynetic.c delete mode 100644 hacks/greynetic.man delete mode 100644 hacks/halftone.c delete mode 100644 hacks/halftone.man delete mode 100644 hacks/halo.c delete mode 100644 hacks/halo.man delete mode 100644 hacks/helix.c delete mode 100644 hacks/helix.man delete mode 100644 hacks/hexadrop.c delete mode 100644 hacks/hexadrop.man delete mode 100644 hacks/hopalong.c delete mode 100644 hacks/hopalong.man delete mode 100644 hacks/hyperball.c delete mode 100644 hacks/hyperball.man delete mode 100644 hacks/hypercube.c delete mode 100644 hacks/hypercube.man delete mode 100644 hacks/ifs.c delete mode 100644 hacks/ifs.man delete mode 100644 hacks/images/6x10font.png delete mode 100644 hacks/images/Makefile delete mode 100644 hacks/images/Makefile.in delete mode 100644 hacks/images/amiga.png delete mode 100644 hacks/images/android.png delete mode 100644 hacks/images/apple.png delete mode 100644 hacks/images/apple2font.png delete mode 100644 hacks/images/atari.png delete mode 100644 hacks/images/atm.png delete mode 100644 hacks/images/blocktube.png delete mode 100644 hacks/images/bob.png delete mode 100644 hacks/images/brick1.png delete mode 100644 hacks/images/brick2.png delete mode 100644 hacks/images/bubbles/blood.pov delete mode 100644 hacks/images/bubbles/blood1.png delete mode 100644 hacks/images/bubbles/blood10.png delete mode 100644 hacks/images/bubbles/blood11.png delete mode 100644 hacks/images/bubbles/blood2.png delete mode 100644 hacks/images/bubbles/blood3.png delete mode 100644 hacks/images/bubbles/blood4.png delete mode 100644 hacks/images/bubbles/blood5.png delete mode 100644 hacks/images/bubbles/blood6.png delete mode 100644 hacks/images/bubbles/blood7.png delete mode 100644 hacks/images/bubbles/blood8.png delete mode 100644 hacks/images/bubbles/blood9.png delete mode 100644 hacks/images/bubbles/blue.pov delete mode 100644 hacks/images/bubbles/blue1.png delete mode 100644 hacks/images/bubbles/blue10.png delete mode 100644 hacks/images/bubbles/blue11.png delete mode 100644 hacks/images/bubbles/blue2.png delete mode 100644 hacks/images/bubbles/blue3.png delete mode 100644 hacks/images/bubbles/blue4.png delete mode 100644 hacks/images/bubbles/blue5.png delete mode 100644 hacks/images/bubbles/blue6.png delete mode 100644 hacks/images/bubbles/blue7.png delete mode 100644 hacks/images/bubbles/blue8.png delete mode 100644 hacks/images/bubbles/blue9.png delete mode 100644 hacks/images/bubbles/glass.pov delete mode 100644 hacks/images/bubbles/glass1.png delete mode 100644 hacks/images/bubbles/glass10.png delete mode 100644 hacks/images/bubbles/glass11.png delete mode 100644 hacks/images/bubbles/glass2.png delete mode 100644 hacks/images/bubbles/glass3.png delete mode 100644 hacks/images/bubbles/glass4.png delete mode 100644 hacks/images/bubbles/glass5.png delete mode 100644 hacks/images/bubbles/glass6.png delete mode 100644 hacks/images/bubbles/glass7.png delete mode 100644 hacks/images/bubbles/glass8.png delete mode 100644 hacks/images/bubbles/glass9.png delete mode 100644 hacks/images/bubbles/jade.pov delete mode 100644 hacks/images/bubbles/jade1.png delete mode 100644 hacks/images/bubbles/jade10.png delete mode 100644 hacks/images/bubbles/jade11.png delete mode 100644 hacks/images/bubbles/jade2.png delete mode 100644 hacks/images/bubbles/jade3.png delete mode 100644 hacks/images/bubbles/jade4.png delete mode 100644 hacks/images/bubbles/jade5.png delete mode 100644 hacks/images/bubbles/jade6.png delete mode 100644 hacks/images/bubbles/jade7.png delete mode 100644 hacks/images/bubbles/jade8.png delete mode 100644 hacks/images/bubbles/jade9.png delete mode 100644 hacks/images/chromesphere.png delete mode 100644 hacks/images/dvd.png delete mode 100644 hacks/images/earth.png delete mode 100644 hacks/images/earth_flat.png delete mode 100644 hacks/images/earth_night.png delete mode 100644 hacks/images/gnome1.png delete mode 100644 hacks/images/gnome2.png delete mode 100644 hacks/images/ground.png delete mode 100644 hacks/images/hmac.png delete mode 100644 hacks/images/iris.png delete mode 100644 hacks/images/jigglymap.png delete mode 100644 hacks/images/lament512.png delete mode 100644 hacks/images/logo-180.png delete mode 100644 hacks/images/logo-32.png delete mode 100644 hacks/images/logo-360.png delete mode 100644 hacks/images/logo-50.png delete mode 100644 hacks/images/m6502/amiga.asm delete mode 100644 hacks/images/m6502/breakout.asm delete mode 100644 hacks/images/m6502/byterun.asm delete mode 100644 hacks/images/m6502/cellular-30.asm delete mode 100644 hacks/images/m6502/cellular-600.asm delete mode 100644 hacks/images/m6502/colors.asm delete mode 100644 hacks/images/m6502/crunch6502.asm delete mode 100644 hacks/images/m6502/demoscene.asm delete mode 100644 hacks/images/m6502/disco.asm delete mode 100644 hacks/images/m6502/dmsc.asm delete mode 100644 hacks/images/m6502/dmsc.txt delete mode 100644 hacks/images/m6502/dragon-fractal.asm delete mode 100644 hacks/images/m6502/fullscreenlogo.asm delete mode 100644 hacks/images/m6502/greynetic.asm delete mode 100644 hacks/images/m6502/keftal.asm delete mode 100644 hacks/images/m6502/life.asm delete mode 100644 hacks/images/m6502/lines.asm delete mode 100644 hacks/images/m6502/matrix.asm delete mode 100644 hacks/images/m6502/noise.asm delete mode 100644 hacks/images/m6502/random-walk.asm delete mode 100644 hacks/images/m6502/random.asm delete mode 100644 hacks/images/m6502/random2.asm delete mode 100644 hacks/images/m6502/rorschach.asm delete mode 100644 hacks/images/m6502/santa.asm delete mode 100644 hacks/images/m6502/selfmodify.asm delete mode 100644 hacks/images/m6502/sflake.asm delete mode 100644 hacks/images/m6502/sierpinski.asm delete mode 100644 hacks/images/m6502/sierpinsky.asm delete mode 100644 hacks/images/m6502/softsprite.asm delete mode 100644 hacks/images/m6502/spacer.asm delete mode 100644 hacks/images/m6502/starfield2d.asm delete mode 100644 hacks/images/m6502/texture.asm delete mode 100644 hacks/images/m6502/wave6502.asm delete mode 100644 hacks/images/m6502/zookeeper.asm delete mode 100644 hacks/images/mac.png delete mode 100644 hacks/images/macbomb.png delete mode 100644 hacks/images/matrix1.png delete mode 100644 hacks/images/matrix1b.png delete mode 100644 hacks/images/matrix2.png delete mode 100644 hacks/images/matrix2b.png delete mode 100644 hacks/images/matrix3.png delete mode 100644 hacks/images/molecules/adenine.pdb delete mode 100644 hacks/images/molecules/adrenochrome.pdb delete mode 100644 hacks/images/molecules/bucky.pdb delete mode 100644 hacks/images/molecules/caffeine.pdb delete mode 100644 hacks/images/molecules/capsaicin.pdb delete mode 100644 hacks/images/molecules/chlordecone.pdb delete mode 100644 hacks/images/molecules/cocaine.pdb delete mode 100644 hacks/images/molecules/codeine.pdb delete mode 100644 hacks/images/molecules/cyclohexane.pdb delete mode 100644 hacks/images/molecules/cytosine.pdb delete mode 100644 hacks/images/molecules/dna.pdb delete mode 100644 hacks/images/molecules/dodecahedrane.pdb delete mode 100644 hacks/images/molecules/dthc.pdb delete mode 100644 hacks/images/molecules/dynamite.pdb delete mode 100644 hacks/images/molecules/glycol.pdb delete mode 100644 hacks/images/molecules/guanine.pdb delete mode 100644 hacks/images/molecules/heroin.pdb delete mode 100644 hacks/images/molecules/hexahelicene.pdb delete mode 100644 hacks/images/molecules/ibuprofen.pdb delete mode 100644 hacks/images/molecules/lsd.pdb delete mode 100644 hacks/images/molecules/menthol.pdb delete mode 100644 hacks/images/molecules/mescaline.pdb delete mode 100644 hacks/images/molecules/methamphetamine.pdb delete mode 100644 hacks/images/molecules/morphine.pdb delete mode 100644 hacks/images/molecules/nicotine.pdb delete mode 100644 hacks/images/molecules/novocaine.pdb delete mode 100644 hacks/images/molecules/olestra.pdb delete mode 100644 hacks/images/molecules/penicillin.pdb delete mode 100644 hacks/images/molecules/salvinorin.pdb delete mode 100644 hacks/images/molecules/sarin.pdb delete mode 100644 hacks/images/molecules/strychnine.pdb delete mode 100644 hacks/images/molecules/sucrose.pdb delete mode 100644 hacks/images/molecules/thalidomide.pdb delete mode 100644 hacks/images/molecules/thymine.pdb delete mode 100644 hacks/images/molecules/viagra.pdb delete mode 100644 hacks/images/molecules/vitaminb6.pdb delete mode 100644 hacks/images/molecules/vitaminc.pdb delete mode 100644 hacks/images/molecules/vx.pdb delete mode 100644 hacks/images/noseguy/nose-f1.png delete mode 100644 hacks/images/noseguy/nose-f2.png delete mode 100644 hacks/images/noseguy/nose-f3.png delete mode 100644 hacks/images/noseguy/nose-f4.png delete mode 100644 hacks/images/noseguy/nose-l1.png delete mode 100644 hacks/images/noseguy/nose-l2.png delete mode 100644 hacks/images/noseguy/nose-r1.png delete mode 100644 hacks/images/noseguy/nose-r2.png delete mode 100644 hacks/images/osx_10_2.png delete mode 100644 hacks/images/osx_10_3.png delete mode 100644 hacks/images/pacman.png delete mode 100644 hacks/images/ransomware.png delete mode 100644 hacks/images/sball-bg.png delete mode 100644 hacks/images/sball.png delete mode 100644 hacks/images/scales.png delete mode 100644 hacks/images/sclera.png delete mode 100644 hacks/images/sea-texture.png delete mode 100644 hacks/images/som.png delete mode 100644 hacks/images/start.png delete mode 100644 hacks/images/sun.png delete mode 100644 hacks/images/testcard_bbcf.png delete mode 100644 hacks/images/testcard_pm5544.png delete mode 100644 hacks/images/testcard_rca.png delete mode 100644 hacks/images/timetunnel0.png delete mode 100644 hacks/images/timetunnel1.png delete mode 100644 hacks/images/timetunnel2.png delete mode 100644 hacks/images/toast.png delete mode 100644 hacks/images/tree.png delete mode 100644 hacks/images/tunnel0.png delete mode 100644 hacks/images/tunnel1.png delete mode 100644 hacks/images/tunnel2.png delete mode 100644 hacks/images/tunnel3.png delete mode 100644 hacks/images/tunnel4.png delete mode 100644 hacks/images/tunnel5.png delete mode 100644 hacks/images/tunnelstar.png delete mode 100644 hacks/images/win10_spinner.gif delete mode 100644 hacks/images/wood.png delete mode 100644 hacks/images/wood2.png delete mode 100644 hacks/imsmap.c delete mode 100644 hacks/imsmap.man delete mode 100644 hacks/interaggregate.c delete mode 100644 hacks/interaggregate.man delete mode 100644 hacks/interference.c delete mode 100644 hacks/interference.man delete mode 100644 hacks/intermomentary.c delete mode 100644 hacks/intermomentary.man delete mode 100644 hacks/juggle.c delete mode 100644 hacks/juggle.man delete mode 100644 hacks/julia.c delete mode 100644 hacks/julia.man delete mode 100644 hacks/kaleidescope.c delete mode 100644 hacks/kaleidescope.man delete mode 100644 hacks/kumppa.c delete mode 100644 hacks/kumppa.man delete mode 100644 hacks/laser.c delete mode 100644 hacks/laser.man delete mode 100644 hacks/lcdscrub.c delete mode 100644 hacks/lcdscrub.man delete mode 100644 hacks/lightning.c delete mode 100644 hacks/lightning.man delete mode 100644 hacks/link_axp.com delete mode 100644 hacks/link_decc.com delete mode 100644 hacks/lisa.c delete mode 100644 hacks/lisa.man delete mode 100644 hacks/lissie.c delete mode 100644 hacks/lissie.man delete mode 100755 hacks/ljlatest delete mode 100644 hacks/ljlatest.man delete mode 100644 hacks/lmorph.c delete mode 100644 hacks/lmorph.man delete mode 100644 hacks/loop.c delete mode 100644 hacks/loop.man delete mode 100644 hacks/m6502.c delete mode 100755 hacks/m6502.sh delete mode 100644 hacks/maze.c delete mode 100644 hacks/maze.man delete mode 100644 hacks/memscroller.c delete mode 100644 hacks/memscroller.man delete mode 100644 hacks/metaballs.c delete mode 100644 hacks/metaballs.man delete mode 100644 hacks/moire.c delete mode 100644 hacks/moire.man delete mode 100644 hacks/moire2.c delete mode 100644 hacks/moire2.man delete mode 100644 hacks/mountain.c delete mode 100644 hacks/mountain.man delete mode 100644 hacks/munch.c delete mode 100644 hacks/munch.man delete mode 100755 hacks/munge-ad.pl delete mode 100644 hacks/nerverot.c delete mode 100644 hacks/nerverot.man delete mode 100644 hacks/noseguy.c delete mode 100644 hacks/noseguy.man delete mode 100644 hacks/pacman.c delete mode 100644 hacks/pacman.h delete mode 100644 hacks/pacman.man delete mode 100644 hacks/pacman_ai.c delete mode 100644 hacks/pacman_ai.h delete mode 100644 hacks/pacman_level.c delete mode 100644 hacks/pacman_level.h delete mode 100644 hacks/pedal.c delete mode 100644 hacks/pedal.man delete mode 100644 hacks/penetrate.c delete mode 100644 hacks/penetrate.man delete mode 100644 hacks/penrose.c delete mode 100644 hacks/penrose.man delete mode 100644 hacks/petri.c delete mode 100644 hacks/petri.man delete mode 100644 hacks/phosphor.c delete mode 100644 hacks/phosphor.man delete mode 100644 hacks/piecewise.c delete mode 100644 hacks/piecewise.man delete mode 100644 hacks/polyominoes.c delete mode 100644 hacks/polyominoes.man delete mode 100644 hacks/pong.c delete mode 100644 hacks/pong.man delete mode 100644 hacks/popsquares.c delete mode 100644 hacks/pyro.c delete mode 100644 hacks/pyro.man delete mode 100644 hacks/qix.c delete mode 100644 hacks/qix.man delete mode 100644 hacks/rd-bomb.c delete mode 100644 hacks/rd-bomb.man delete mode 100644 hacks/recanim.c delete mode 100644 hacks/recanim.h delete mode 100644 hacks/ripples.c delete mode 100644 hacks/ripples.man delete mode 100644 hacks/rocks.c delete mode 100644 hacks/rocks.man delete mode 100644 hacks/rorschach.c delete mode 100644 hacks/rorschach.man delete mode 100644 hacks/rotor.c delete mode 100644 hacks/rotor.man delete mode 100644 hacks/rotzoomer.c delete mode 100644 hacks/rotzoomer.man delete mode 100644 hacks/scooter.c delete mode 100644 hacks/scooter.man delete mode 100644 hacks/screenhack.c delete mode 100644 hacks/screenhack.h delete mode 100644 hacks/screenhackI.h delete mode 100644 hacks/shadebobs.c delete mode 100644 hacks/shadebobs.man delete mode 100644 hacks/sierpinski.c delete mode 100644 hacks/sierpinski.man delete mode 100644 hacks/slidescreen.c delete mode 100644 hacks/slidescreen.man delete mode 100644 hacks/slip.c delete mode 100644 hacks/slip.man delete mode 100644 hacks/speedmine.c delete mode 100644 hacks/speedmine.man delete mode 100644 hacks/sphere.c delete mode 100644 hacks/sphere.man delete mode 100644 hacks/spiral.c delete mode 100644 hacks/spiral.man delete mode 100644 hacks/spotlight.c delete mode 100644 hacks/spotlight.man delete mode 100644 hacks/squiral.c delete mode 100644 hacks/squiral.man delete mode 100644 hacks/starfish.c delete mode 100644 hacks/starfish.man delete mode 100644 hacks/strange.c delete mode 100644 hacks/strange.man delete mode 100644 hacks/substrate.c delete mode 100644 hacks/substrate.man delete mode 100644 hacks/swirl.c delete mode 100644 hacks/swirl.man delete mode 100644 hacks/t3d.c delete mode 100644 hacks/t3d.man delete mode 100644 hacks/tessellimage.c delete mode 100644 hacks/tessellimage.man delete mode 100644 hacks/testx11.c delete mode 100644 hacks/thornbird.c delete mode 100644 hacks/thornbird.man delete mode 100644 hacks/triangle.c delete mode 100644 hacks/triangle.man delete mode 100644 hacks/truchet.c delete mode 100644 hacks/truchet.man delete mode 100644 hacks/twang.c delete mode 100644 hacks/twang.man delete mode 100644 hacks/vermiculate.c delete mode 100644 hacks/vermiculate.man delete mode 100644 hacks/vfeedback.c delete mode 100644 hacks/vfeedback.man delete mode 100755 hacks/vidwhacker delete mode 100644 hacks/vidwhacker.man delete mode 100644 hacks/vines.c delete mode 100644 hacks/vines.man delete mode 100644 hacks/vms_axp.opt delete mode 100644 hacks/vms_axp_12.opt delete mode 100644 hacks/vms_decc.opt delete mode 100644 hacks/vms_decc_12.opt delete mode 100644 hacks/wander.c delete mode 100644 hacks/wander.man delete mode 100755 hacks/webcollage delete mode 100644 hacks/webcollage-cocoa.m delete mode 100644 hacks/webcollage-helper-cocoa.m delete mode 100644 hacks/webcollage-helper.c delete mode 100644 hacks/webcollage.man delete mode 100644 hacks/whirlwindwarp.c delete mode 100644 hacks/whirlwindwarp.man delete mode 100644 hacks/whirlygig.c delete mode 100644 hacks/whirlygig.man delete mode 100644 hacks/worm.c delete mode 100644 hacks/worm.man delete mode 100644 hacks/wormhole.c delete mode 100644 hacks/wormhole.man delete mode 100644 hacks/xanalogtv.c delete mode 100644 hacks/xanalogtv.man delete mode 100644 hacks/xflame.c delete mode 100644 hacks/xflame.man delete mode 100644 hacks/ximage-loader.c delete mode 100644 hacks/ximage-loader.h delete mode 100644 hacks/xjack.c delete mode 100644 hacks/xjack.man delete mode 100644 hacks/xlockmore.c delete mode 100644 hacks/xlockmore.h delete mode 100644 hacks/xlockmoreI.h delete mode 100644 hacks/xlyap.c delete mode 100644 hacks/xlyap.man delete mode 100644 hacks/xmatrix.c delete mode 100644 hacks/xmatrix.man delete mode 100755 hacks/xml2man.pl delete mode 100644 hacks/xrayswarm.c delete mode 100644 hacks/xrayswarm.man delete mode 100755 hacks/xscreensaver-getimage-file delete mode 100644 hacks/xscreensaver-getimage-file.man delete mode 100755 hacks/xscreensaver-getimage-video delete mode 100644 hacks/xscreensaver-getimage-video.man delete mode 100644 hacks/xscreensaver-getimage.c delete mode 100644 hacks/xscreensaver-getimage.man delete mode 100644 hacks/xscreensaver-sgigl.c delete mode 100755 hacks/xscreensaver-text delete mode 100644 hacks/xscreensaver-text.man delete mode 100644 hacks/xspirograph.c delete mode 100644 hacks/xspirograph.man delete mode 100644 hacks/xsublim.c delete mode 100644 hacks/xsublim.man delete mode 100644 hacks/zoom.c delete mode 100644 hacks/zoom.man delete mode 100644 po/ChangeLog delete mode 100644 po/Makefile.in.in delete mode 100644 po/POTFILES.in delete mode 100644 po/da.po delete mode 100644 po/de.po delete mode 100644 po/es.po delete mode 100644 po/et.po delete mode 100644 po/fi.po delete mode 100644 po/fr.po delete mode 100644 po/hu.po delete mode 100644 po/it.po delete mode 100644 po/ja.po delete mode 100644 po/ko.po delete mode 100644 po/nb.po delete mode 100644 po/nl.po delete mode 100644 po/pl.po delete mode 100644 po/pt.po delete mode 100644 po/pt_BR.po delete mode 100644 po/ru.po delete mode 100644 po/sk.po delete mode 100644 po/sv.po delete mode 100755 po/update.sh delete mode 100644 po/vi.po delete mode 100644 po/wa.po delete mode 100644 po/zh_CN.po delete mode 100644 po/zh_TW.po delete mode 100644 utils/compile_axp.com delete mode 100644 utils/compile_decc.com delete mode 100644 utils/fade.h create mode 100644 utils/grabclient.h delete mode 100644 utils/grabscreen.c delete mode 100644 utils/grabscreen.h create mode 100644 utils/images/logo-512.png delete mode 100644 utils/images/logo.eps delete mode 100644 utils/images/screensaver-cmndln.png delete mode 100644 utils/images/screensaver-colorselector.png delete mode 100644 utils/images/screensaver-diagnostic.png delete mode 100644 utils/images/screensaver-locking.png delete mode 100644 utils/images/screensaver-power.png delete mode 100644 utils/images/screensaver-snap.png create mode 100644 utils/screenshot.c create mode 100644 utils/screenshot.h diff --git a/.gitignore b/.gitignore index 8067b62..9540944 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,8 @@ po/Makefile.in po/POTFILES po/stamp-it utils/Makefile - +tmp/ +po/ +OSX/ +android/ +hacks/ diff --git a/INSTALL b/INSTALL index 67d57d3..4522d8e 100644 --- a/INSTALL +++ b/INSTALL @@ -11,14 +11,13 @@ XScreenSaver Installation xscreensaver & xscreensaver-settings - There are many compilation dependencies. The configure script will - tell you what is missing. At the least, you will need development - versions of these libraries: - - perl pkg-config gettext intltool libx11 libxext libxi libxt - libxft libxinerama libxrandr libxxf86vm libgl libglu libgle - libgtk2 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 libxml2 libpam - dbus libsystemd elogind + There are many compilation dependencies. The configure script will tell + you what is missing. At the least, you will need development versions of + these libraries. Append "-dev" or "-devel" to most of these: + + perl pkg-config gettext intltool libx11 libxext libxi libxt libxft + libxinerama libxrandr libxxf86vm libgl libglu libgle libgtk-3-0 + libgdk-pixbuf2.0 libjpeg libxml2 libpam libsystemd elogind BSD systems might need gmake instead of make. diff --git a/Makefile.in b/Makefile.in index 42742d3..c713f1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in --- xscreensaver, Copyright © 1999-2021 Jamie Zawinski. +# Makefile.in --- xscreensaver, Copyright © 1999-2024 Jamie Zawinski. # the `../configure' script generates `Makefile' from this file. @SET_MAKE@ @@ -11,12 +11,14 @@ SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \ SUBDIRS2 = $(SUBDIRS) OSX android TARFILES = README README.hacking INSTALL \ configure configure.ac Makefile.in config.h.in \ - install-sh config.guess aclocal.m4 \ + install-sh config.guess config.rpath aclocal.m4 \ ax_pthread.m4 config.sub \ intltool-merge.in intltool-extract.in intltool-update.in \ xscreensaver.spec -TAR = tar +TAR = gnutar +TAR_ARGS = --owner=0 --group=0 --posix --no-acls --no-xattrs --no-selinux + # Using $(MAKE) directly means the shell executes things even with "make -n" MAKE2 = $(MAKE) @@ -54,7 +56,7 @@ tags:: @$(MAKE_SUBDIR) clean:: - @$(MAKE_SUBDIR2) + @$(MAKE_SUBDIR) distclean:: clean @$(MAKE_SUBDIR2) @@ -94,7 +96,7 @@ _tar: echo creating tar file $$ADIR$$NAME.tar.gz... ; \ export COPYFILE_DISABLE=true ; \ export GZIP="-9v" ; \ - $(TAR) -vczf $$ADIR$$NAME.tar.gz -T "$$LIST" ; \ + $(TAR) -vczf $$ADIR$$NAME.tar.gz -T "$$LIST" $(TAR_ARGS) ; \ rm "$$LIST" "$$NAME" @@ -205,7 +207,7 @@ bump-version:: \ echo "Updated $$SRC version to \"$$VERS3\"" ; \ \ - $(MAKE) version-date ; \ + $(MAKE2) version-date ; \ ls -lFd $$SRC bump_version:: bump-version @@ -284,6 +286,22 @@ dmg:: apk:: $(MAKE2) -C android apk +# Update the version numbers in faq.html, bugs.html, etc. +www_versions:: + @ \ + DEST=$$HOME/www/xscreensaver ; \ + VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h | \ + head -1` ; \ + TMP=/tmp/xd.$$$$ ; \ + for f in $$DEST/*.html ; do \ + sed "s/\(CLASS=.latest.>\)[^<>]*\(<\)/\1$$VERS\2/gi" < "$$f" > "$$TMP" ;\ + if ! cmp -s "$$f" "$$TMP" ; then \ + diff -U0 "$$f" "$$TMP" ; \ + cp -p "$$TMP" "$$f" ; \ + fi ; \ + rm -f "$$TMP" ; \ + done + www:: @ \ DEST=$$HOME/www/xscreensaver ; \ @@ -306,6 +324,7 @@ www:: exit 1 ; \ fi ; \ \ + $(MAKE2) www_versions ; \ $(MAKE2) -C OSX updates.xml ; \ \ if [ ! -f $$NAME ]; then \ @@ -356,15 +375,16 @@ www:: cd $$DEST ; \ \ TMP=/tmp/xd.$$$$ ; \ - sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \ + sed "s/xscreensaver-[56]\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \ echo '' ; \ diff -U0 download.html $$TMP ; \ echo '' ; \ \ - for EXT in tar.gz dmg ; do \ + for EXT in tar.gz dmg apk ; do \ OLDEST=`ls xscreensaver*.$$EXT | \ fgrep -v 5.14 | \ fgrep -v 5.34 | \ + fgrep -v 6.00 | \ head -n 1` ; \ /bin/echo -n "Delete $$DEST/$$OLDEST? "; \ read line; \ @@ -409,11 +429,30 @@ count:: echo " Total:" $$C ; \ -#cerebrum:: -# rsync -vax . cerebrum:src/xscreensaver/ \ +# Install symlinks pointing back to the source directory, for debugging. +install_links:: + @ \ + cwd=`pwd` ; \ + for d in $(SUBDIRS) ; do ( \ + cd $$d ; \ + $(MAKE2) install -k INSTALL=true INSTALL_DATA=true \ + INSTALL_DIRS=false SUID_FLAGS= 2>&- | \ + while read s ; do \ + set - $$s ; \ + if [ $$1 = true ]; then \ + a="$$cwd/$$d/$$2" ; \ + b="$$3" ; \ + a=`echo "$$a" | sed -e 's@/\./@/@' \ + -e 's@/[^/]*/\.\./@/@'` ; \ + echo "ln -sf $$a $$b" ; \ + ln -sf "$$a" "$$b" ; \ + fi ; \ + done ; \ + ) ; done + cerebrum:: - rsync -vax . pi@10.0.1.19:xscreensaver/ \ + rsync -vax . 10.0.1.12:xscreensaver/ \ --omit-dir-times \ --delete-during \ --exclude .git \ @@ -428,6 +467,10 @@ cerebrum:: --include xscreensaver-getimage-file \ --include xscreensaver-getimage-video \ --include xscreensaver-text \ + --exclude xscreensaver-5.45 \ + --exclude xscreensaver-6.00 \ + --exclude xscreensaver-6.01 \ + --exclude xscreensaver-6.02 \ --exclude '*~' \ --include '*.asm' \ --include '*.c' \ @@ -446,7 +489,19 @@ cerebrum:: --include '*.ttf' \ --include '*.otf' \ --include '*.ui' \ + --include '*.sh' \ + --include '*.pl' \ + --include '*.spec' \ + --include '*.ad' \ --include 'configure*' \ + --include 'config.sub' \ + --include 'config.guess' \ + --include 'config.rpath' \ + --include 'install-sh' \ + --include 'bin2c' \ + --include 'ad2c' \ + --include 'vidwhacker' \ + --include 'webcollage' \ --include '*/' \ --exclude '*' diff --git a/README b/README index ddb9786..2b6dc96 100644 --- a/README +++ b/README @@ -33,14 +33,13 @@ To compile for a Unix system with X11: xscreensaver & xscreensaver-settings - There are many compilation dependencies. The configure script will - tell you what is missing. At the least, you will need development - versions of these libraries: + There are many compilation dependencies. The configure script will tell + you what is missing. At the least, you will need development versions of + these libraries. Append "-dev" or "-devel" to most of these: - perl pkg-config gettext intltool libx11 libxext libxi libxt - libxft libxinerama libxrandr libxxf86vm libgl libglu libgle - libgtk2 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 libxml2 libpam - dbus libsystemd elogind + perl pkg-config gettext intltool libx11 libxext libxi libxt libxft + libxinerama libxrandr libxxf86vm libgl libglu libgle libgtk-3-0 + libgdk-pixbuf2.0 libjpeg libxml2 libpam libsystemd elogind BSD systems might need gmake instead of make. @@ -70,6 +69,92 @@ Interested in writing a new screen saver? Version History =============================================================================== +6.09 * New hacks,`kallisti' and `highvoltage'. + * Formal-wear for `headroom'. + +6.08 * macOS: Worked around a macOS 14.0 bug where savers would continue + running invisibly in the background after un-blanking. + * macOS: Upgraded Sparkle (the "Check for Updates" library) for + macOS 14.0 compatibility. + +6.07 * New hacks, `droste', `skulloop', `papercube' and `cubocteversion'. + * `xscreensaver-settings' was sometimes turning off the DPMS checkbox. + * Log pid of caller of `deactivate' command, to give a hint about who + is preventing the screen from blanking. + * recanim uses libffmpeg. + * Updates to `sphereeversion'. + * Added some new map sources to `mapscroller'. + * macOS: Worked around a macOS 13.4 bug where multi-head systems would + fail to launch savers on some or all screens. + * Minimum compiler target is now ISO C99 instead of ANSI C89. + Didn't want to rush into it. + * macOS, Android: Better looking thunbmail images. + * Various other minor bug fixes. + +6.06 * New hack, `hextrail'. + * `marbling' works again. + * Adjusted some of the very old hacks, which were written when pixels + were larger, to be more visible on today's higher rez displays. + * X11: More robust desktop image grabbing. + * X11: Various improvements to `xscreensaver-settings'. + * X11: Silence new new Perl warnings from `xscreensaver-getimage-file'. + * X11: Supports "Lock" messages from systemd, e.g. when logind.conf + has "HandleLidSwitch=lock" instead of "suspend". + +6.05 * X11: Cope with dumb DPMS settings that existed pre-startup. + * X11: Silence new Perl warnings from `xscreensaver-getimage-file'. + * X11: Fix `sonar' pthreads crash on recent Pi systems. + * X11: Removed dependence on `gdk-pixbuf-xlib-2.0'. + * X11: GTK 3 is now required. + * macOS: Fixed the "Run savers on screens" preference in Random mode + on multi-screen M1 systems. + * Retired `thornbird', which is redundant with `discrete'. + +6.04 * New hacks, `nakagin' and `chompytower'. + * Settings dialog shows diagnostics for bad image folders and feeds. + * URLs for `imageDirectory' can now point at archive.org collections. + * Sliders for various "Speed" preferences are easier to use. + * X11: Settings dialog shows saver description below embedded preview. + * X11: Better behavior when zero monitors are attached. + * X11: Improvements to inhibiting blanking while videos are playing: + No longer necessary to hack GNOME and KDE to get them to not usurp + the org.freedesktop.ScreenSaver endpoint. + * X11: `unicrud' displays character names. + * Updated `webcollage'. + +6.03 * New hack, `squirtorus'. + * New hack, `mapscroller' (X11 and macOS only). + * `sphereeversion' now has corrugation-mode, and can evert the Earth. + * `glplanet' is higher resolution, and displays time zones. + * `glslideshow' displays relative pathnames again. + * iOS: Apple broke drag-to-rotate again. Fixed. + * macOS: fixed spurious error message in auto-update installer. + * X11: fixed `sonar' failing to ping on some Linux systems. + * X11: Touch-screens work. + * X11: Hold down Backspace to clear the whole password field. + +6.02 * New hacks, `marbling' and `binaryhorizon'. + * `atlantis' behaviors are more random and lifelike. + * `headroom' is now Mask Headroom. + * X11: `fontglide' skips fonts that can't display ASCII. + * X11: Use asterisks in the password dialog if the system fonts don't + have bullets in them. + * X11: "Disable Screen Saver" was behaving like "Blank Screen Only". + * Android: These hacks work now: `antinspect', `barcode', + `energystream', `fliptext', `fontglide', `glsnake', `raverhoop', + `starwars', `unicrud'. + +6.01 * X11: Properly disable the server's built-in screen saver. + * X11: The passwdTimeout option was being ignored. + * X11: The display of the unlock thermometer was weird. + * X11: Fixed password entry on old-school multi-screen setups (:0.1). + * X11: Worked around a KDE 5 compositor bug that caused the desktop + to momentarily become visible when cycling. + * X11: Fixed possible high CPU usage in `xscreensaver-systemd'. + * X11: Fixed some spurious warnings in `xscreensaver-text'. + * X11: Warn when Wayland is in use, since it makes both screen saving + and locking impossible. + 6.00 * X11: Major refactor of the `xscreensaver' daemon for improved security, dividing it into three programs: `xscreensaver', `xscreensaver-gfx' and `xscreensaver-auth'. @@ -277,7 +362,7 @@ Version History 5.26 * More auto-updater tweaks. -5.25 * Try harder to bypass Quarrantine and Gatekeeper in macOS installer. +5.25 * Try harder to bypass Quarantine and Gatekeeper in macOS installer. * Some files were missing from the tarball. 5.24 * Added "Automatically check for updates" option on macOS. @@ -1693,7 +1778,7 @@ Version History the parameters which are normally read as minutes can be specified in seconds. * Added colormap cycling to `imsmap'. - * Made hyper work with K&R compilers. + * Made `hyper' work with K&R compilers. 1.14 * Added `orbit' option to `attraction' hack. * Added `lock-timeout' option. @@ -1702,14 +1787,26 @@ Version History 1.09 * Added demo mode, and locking. * Added `maze' hack. * Added `norotate' option to `rocks' hack. + * Uploaded to export.lcs.mit.edu:contrib/xscreensaver.tar.Z and posted + to comp.windows.x.announce, 25-Feb-1993. + * Added `hypercube' and `slidescreen' (or they may have been added + earlier). 1.05 * Works when run from XDM before anyone logs in. * Sped up `imsmap'. * Can use `xv' as a slideshow without using up colormap entries while the screen is not blanked. * Fixed a BadDrawable error in non-XIdle mode. - * Added `blitspin' and `imsmap'. + * Uploaded to export.lcs.mit.edu:contrib/xsaver.tar.Z and posted to + comp.windows.x.announce, 30-Nov-1992. + +1.04 * Added `blitspin' and `imsmap' (or they may have been earlier). + * Appeared on the X11R5 contrib tape, a mirror of export.lcs.mit.edu, + 29-Nov-1992. + +1.00 * Uploaded to export.lcs.mit.edu:contrib/xsaver.tar.Z and posted to + comp.windows.x.announce, 17-Aug-1992. + * Initial list of included hacks: + `qix', `helix', `rorschach', `attraction', `greynetic', `rocks', + `pyro', `hopalong', and `noseguy'. -1.01 * Current list of included hacks is now: `qix', `helix', `rorschach', - `attraction', `greynetic', `rocks', `pyro', `hopalong', and - `noseguy'. diff --git a/README.hacking b/README.hacking index 39f9e14..39d8b16 100644 --- a/README.hacking +++ b/README.hacking @@ -39,9 +39,7 @@ Requirements for inclusion with the XScreenSaver collection include it in the xscreensaver distribution. However, there are a few requirements for me to distribute it: - - Write in portable ANSI C. No C++. No nonstandard libraries. - - - Write a .man page describing all command-line options. + - Write in portable ISO C99. No C++. No nonstandard libraries. - Write an .xml file describing the graphical configuration dialog box. @@ -97,7 +95,8 @@ The XScreenSaver API You may not store global state in global variables, or in function-local static variables. All of your runtime state must be encapsulated in the "state" object created by your "init" function. If you use global or - static variables, your screen saver will not work properly on macOS. + static variables, your screen saver will not work properly on macOS, + iOS or Android. Do not call XSync() or XFlush(). If you think you need to do that, it probably means that you are you are relying on the speed of the graphics diff --git a/aclocal.m4 b/aclocal.m4 index 45eab98..c3a710b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.3 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,492 +12,1383 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 - -# Increment this whenever this file is changed. -#serial 1 +# build-to-host.m4 serial 3 +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +dnl Written by Bruno Haible. +dnl When the build environment ($build_os) is different from the target runtime +dnl environment ($host_os), file names may need to be converted from the build +dnl environment syntax to the target runtime environment syntax. This is +dnl because the Makefiles are executed (mostly) by build environment tools and +dnl therefore expect file names in build environment syntax, whereas the runtime +dnl expects file names in target runtime environment syntax. dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. +dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need +dnl be converted from Cygwin syntax to native Windows syntax: +dnl /cygdrive/c/foo/bar -> C:\foo\bar +dnl /usr/local/share -> C:\cygwin64\usr\local\share dnl +dnl gl_BUILD_TO_HOST([somedir]) +dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must +dnl already have its final value assigned, and produces two additional +dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the +dnl same file name value, just in different syntax: +dnl - somedir_c is the file name in target runtime environment syntax, +dnl as a C string (starting and ending with a double-quote, +dnl and with escaped backslashes and double-quotes in +dnl between). +dnl - somedir_c_make is the same thing, escaped for use in a Makefile. -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +AC_DEFUN([gl_BUILD_TO_HOST], +[ + AC_REQUIRE([AC_CANONICAL_BUILD]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_BUILD_TO_HOST_INIT]) -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl + dnl Define somedir_c. + gl_final_[$1]="$[$1]" + dnl Translate it from build syntax to host syntax. + case "$build_os" in + cygwin*) + case "$host_os" in + mingw* | windows*) + gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; + esac + ;; + esac + dnl Convert it to C string syntax. + [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` + [$1]_c='"'"$[$1]_c"'"' + AC_SUBST([$1_c]) + + dnl Define somedir_c_make. + [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` + dnl Use the substituted somedir variable, when possible, so that the user + dnl may adjust somedir a posteriori when there are no special characters. + if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then + [$1]_c_make='\"$([$1])\"' + fi + AC_SUBST([$1_c_make]) ]) -dnl Checks for special options needed on Mac OS X. -dnl Defines INTL_MACOSX_LIBS. -dnl -dnl Copied from intlmacosx.m4 in gettext, GPL. -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. -glib_DEFUN([glib_gt_INTL_MACOSX], +dnl Some initializations for gl_BUILD_TO_HOST. +AC_DEFUN([gl_BUILD_TO_HOST_INIT], [ - dnl Check for API introduced in Mac OS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFPreferencesCopyAppValue(NULL, NULL)]])], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in Mac OS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFLocaleCopyCurrent();]])], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' +changequote(,)dnl + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" +changequote([,])dnl + gl_sed_escape_for_make_2='s,\$,\\$$,g' + dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr + dnl does not understand '\r'. + case `echo r | tr -d '\r'` in + '') gl_tr_cr='\015' ;; + *) gl_tr_cr='\r' ;; + esac ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +# gettext.m4 serial 78 (gettext-0.22.4) +dnl Copyright (C) 1995-2014, 2016, 2018-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2006, 2008-2010. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL must be one of 'external', 'use-libtool', 'here'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext. +dnl It should be 'use-libtool' for the packages 'gettext-runtime' and +dnl 'gettext-tools'. +dnl It should be 'here' for the package 'gettext-runtime/intl'. +dnl If INTLSYMBOL is 'here', then a libtool library +dnl $(top_builddir)/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value '$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [m4_if([$1], [here], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], + [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. +])]) + m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define([gt_building_libintl_in_same_build_tree], + m4_if([$1], [use-libtool], [yes], [m4_if([$1], [here], [yes], [no])])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + + dnl Set USE_NLS. + AC_REQUIRE([AM_NLS]) + + m4_if(gt_building_libintl_in_same_build_tree, yes, [ + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= - gt_cv_have_gettext=no + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + m4_if(gt_building_libintl_in_same_build_tree, yes, [ + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH([included-gettext], + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) - glib_gt_INTL_MACOSX + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ #include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + m4_if(gt_building_libintl_in_same_build_tree, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + [$gt_func_gnugettext_libintl], + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ #include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) + dnl Now see whether libintl exists and depends on libiconv or other + dnl OS dependent libraries, specifically on macOS and AIX. + gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + aix*) gt_LIBINTL_EXTRA="-lpthread" ;; + esac + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ + && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then + LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" + LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" + eval "$gt_func_gnugettext_libintl=yes" + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= fi - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi + m4_if(gt_building_libintl_in_same_build_tree, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes fi fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + USE_INCLUDED_LIBINTL=yes + LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" + LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi + + CATOBJEXT= + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo fi ]) - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE([ENABLE_NLS], [1], + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no fi + fi - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" + gt_source="libc" fi + else + gt_source="included intl directory" fi + AC_MSG_RESULT([$gt_source]) + fi - # We need to process the po/ directory. - POSUB=po + if test "$USE_NLS" = "yes"; then - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE([HAVE_GETTEXT], [1], + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE([HAVE_DCGETTEXT], [1], + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + m4_if(gt_building_libintl_in_same_build_tree, yes, [ dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) ]) -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. + m4_if(gt_building_libintl_in_same_build_tree, yes, [], [ + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST([INTLLIBS]) + ]) + + dnl Make all documented variables known to autoconf. + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) + + dnl Define localedir_c and localedir_c_make. + dnl Find the final value of localedir. + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + dnl Unfortunately, prefix gets only finally determined at the end of + dnl configure. + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" + gl_BUILD_TO_HOST([localedir]) + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" +]) + + +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], +[ + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) +]) + + +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], +[ + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + + +dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) + +# host-cpu-c-abi.m4 serial 17 +dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible and Sam Steingold. + +dnl Sets the HOST_CPU variable to the canonical name of the CPU. +dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its +dnl C language ABI (application binary interface). +dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in +dnl config.h. +dnl +dnl This canonical name can be used to select a particular assembly language +dnl source file that will interoperate with C code on the given host. dnl -AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" +dnl For example: +dnl * 'i386' and 'sparc' are different canonical names, because code for i386 +dnl will not run on SPARC CPUs and vice versa. They have different +dnl instruction sets. +dnl * 'sparc' and 'sparc64' are different canonical names, because code for +dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code +dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit +dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit +dnl mode, but not both. +dnl * 'mips' and 'mipsn32' are different canonical names, because they use +dnl different argument passing and return conventions for C functions, and +dnl although the instruction set of 'mips' is a large subset of the +dnl instruction set of 'mipsn32'. +dnl * 'mipsn32' and 'mips64' are different canonical names, because they use +dnl different sizes for the C types like 'int' and 'void *', and although +dnl the instruction sets of 'mipsn32' and 'mips64' are the same. +dnl * The same canonical name is used for different endiannesses. You can +dnl determine the endianness through preprocessor symbols: +dnl - 'arm': test __ARMEL__. +dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL. +dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN. +dnl * The same name 'i386' is used for CPUs of type i386, i486, i586 +dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because +dnl - Instructions that do not exist on all of these CPUs (cmpxchg, +dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your +dnl assembly language source files use such instructions, you will +dnl need to make the distinction. +dnl - Speed of execution of the common instruction set is reasonable across +dnl the entire family of CPUs. If you have assembly language source files +dnl that are optimized for particular CPU types (like GNU gmp has), you +dnl will need to make the distinction. +dnl See . +AC_DEFUN([gl_HOST_CPU_C_ABI], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_C_ASM]) + AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi], + [case "$host_cpu" in + +changequote(,)dnl + i[34567]86 ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=i386 + ;; + + x86_64 ) + # On x86_64 systems, the C compiler may be generating code in one of + # these ABIs: + # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. + # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 + # with native Windows (mingw, MSVC). + # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (defined __x86_64__ || defined __amd64__ \ + || defined _M_X64 || defined _M_AMD64) + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=x86_64-x32], + [gl_cv_host_cpu_c_abi=x86_64])], + [gl_cv_host_cpu_c_abi=i386]) + ;; + +changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) +changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha + ;; + + arm* | aarch64 ) + # Assume arm with EABI. + # On arm64 systems, the C compiler may be generating code in one of + # these ABIs: + # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. + # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. + # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __aarch64__ + int ok; + #else + error fail + #endif + ]])], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __ILP32__ || defined _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=arm64-ilp32], + [gl_cv_host_cpu_c_abi=arm64])], + [# Don't distinguish little-endian and big-endian arm, since they + # don't require different machine code for simple operations and + # since the user can distinguish them through the preprocessor + # defines __ARMEL__ vs. __ARMEB__. + # But distinguish arm which passes floating-point arguments and + # return values in integer registers (r0, r1, ...) - this is + # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which + # passes them in float registers (s0, s1, ...) and double registers + # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer + # sets the preprocessor defines __ARM_PCS (for the first case) and + # __ARM_PCS_VFP (for the second case), but older GCC does not. + echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c + # Look for a reference to the register d0 in the .s file. + AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 + if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then + gl_cv_host_cpu_c_abi=armhf + else + gl_cv_host_cpu_c_abi=arm + fi + rm -f conftest* + ]) + ;; + + hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) + # On hppa, the C compiler may be generating 32-bit code or 64-bit + # code. In the latter case, it defines _LP64 and __LP64__. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef __LP64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=hppa64], + [gl_cv_host_cpu_c_abi=hppa]) + ;; + + ia64* ) + # On ia64 on HP-UX, the C compiler may be generating 64-bit code or + # 32-bit code. In the latter case, it defines _ILP32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifdef _ILP32 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=ia64-ilp32], + [gl_cv_host_cpu_c_abi=ia64]) + ;; + + mips* ) + # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this + # at 32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mips64], + [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIN32. + # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but + # may later get defined by ), and _MIPS_SIM == _ABIO32. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if (_MIPS_SIM == _ABIN32) + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=mipsn32], + [gl_cv_host_cpu_c_abi=mips])]) + ;; + + powerpc* ) + # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. + # No need to distinguish them here; the caller may distinguish + # them based on the OS. + # On powerpc64 systems, the C compiler may still be generating + # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may + # be generating 64-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __powerpc64__ || defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [# On powerpc64, there are two ABIs on Linux: The AIX compatible + # one and the ELFv2 one. The latter defines _CALL_ELF=2. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined _CALL_ELF && _CALL_ELF == 2 + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=powerpc64-elfv2], + [gl_cv_host_cpu_c_abi=powerpc64]) + ], + [gl_cv_host_cpu_c_abi=powerpc]) + ;; + + rs6000 ) + gl_cv_host_cpu_c_abi=powerpc + ;; + + riscv32 | riscv64 ) + # There are 2 architectures (with variants): rv32* and rv64*. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if __riscv_xlen == 64 + int ok; + #else + error fail + #endif + ]])], + [cpu=riscv64], + [cpu=riscv32]) + # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. + # Size of 'long' and 'void *': + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ + int ok; + #else + error fail + #endif + ]])], + [main_abi=lp64], + [main_abi=ilp32]) + # Float ABIs: + # __riscv_float_abi_double: + # 'float' and 'double' are passed in floating-point registers. + # __riscv_float_abi_single: + # 'float' are passed in floating-point registers. + # __riscv_float_abi_soft: + # No values are passed in floating-point registers. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_double + int ok; + #else + error fail + #endif + ]])], + [float_abi=d], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __riscv_float_abi_single + int ok; + #else + error fail + #endif + ]])], + [float_abi=f], + [float_abi='']) + ]) + gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}" + ;; + + s390* ) + # On s390x, the C compiler may be generating 64-bit (= s390x) code + # or 31-bit (= s390) code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __LP64__ || defined __s390x__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=s390x], + [gl_cv_host_cpu_c_abi=s390]) + ;; + + sparc | sparc64 ) + # UltraSPARCs running Linux have `uname -m` = "sparc64", but the + # C compiler still generates 32-bit code. + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif + ]])], + [gl_cv_host_cpu_c_abi=sparc64], + [gl_cv_host_cpu_c_abi=sparc]) + ;; + + *) + gl_cv_host_cpu_c_abi="$host_cpu" + ;; + esac + ]) + + dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same. + HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'` + HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi" + AC_SUBST([HOST_CPU]) + AC_SUBST([HOST_CPU_C_ABI]) + + # This was + # AC_DEFINE_UNQUOTED([__${HOST_CPU}__]) + # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__]) + # earlier, but KAI C++ 3.2d doesn't like this. + sed -e 's/-/_/g' >> confdefs.h <. +dnl Don't make changes that are incompatible with that documentation! + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. + gl_saved_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_func_iconv=yes]) + if test "$am_cv_func_iconv" != yes; then + gl_saved_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) + LIBS="$gl_saved_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. + gl_saved_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + ]], + [[int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; +]])], + [am_cv_func_iconv_works=yes], , + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$gl_saved_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) +]) + +dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +AC_DEFUN_ONCE([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature], + [gl_cv_iconv_nonconst], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); + ]], + [[]])], + [gl_cv_iconv_nonconst=yes], + [gl_cv_iconv_nonconst=no]) + ]) + else + dnl When compiling GNU libiconv on a system that does not have iconv yet, + dnl pick the POSIX compliant declaration without 'const'. + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" + fi + AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1], + [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated . + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test $gl_cv_iconv_nonconst != yes; then + ICONV_CONST="const" fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ], - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) + ]) + + dnl A summary result, for those packages which want to print a summary at the + dnl end of the configuration. + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi + fi ]) +# intlmacosx.m4 serial 10 (gettext-0.23) +dnl Copyright (C) 2004-2014, 2016, 2019-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.4. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_saved_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent, + dnl because in macOS 10.13.4 it has the following behaviour: + dnl When two or more languages are specified in the + dnl "System Preferences > Language & Region > Preferred Languages" panel, + dnl it returns en_CC where CC is the territory (even when English is not among + dnl the preferred languages!). What we want instead is what + dnl CFLocaleCopyCurrent returned in earlier macOS releases and what + dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the + dnl first among the preferred languages and CC is the territory. + AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], + [gt_saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyPreferredLanguages();]])], + [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], + [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) + LIBS="$gt_saved_LIBS"]) + if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + dnl Starting with macOS version 14, CoreFoundation relies on CoreServices, + dnl and we have to link it in explicitly, otherwise an exception + dnl NSInvalidArgumentException "unrecognized selector sent to instance" + dnl occurs. + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) @@ -668,27 +1559,1343 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl Foundation, Inc. +# lib-ld.m4 serial 13 +dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +dnl Subroutines of libtool.m4, +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. + +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 /dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +if test -n "$LD"; then + AC_MSG_CHECKING([for ld]) +elif test "$GCC" = yes; then + AC_MSG_CHECKING([for ld used by $CC]) +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +if test -n "$LD"; then + # Let the user override the test with a path. + : +else + AC_CACHE_VAL([acl_cv_path_LD], + [ + acl_cv_path_LD= # Final result of this test + ac_prog=ld # Program to search in $PATH + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + case $host in + *-*-mingw* | windows*) + # gcc leaves a trailing carriage return which upsets mingw + acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + acl_output=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $acl_output in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` + while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do + acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` + done + # Got the pathname. No search in PATH is needed. + acl_cv_path_LD="$acl_output" + ac_prog= + ;; + "") + # If it fails, then pretend we aren't using GCC. + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac + fi + if test -n "$ac_prog"; then + # Search for $ac_prog in $PATH. + acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_saved_IFS" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE([rpath], + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" + ]) + AC_ARG_WITH(PACK[-prefix], +[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + additional_libdir2="$withval/$acl_libdirstem2" + additional_libdir3="$withval/$acl_libdirstem3" + fi + fi +]) + if test "X$additional_libdir2" = "X$additional_libdir"; then + additional_libdir2= + fi + if test "X$additional_libdir3" = "X$additional_libdir"; then + additional_libdir3= + fi + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Use breadth-first search. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do + if test "X$found_dir" = "X"; then + eval dir=\$$additional_libdir_variable + if test -n "$dir"; then + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + fi + done + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$acl_hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem3 | */$acl_libdirstem3/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + saved_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$saved_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then + haveit= + if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + dnl Really add $dependency_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + dnl Really add $dependency_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + dnl But on GNU systems, ignore -lc options, because + dnl - linking with libc is the default anyway, + dnl - linking with libc.a may produce an error + dnl "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie" + dnl or may produce an executable that always crashes, see + dnl . + dep=`echo "X$dep" | sed -e 's/^X-l//'` + if test "X$dep" != Xc \ + || case $host_os in + linux* | gnu* | k*bsd*-gnu) false ;; + *) true ;; + esac; then + names_next_round="$names_next_round $dep" + fi + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. + acl_saved_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_saved_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +dnl For those cases where a variable contains several -L and -l options +dnl referring to unknown libraries and directories, this macro determines the +dnl necessary additional linker options for the runtime path. +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, +dnl otherwise linking without libtool is assumed. +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], +[ + AC_REQUIRE([AC_LIB_RPATH]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + $1= + if test "$enable_rpath" != no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode directories into the resulting + dnl binary. + rpathdirs= + next= + for opt in $2; do + if test -n "$next"; then + dir="$next" + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2" \ + && test "X$dir" != "X/usr/$acl_libdirstem3"; then + rpathdirs="$rpathdirs $dir" + fi + next= + else + case $opt in + -L) next=yes ;; + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2" \ + && test "X$dir" != "X/usr/$acl_libdirstem3"; then + rpathdirs="$rpathdirs $dir" + fi + next= ;; + *) next= ;; + esac + fi + done + if test "X$rpathdirs" != "X"; then + if test -n ""$3""; then + dnl libtool is used for linking. Use -R options. + for dir in $rpathdirs; do + $1="${$1}${$1:+ }-R$dir" + done + else + dnl The linker is used for linking directly. + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user + dnl must pass all path elements in one option. + alldirs= + for dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" + done + acl_saved_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + $1="$flag" + else + dnl The -rpath options are cumulative. + for dir in $rpathdirs; do + acl_saved_libdir="$libdir" + libdir="$dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + $1="${$1}${$1:+ }$flag" + done + fi + fi + fi + fi + fi + AC_SUBST([$1]) +]) + +# lib-prefix.m4 serial 22 +dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH([lib-prefix], +[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_saved_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" +]) + +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a function acl_is_expected_elfclass, that tests whether standard input +dn; has a 32-bit or 64-bit ELF header, depending on the host CPU ABI, +dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing +dnl the basename of the libdir to try in turn, either "lib" or "lib64" or +dnl "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar. +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib, lib32, and lib64. + dnl On most glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on + dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go + dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib. + dnl We determine the compiler's default mode by looking at the compiler's + dnl library search path. If at least one of its elements ends in /lib64 or + dnl points to a directory whose absolute pathname ends in /lib64, we use that + dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default, + dnl namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT]) + + AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf], + [AC_EGREP_CPP([Extensible Linking Format], + [#if defined __ELF__ || (defined __linux__ && defined __EDG__) + Extensible Linking Format + #endif + ], + [gl_cv_elf=yes], + [gl_cv_elf=no]) + ]) + if test $gl_cv_elf = yes; then + # Extract the ELF class of a file (5th byte) in decimal. + # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header + if od -A x < /dev/null >/dev/null 2>/dev/null; then + # Use POSIX od. + func_elfclass () + { + od -A n -t d1 -j 4 -N 1 + } + else + # Use BSD hexdump. + func_elfclass () + { + dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "' + echo + } + fi + # Use 'expr', not 'test', to compare the values of func_elfclass, because on + # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002, + # not 1 or 2. +changequote(,)dnl + case $HOST_CPU_C_ABI_32BIT in + yes) + # 32-bit ABI. + acl_is_expected_elfclass () + { + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null + } + ;; + no) + # 64-bit ABI. + acl_is_expected_elfclass () + { + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null + } + ;; + *) + # Unknown. + acl_is_expected_elfclass () + { + : + } + ;; + esac +changequote([,])dnl + else + acl_is_expected_elfclass () + { + : + } + fi + + dnl Allow the user to override the result by setting acl_cv_libdirstems. + AC_CACHE_CHECK([for the common suffixes of directories in the library search path], + [acl_cv_libdirstems], + [dnl Try 'lib' first, because that's the default for libdir in GNU, see + dnl . + acl_libdirstem=lib + acl_libdirstem2= + acl_libdirstem3= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + if test $HOST_CPU_C_ABI_32BIT = no; then + acl_libdirstem2=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem3=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem3=lib/amd64 ;; + esac + fi + ;; + netbsd*) + dnl On NetBSD/sparc64, there is a 'sparc' subdirectory that contains + dnl 32-bit libraries. + if test $HOST_CPU_C_ABI_32BIT != no; then + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparc ;; + esac + fi + ;; + *) + dnl If $CC generates code for a 32-bit ABI, the libraries are + dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64. + dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries + dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32. + dnl Find the compiler's search path. However, non-system compilers + dnl sometimes have odd library search paths. But we can't simply invoke + dnl '/usr/bin/gcc -print-search-dirs' because that would not take into + dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS. + searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test $HOST_CPU_C_ABI_32BIT != no; then + # 32-bit or unknown ABI. + if test -d /usr/lib32; then + acl_libdirstem2=lib32 + fi + fi + if test $HOST_CPU_C_ABI_32BIT != yes; then + # 64-bit or unknown ABI. + if test -d /usr/lib64; then + acl_libdirstem3=lib64 + fi + fi + if test -n "$searchpath"; then + acl_saved_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;; + */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib32 ) acl_libdirstem2=lib32 ;; + */lib64 ) acl_libdirstem3=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_saved_IFS" + if test $HOST_CPU_C_ABI_32BIT = yes; then + # 32-bit ABI. + acl_libdirstem3= + fi + if test $HOST_CPU_C_ABI_32BIT = no; then + # 64-bit ABI. + acl_libdirstem2= + fi + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem" + acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3" + ]) + dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and + dnl acl_libdirstem3. +changequote(,)dnl + acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` + acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'` + acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'` +changequote([,])dnl +]) + +# nls.m4 serial 6 (gettext-0.20.2) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2024 Free +dnl Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ @@ -701,7 +2908,555 @@ AC_DEFUN([AM_NLS], AC_SUBST([USE_NLS]) ]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# po.m4 serial 32 (gettext-0.21.1) +dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.60]) + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.20]) + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) + + dnl Test whether it is GNU msgfmt >= 0.15. +changequote(,)dnl + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; + *) GMSGFMT_015=$GMSGFMT ;; + esac +changequote([,])dnl + AC_SUBST([GMSGFMT_015]) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Test whether it is GNU xgettext >= 0.15. +changequote(,)dnl + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; + *) XGETTEXT_015=$XGETTEXT ;; + esac +changequote([,])dnl + AC_SUBST([XGETTEXT_015]) + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) + + dnl Test whether it is GNU msgmerge >= 0.20. + if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then + MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt' + else + dnl Test whether it is GNU msgmerge >= 0.12. + if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then + MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet' + else + dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is + dnl slow. But this is not a big problem, as such old gettext versions are + dnl hardly in use any more. + MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet' + fi + fi + AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION]) + + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + + AC_CONFIG_COMMANDS([po-directories], [[ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) + useit=yes + ;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done]], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. + OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS" + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + +dnl Postprocesses a Makefile in a directory containing PO files. +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +[ + # When this code is run, in config.status, two variables have already been + # set: + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, + # - LINGUAS is the value of the environment variable LINGUAS at configure + # time. + +changequote(,)dnl + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + # Find a way to echo strings without interpreting backslash. + if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='echo' + else + if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='printf %s\n' + else + echo_func () { + cat < "$ac_file.tmp" + tab=`printf '\t'` + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + cat >> "$ac_file.tmp" < /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` + cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. + +AC_PREREQ([2.53]) + +# Search path for a program which passes the given test. + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL([ac_cv_path_$1], +[case "[$]$1" in + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in m4_if([$5], , $PATH, [$5]); do + IFS="$gt_saved_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$gt_saved_IFS" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +m4_if([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$][$1]) +else + AC_MSG_RESULT([no]) +fi +AC_SUBST([$1])dnl +]) + +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config.h.in b/config.h.in index 11a0ab9..88405d9 100644 --- a/config.h.in +++ b/config.h.in @@ -1,7 +1,7 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* xscreensaver, Copyright © 1991-2021 Jamie Zawinski. +/* xscreensaver, Copyright © 1991-2022 Jamie Zawinski. * Generate this file by running 'configure' rather than editing it by hand. */ @@ -9,7 +9,8 @@ /* Define this to allow root to unlock, when not using PAM. */ #undef ALLOW_ROOT_PASSWD -/* always defined to indicate that i18n is enabled */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ #undef ENABLE_NLS /* This is the name of the gettext package to use. */ @@ -21,32 +22,22 @@ /* Define this for Solaris getpwanam. */ #undef HAVE_ADJUNCT_PASSWD -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE -/* Define this if you have Gnome and want to build support for the - xscreensaver control panel in the Gtk 1.x Gnome Control Center. */ -#undef HAVE_CRAPPLET - -/* Define this if HAVE_CRAPPLET is defined, and the function - capplet_widget_changes_are_immediate is available. */ -#undef HAVE_CRAPPLET_IMMEDIATE - /* Define to 1 if you have the header file. */ #undef HAVE_CRYPT_H -/* Define to 1 if you have the `dcgettext' function. */ +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ #undef HAVE_DCGETTEXT -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_DIRENT_H @@ -62,23 +53,29 @@ /* Define this for DEC/SCO "Enhanced Security" with getprpwnam. */ #undef HAVE_ENHANCED_PASSWD -/* Define to 1 if you have the `fcntl' function. */ +/* Define to 1 if you have the 'fcntl' function. */ #undef HAVE_FCNTL +/* Define this if you have the ffmpeg libraries. */ +#undef HAVE_FFMPEG + /* Define this if you have forkpty. */ #undef HAVE_FORKPTY -/* Define this if you have GDK_Pixbuf. */ +/* Define this if you have GDK-Pixbuf. */ #undef HAVE_GDK_PIXBUF /* Define this if you have the gdk_pixbuf_apply_embedded_orientation function (gdk-pixbuf 2.12). */ #undef HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION -/* Define to 1 if you have the `getaddrinfo' function. */ +/* Define this if you have GDK-Pixbuf-Xlib. */ +#undef HAVE_GDK_PIXBUF_XLIB + +/* Define to 1 if you have the 'getaddrinfo' function. */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getcwd' function. */ +/* Define to 1 if you have the 'getcwd' function. */ #undef HAVE_GETCWD /* Define this if you have getifaddrs. */ @@ -90,7 +87,7 @@ /* Define this if you have gettimeofday. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `getwd' function. */ +/* Define to 1 if you have the 'getwd' function. */ #undef HAVE_GETWD /* Define this if you have OpenGL. */ @@ -117,11 +114,8 @@ /* Define this if OpenGL supports the OpenGL Shading Language. */ #undef HAVE_GLSL -/* Define this if you have Gtk */ -#undef HAVE_GTK - /* Define this if you have Gtk 2.x. */ -#undef HAVE_GTK2 +#undef HAVE_GTK /* Define this for HPUX so-called "Secure Passwords". */ #undef HAVE_HPUX_PASSWD @@ -132,6 +126,9 @@ /* Define this if ping uses struct icmphdr.un.echo.id. */ #undef HAVE_ICMPHDR +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -148,24 +145,18 @@ /* Define this if you have Kerberos 5. */ #undef HAVE_KERBEROS5 -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Define this if your system has libcap. */ #undef HAVE_LIBCAP +/* Define this if you have libelogind. */ +#undef HAVE_LIBELOGIND + /* Define this if you have the Portable Network Graphics library. */ #undef HAVE_LIBPNG /* Define this if you have libsystemd. */ #undef HAVE_LIBSYSTEMD -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - /* Using the MIT-SCREEN-SAVER extension means that the X server will crash at random times, and fading and hysteresis won't work. Don't use this. You'll be sorry. See comment in xscreensaver.c. */ @@ -174,16 +165,12 @@ /* Define this if you have Motif. */ #undef HAVE_MOTIF -/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_NDIR_H -/* Define to 1 if you have the `nice' function. */ +/* Define to 1 if you have the 'nice' function. */ #undef HAVE_NICE -/* Define this if you the XML library headers lack the gnome-xml/libxml - symlink. */ -#undef HAVE_OLD_XML_HEADERS - /* Define this if you have Pluggable Authentication Modules. */ #undef HAVE_PAM @@ -208,7 +195,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PTY_H -/* Define to 1 if you have the `putenv' function. */ +/* Define to 1 if you have the 'putenv' function. */ #undef HAVE_PUTENV /* Define this if your system uses getpwnam_shadow. */ @@ -220,28 +207,25 @@ /* Define this if the RANDR library is version 1.2 or newer. */ #undef HAVE_RANDR_12 -/* Define this if you have the SGI XReadDisplay extension. */ -#undef HAVE_READ_DISPLAY_EXTENSION - -/* Define to 1 if you have the `realpath' function. */ +/* Define to 1 if you have the 'realpath' function. */ #undef HAVE_REALPATH /* Define this to enable recording of videos. */ #undef HAVE_RECORD_ANIM -/* Define to 1 if you have the `sbrk' function. */ +/* Define to 1 if you have the 'sbrk' function. */ #undef HAVE_SBRK -/* Define to 1 if you have the `select' function. */ +/* Define to 1 if you have the 'select' function. */ #undef HAVE_SELECT -/* Define to 1 if you have the `setlocale' function. */ +/* Define to 1 if you have the 'setlocale' function. */ #undef HAVE_SETLOCALE -/* Define to 1 if you have the `setpriority' function. */ +/* Define to 1 if you have the 'setpriority' function. */ #undef HAVE_SETPRIORITY -/* Define to 1 if you have the `setrlimit' function. */ +/* Define to 1 if you have the 'setrlimit' function. */ #undef HAVE_SETRLIMIT /* Define this if you have the SGI SCREEN_SAVER extension. */ @@ -253,18 +237,21 @@ /* Define this if your system uses /etc/shadow. */ #undef HAVE_SHADOW_PASSWD -/* Define to 1 if you have the `sigaction' function. */ +/* Define to 1 if you have the 'sigaction' function. */ #undef HAVE_SIGACTION /* Define to 1 if you have the `sigtimedwait' function. */ #undef HAVE_SIGTIMEDWAIT -/* Define to 1 if you have the `sqrtf' function. */ +/* Define to 1 if you have the 'sqrtf' function. */ #undef HAVE_SQRTF /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -274,17 +261,17 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ +/* Define to 1 if 'sa_len' is a member of 'struct sockaddr'. */ #undef HAVE_STRUCT_SOCKADDR_SA_LEN -/* Define to 1 if you have the `syslog' function. */ +/* Define to 1 if you have the 'syslog' function. */ #undef HAVE_SYSLOG -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_SYS_DIR_H -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_SYS_NDIR_H @@ -303,7 +290,7 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the `uname' function. */ +/* Define to 1 if you have the 'uname' function. */ #undef HAVE_UNAME /* Define to 1 if you have the header file. */ @@ -390,7 +377,9 @@ /* Return type of signal handlers */ #undef RETSIGTYPE -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Stare into the void. */ @@ -399,33 +388,25 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT -/* Define to `int' if does not define. */ +/* Define to 'int' if does not define. */ #undef mode_t -/* Define to `int' if does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t -/* Define to `unsigned int' if does not define. */ +/* Define as 'unsigned int' if doesn't define. */ #undef size_t /* Define to `int' if or does not define. */ diff --git a/config.rpath b/config.rpath new file mode 100755 index 0000000..24be79c --- /dev/null +++ b/config.rpath @@ -0,0 +1,684 @@ +#! /bin/sh +# Output a system dependent set of variables, describing how to set the +# run time search path of shared libraries in an executable. +# +# Copyright 1996-2020 Free Software Foundation, Inc. +# Taken from GNU libtool, 2001 +# Originally by Gordon Matzigkeit , 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld +# should be set by the caller. +# +# The set of defined variables is at the end of this script. + +# Known limitations: +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +# than 256 bytes, otherwise the compiler driver will dump core. The only +# known workaround is to choose shorter directory names for the build +# directory and/or the installation directory. + +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +shrext=.so + +host="$1" +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# Code taken from libtool.m4's _LT_CC_BASENAME. + +for cc_temp in $CC""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` + +# Code taken from libtool.m4's _LT_COMPILER_PIC. + +wl= +if test "$GCC" = yes; then + wl='-Wl,' +else + case "$host_os" in + aix*) + wl='-Wl,' + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' + ;; + irix5* | irix6* | nonstopux*) + wl='-Wl,' + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) + wl='-Wl,' + ;; + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + wl='-Wl,' + ;; + ccc*) + wl='-Wl,' + ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; + como) + wl='-lopt=' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; + *Sun\ C*) + wl='-Wl,' + ;; + esac + ;; + esac + ;; + newsos6) + ;; + *nto* | *qnx*) + ;; + osf3* | osf4* | osf5*) + wl='-Wl,' + ;; + rdos*) + ;; + solaris*) + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac + ;; + sunos4*) + wl='-Qoption ld ' + ;; + sysv4 | sysv4.2uw2* | sysv4.3*) + wl='-Wl,' + ;; + sysv4*MP*) + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; + unicos*) + wl='-Wl,' + ;; + uts4*) + ;; + esac +fi + +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. + +hardcode_libdir_flag_spec= +hardcode_libdir_separator= +hardcode_direct=no +hardcode_minus_L=no + +case "$host_os" in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; +esac + +ld_shlibs=yes +if test "$with_gnu_ld" = yes; then + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + case "$host_os" in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + fi + ;; + amigaos*) + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + haiku*) + ;; + interix[3-9]*) + hardcode_direct=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) + ;; + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + else + ld_shlibs=no + fi + ;; + esac + ;; + sunos4*) + hardcode_direct=yes + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = no; then + hardcode_libdir_flag_spec= + fi +else + case "$host_os" in + aix3*) + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + else + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + fi + hardcode_direct=yes + hardcode_libdir_separator=':' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + fi + # Begin _LT_AC_SYS_LIBPATH_AIX. + echo 'int main () { return 0; }' > conftest.c + ${CC} ${LDFLAGS} conftest.c -o conftest + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + fi + if test -z "$aix_libpath"; then + aix_libpath="/usr/lib:/lib" + fi + rm -f conftest.c conftest + # End _LT_AC_SYS_LIBPATH_AIX. + if test "$aix_use_runtimelinking" = yes; then + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + else + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + fi + fi + ;; + amigaos*) + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + bsdi[45]*) + ;; + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + libext=lib + ;; + darwin* | rhapsody*) + hardcode_direct=no + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then + : + else + ld_shlibs=no + fi + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + freebsd2.[01]*) + hardcode_direct=yes + hardcode_minus_L=yes + ;; + freebsd* | dragonfly*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + hpux9*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + hpux10*) + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + hpux11*) + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + ;; + *) + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + netbsd*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + newsos6) + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + *nto* | *qnx*) + ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + osf3*) + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + osf4* | osf5*) + if test "$GCC" = yes; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + # Both cc and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + solaris*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + sunos4*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + ;; + sysv4) + case $host_vendor in + sni) + hardcode_direct=yes # is this really true??? + ;; + siemens) + hardcode_direct=no + ;; + motorola) + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + ;; + sysv4.3*) + ;; + sysv4*MP*) + if test -d /usr/nec; then + ld_shlibs=yes + fi + ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + ;; + sysv5* | sco3.2v5* | sco5v6*) + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' + ;; + *) + ld_shlibs=no + ;; + esac +fi + +# Check dynamic linker characteristics +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. +# Unlike libtool.m4, here we don't care about _all_ names of the library, but +# only about the one the linker finds when passed -lNAME. This is the last +# element of library_names_spec in libtool.m4, or possibly two of them if the +# linker has special search rules. +library_names_spec= # the last element of library_names_spec in libtool.m4 +libname_spec='lib$name' +case "$host_os" in + aix3*) + library_names_spec='$libname.a' + ;; + aix[4-9]*) + library_names_spec='$libname$shrext' + ;; + amigaos*) + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac + ;; + beos*) + library_names_spec='$libname$shrext' + ;; + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; + cygwin* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; + darwin* | rhapsody*) + shrext=.dylib + library_names_spec='$libname$shrext' + ;; + dgux*) + library_names_spec='$libname$shrext' + ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; + freebsd* | dragonfly*) + library_names_spec='$libname$shrext' + ;; + gnu*) + library_names_spec='$libname$shrext' + ;; + haiku*) + library_names_spec='$libname$shrext' + ;; + hpux9* | hpux10* | hpux11*) + case $host_cpu in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac + library_names_spec='$libname$shrext' + ;; + interix[3-9]*) + library_names_spec='$libname$shrext' + ;; + irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' + case "$host_os" in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; + *) libsuff= shlibsuff= ;; + esac + ;; + esac + ;; + linux*oldld* | linux*aout* | linux*coff*) + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + library_names_spec='$libname$shrext' + ;; + knetbsd*-gnu) + library_names_spec='$libname$shrext' + ;; + netbsd*) + library_names_spec='$libname$shrext' + ;; + newsos6) + library_names_spec='$libname$shrext' + ;; + *nto* | *qnx*) + library_names_spec='$libname$shrext' + ;; + openbsd*) + library_names_spec='$libname$shrext$versuffix' + ;; + os2*) + libname_spec='$name' + shrext=.dll + library_names_spec='$libname.a' + ;; + osf3* | osf4* | osf5*) + library_names_spec='$libname$shrext' + ;; + rdos*) + ;; + solaris*) + library_names_spec='$libname$shrext' + ;; + sunos4*) + library_names_spec='$libname$shrext$versuffix' + ;; + sysv4 | sysv4.3*) + library_names_spec='$libname$shrext' + ;; + sysv4*MP*) + library_names_spec='$libname$shrext' + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + library_names_spec='$libname$shrext' + ;; + tpf*) + library_names_spec='$libname$shrext' + ;; + uts4*) + library_names_spec='$libname$shrext' + ;; +esac + +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` + +LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' </dev/null 2>&1; then : +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -77,13 +79,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -92,44 +87,27 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then @@ -149,26 +127,28 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +# out after a failed 'exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -183,42 +163,55 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -226,13 +219,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi ;; +esac +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -249,25 +250,27 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +# out after a failed 'exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -319,7 +322,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -328,7 +331,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -366,16 +369,18 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -383,16 +388,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -405,9 +412,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -434,7 +441,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -466,6 +473,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -477,7 +486,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -491,6 +500,9 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -504,6 +516,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -515,9 +533,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -542,10 +560,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 &1 @@ -568,56 +588,57 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='' +PACKAGE_TARNAME='' +PACKAGE_VERSION='' +PACKAGE_STRING='' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="driver/subprocs.c" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= +gt_needs= +enable_year2038=no ac_subst_vars='LTLIBOBJS LIBOBJS DEPEND_DEFINES DEPEND_FLAGS DEPEND APPDEFAULTS +FFMPEG_LIBS +FFMPEG_CFLAGS +FFMPEG_OBJS ANIM_LIBS ANIM_OBJS FONT_DIR @@ -659,6 +680,7 @@ NEW_LOGIN_COMMAND_P NEW_LOGIN_COMMAND COMMENT_PAM_CHECK_ACCOUNT HAVE_PAM_FAIL_DELAY +GLIB_COMPILE_RESOURCES INSTALL_PAM INSTALL_DIRS SETCAP_HACKS @@ -688,7 +710,6 @@ PTHREAD_LIBS PTHREAD_CXX PTHREAD_CC ax_pthread_config -SED target_os target_vendor target_cpu @@ -696,19 +717,23 @@ target login_manager_tmp gnome_url_show_program gnome_open_program -MKINSTALLDIRS +CATALOGS +localedir_c_make +localedir_c POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE +LTLIBINTL +LIBINTL INTLLIBS -INSTOBJEXT -GMOFILES -DATADIRNAME -CATOBJEXT -CATALOGS -MSGFMT_OPTS +LTLIBICONV +LIBICONV INTL_MACOSX_LIBS +XGETTEXT_EXTRA_OPTIONS +MSGMERGE_FOR_MSGFMT_OPTION +XGETTEXT_015 +GMSGFMT_015 +GETTEXT_MACRO_VERSION +SED +MKDIR_P GETTEXT_PACKAGE ALL_LINGUAS GMSGFMT @@ -752,8 +777,6 @@ X_PRE_LIBS X_CFLAGS XMKMF PERL -EGREP -GREP SET_MAKE INSTALL_DATA INSTALL_SCRIPT @@ -793,6 +816,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -818,6 +842,10 @@ enable_option_checking enable_largefile with_x enable_nls +with_gnu_ld +enable_rpath +with_libiconv_prefix +with_libintl_prefix with_app_defaults with_hackdir enable_subdir @@ -832,13 +860,13 @@ with_xf86gamma_ext with_xidle_ext with_sgi_ext with_sgivc_ext -with_readdisplay with_xshm_ext with_xdbe_ext with_xkb_ext with_proc_interrupts with_proc_oom with_systemd +with_elogind enable_locking enable_root_passwd with_pam @@ -863,6 +891,7 @@ with_pixbuf with_xft with_setuid_hacks with_record_animation +enable_year2038 ' ac_precious_vars='build_alias host_alias @@ -911,6 +940,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -940,8 +970,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -982,9 +1010,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1008,9 +1036,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1163,6 +1191,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1212,9 +1249,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1228,9 +1265,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1258,8 +1295,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1267,16 +1304,16 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1292,7 +1329,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1300,7 +1337,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1317,7 +1354,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1354,7 +1391,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1383,7 +1420,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1411,7 +1448,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,22 +1462,23 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --libexecdir=DIR program executables [EPREFIX/libexec] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] @@ -1467,6 +1505,8 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF + --enable-year2038 support timestamps after 2038 + Installation Options: --prefix=PREFIX Install root of architecture-independent files. @@ -1482,12 +1522,11 @@ Server Extension Options: --with-xf86vmode-ext Include support for virtual screens. --with-xinerama-ext Include support for multiple monitors. --with-randr-ext Include support for multiple monitors. - --with-xinput-ext Include support for the XInput2 extension. + --with-xinput-ext The XInput2 extension is required. --with-xf86gamma-ext Include support for XFree86 gamma fading. --with-xidle-ext Include support for the X11R5 XIDLE extension. --with-sgi-ext Include support for the SGI SCREEN_SAVER extension. --with-sgivc-ext Include support for the SGI-VIDEO-CONTROL extension. - --with-readdisplay Include support for the SGI XReadDisplay extension. --with-xshm-ext Include support for the Shared Memory extension. --with-xdbe-ext Include support for the DOUBLE-BUFFER extension. --with-xkb-ext Include support for the X Keyboard extension. @@ -1496,16 +1535,17 @@ Server Extension Options: --with-proc-oom Include support to duck the out-of-memory killer. --with-systemd Support systemd requests to lock on suspend, and to allow video players to inhibit the screen saver. + --with-elogind Use elogind instead of systemd. Screen Locking Options: --disable-locking Do not allow locking of the display at all. - --with-pam Include support for PAM (Pluggable Auth Modules). + --with-pam Use Pluggable Authentication Modules. --with-pam-service-name Set the name of the xscreensaver PAM service. --enable-pam-account Whether PAM should check the result of account modules when authenticating. Only do this if you have "account" modules configured on your system. - --enable-root-passwd Allow the root passwd to unlock, if not using PAM. + --enable-root-passwd Allow the root password to unlock, if not using PAM. --with-kerberos Include support for Kerberos authentication. --with-shadow Include support for shadow password authentication. @@ -1521,7 +1561,6 @@ User Interface Options: Graphics Options: - --with-gl Build those demos which depend on OpenGL. --with-gles Emulate OpenGL 1.3 in terms of OpenGL ES 1.x. --with-glx Use GLX to interface OpenGL and X11 instead of EGL. --with-gle Include support for the GL Extrusion library. @@ -1546,7 +1585,7 @@ Some influential environment variables: CPP C preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1565,9 +1604,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1595,7 +1634,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1603,7 +1643,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1613,9 +1653,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.72 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1632,14 +1672,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -rf conftest.$ac_objext + rm -rf conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1647,17 +1687,19 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1676,7 +1718,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1684,151 +1726,24 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -rf conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ac_retval=1 ;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval -} # ac_fn_c_try_run +} # ac_fn_c_try_cpp # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- @@ -1837,26 +1752,30 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1868,17 +1787,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -1886,12 +1806,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -1899,18 +1820,21 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else - eval "$3=yes" +else case e in #( + e) eval "$3=yes" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1921,14 +1845,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -rf conftest.$ac_objext conftest$ac_exeext + rm -rf conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1936,20 +1860,22 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1967,28 +1893,22 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. For example, HP-UX 11i declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (void); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1997,7 +1917,7 @@ else #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2006,24 +1926,27 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2035,16 +1958,17 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +printf %s "checking for $2.$3... " >&6; } +if eval test \${$4+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (ac_aggr.$3) @@ -2053,14 +1977,15 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -2069,29 +1994,97 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else - eval "$4=no" +else case e in #( + e) eval "$4=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status ;; +esac +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2124,8 +2117,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2158,7 +2155,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2193,11 +2190,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2208,8 +2207,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2233,7 +2232,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2241,14 +2240,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2256,15 +2255,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2272,8 +2271,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2287,64 +2286,49 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2352,61 +2336,494 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (char **p, int i) +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +/* Does the compiler advertise C99 conformance? */ +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +// See if C++-style comments work. + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); +extern void free (void *); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +/* Does the compiler advertise C11 conformance? */ +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +gt_needs="$gt_needs " + +# Auxiliary files required by this configure script. +ac_aux_files="config.rpath install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2416,11 +2833,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2437,6 +2855,11 @@ ac_config_headers="$ac_config_headers config.h" echo "current directory: `pwd`" echo "command line was: $0 $@" +if ! test -z "$ac_unrecognized_opts" ; then + echo "" >&2 + exit 2 +fi + ############################################################################### # # Autoheader stuff @@ -2479,9 +2902,6 @@ echo "command line was: $0 $@" # Locking. # -#AH_TEMPLATE([PASSWD_HELPER_PROGRAM], -# [Define this to use a third-party password helper program.]) - # After checking to see that --srcdir is correct (which AC_INIT does) # check for some random other files that come later in the tar file, # to make sure everything is here. @@ -2609,54 +3029,29 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # random compiler setup -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2674,21 +3069,23 @@ build_os=$* IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2707,6 +3104,7 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_original_cc=$CC + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2715,38 +3113,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -2754,38 +3158,44 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2793,8 +3203,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2807,38 +3217,44 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -2846,12 +3262,13 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2859,15 +3276,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2883,18 +3304,19 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -2904,38 +3326,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$CC" && break @@ -2947,38 +3375,44 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$ac_ct_CC" && break @@ -2989,8 +3423,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2998,43 +3432,148 @@ esac fi fi - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -rf conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } done + done +IFS=$as_save_IFS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +fi ;; +esac +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -int -main () -{ +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See 'config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -rf conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ ; return 0; @@ -3045,9 +3584,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3068,13 +3607,14 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -3089,12 +3629,12 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -3105,48 +3645,52 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3156,15 +3700,16 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -rf conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -rf conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3173,9 +3718,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3185,8 +3732,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3194,10 +3741,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3205,39 +3752,41 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } -rm -rf conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -rf conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3251,11 +3800,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3264,31 +3814,34 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -rf conftest.$ac_cv_objext conftest.$ac_ext +rm -rf conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3298,30 +3851,36 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3329,57 +3888,63 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3394,94 +3959,153 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -rf conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -rf conftest.$ac_ext +CC=$ac_save_CC ;; +esac +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" ;; +esac +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 ;; +esac +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -rf conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac +fi +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 ;; esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - +fi fi ac_ext=c @@ -3492,35 +4116,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -z "$GCC"; then # not using GCC - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to request ANSI compilation" >&5 -$as_echo_n "checking how to request ANSI compilation... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra compiler flags" >&5 +printf %s "checking for extra compiler flags... " >&6; } case "$host" in - *-hpux* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: HPUX: adding -Ae" >&5 -$as_echo "HPUX: adding -Ae" >&6; } - CC="$CC -Ae" - ;; *-aix* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX: adding -qlanglvl=ansi -qhalt=e" >&5 -$as_echo "AIX: adding -qlanglvl=ansi -qhalt=e" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AIX: adding -qhalt=e" >&5 +printf "%s\n" "AIX: adding -qhalt=e" >&6; } CC="$CC -qlanglvl=ansi -qhalt=e" ;; - *-dec-* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: DEC: adding -std1 -ieee" >&5 -$as_echo "DEC: adding -std1 -ieee" >&6; } - CC="$CC -std1" - ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no idea" >&5 -$as_echo "no idea" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } ;; esac else # using GCC case "$host" in *-solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris: adding -D__EXTENSIONS__" >&5 -$as_echo "Solaris: adding -D__EXTENSIONS__" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Solaris: adding -D__EXTENSIONS__" >&5 +printf "%s\n" "Solaris: adding -D__EXTENSIONS__" >&6; } CC="$CC -D__EXTENSIONS__" ;; esac @@ -3531,226 +4145,243 @@ $as_echo "Solaris: adding -D__EXTENSIONS__" >&6; } # extensions (such as allowing C++ style "//" comments in C code, and # declarations after statements) were not supported by non-gcc compilers # for many years, so we continued to use "-std=c89" to prevent those - # GNU-isms from sneaking in to the code. Well, these days various - # vendors have sloppily allowed non-ANSI syntax to slip into their - # library header files. GTK and OpenGL have been major offenders in this - # way. So... as of 2021, I guess we are forced to use "-std=gnu89", to - # allow those extensions, and hope that the warnings generated by - # "-pedantic" are heeded. + # GNU-isms from sneaking in to the code. + # + # These days XScreenSaver uses C99, which supports "//" comments and + # declarations after statements. # if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -std=gnu89" >&5 -$as_echo_n "checking whether gcc accepts -std=gnu89... " >&6; } -if ${ac_cv_gcc_accepts_gnu89+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -std=gnu99" >&5 +printf %s "checking whether gcc accepts -std=gnu99... " >&6; } +if test ${ac_cv_gcc_accepts_gnu99+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -std=gnu89 conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -std=gnu99 | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_gnu89=no + ac_cv_gcc_accepts_gnu99=no else - ac_cv_gcc_accepts_gnu89=yes - CC="$CC -std=gnu89" - fi + ac_cv_gcc_accepts_gnu99=yes + CC="$CC -std=gnu99" + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_gnu89" >&5 -$as_echo "$ac_cv_gcc_accepts_gnu89" >&6; } - ac_gcc_accepts_gnu89="$ac_cv_gcc_accepts_gnu89" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_gnu99" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_gnu99" >&6; } + ac_gcc_accepts_gnu99="$ac_cv_gcc_accepts_gnu99" fi if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -pedantic" >&5 -$as_echo_n "checking whether gcc accepts -pedantic... " >&6; } -if ${ac_cv_gcc_accepts_pedantic+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -pedantic" >&5 +printf %s "checking whether gcc accepts -pedantic... " >&6; } +if test ${ac_cv_gcc_accepts_pedantic+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -pedantic conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -pedantic | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_pedantic=no else ac_cv_gcc_accepts_pedantic=yes CC="$CC -pedantic" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_pedantic" >&5 -$as_echo "$ac_cv_gcc_accepts_pedantic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_pedantic" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_pedantic" >&6; } ac_gcc_accepts_pedantic="$ac_cv_gcc_accepts_pedantic" fi if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wall" >&5 -$as_echo_n "checking whether gcc accepts -Wall... " >&6; } -if ${ac_cv_gcc_accepts_Wall+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wall" >&5 +printf %s "checking whether gcc accepts -Wall... " >&6; } +if test ${ac_cv_gcc_accepts_Wall+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -Wall conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -Wall | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_Wall=no else ac_cv_gcc_accepts_Wall=yes CC="$CC -Wall" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_Wall" >&5 -$as_echo "$ac_cv_gcc_accepts_Wall" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_Wall" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_Wall" >&6; } ac_gcc_accepts_Wall="$ac_cv_gcc_accepts_Wall" fi if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wnested-externs" >&5 -$as_echo_n "checking whether gcc accepts -Wnested-externs... " >&6; } -if ${ac_cv_gcc_accepts_wnested_externs+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wnested-externs" >&5 +printf %s "checking whether gcc accepts -Wnested-externs... " >&6; } +if test ${ac_cv_gcc_accepts_wnested_externs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -Wnested-externs conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -Wnested-externs | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_wnested_externs=no else ac_cv_gcc_accepts_wnested_externs=yes CC="$CC -Wnested-externs" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wnested_externs" >&5 -$as_echo "$ac_cv_gcc_accepts_wnested_externs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wnested_externs" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_wnested_externs" >&6; } ac_gcc_accepts_wnested_externs="$ac_cv_gcc_accepts_wnested_externs" fi if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wstrict-prototypes" >&5 -$as_echo_n "checking whether gcc accepts -Wstrict-prototypes... " >&6; } -if ${ac_cv_gcc_accepts_wstrict_prototypes+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wstrict-prototypes" >&5 +printf %s "checking whether gcc accepts -Wstrict-prototypes... " >&6; } +if test ${ac_cv_gcc_accepts_wstrict_prototypes+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -Wstrict-prototypes conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -Wstrict-prototypes | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_wstrict_prototypes=no else ac_cv_gcc_accepts_wstrict_prototypes=yes CC="$CC -Wstrict-prototypes" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wstrict_prototypes" >&5 -$as_echo "$ac_cv_gcc_accepts_wstrict_prototypes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wstrict_prototypes" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_wstrict_prototypes" >&6; } ac_gcc_accepts_wstrict_prototypes="$ac_cv_gcc_accepts_wstrict_prototypes" fi if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wmissing-prototypes" >&5 -$as_echo_n "checking whether gcc accepts -Wmissing-prototypes... " >&6; } -if ${ac_cv_gcc_accepts_wmissing_prototypes+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wmissing-prototypes" >&5 +printf %s "checking whether gcc accepts -Wmissing-prototypes... " >&6; } +if test ${ac_cv_gcc_accepts_wmissing_prototypes+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -Wmissing-prototypes conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -Wmissing-prototypes | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_wmissing_prototypes=no else ac_cv_gcc_accepts_wmissing_prototypes=yes CC="$CC -Wmissing-prototypes" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wmissing_prototypes" >&5 -$as_echo "$ac_cv_gcc_accepts_wmissing_prototypes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_wmissing_prototypes" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_wmissing_prototypes" >&6; } ac_gcc_accepts_wmissing_prototypes="$ac_cv_gcc_accepts_wmissing_prototypes" fi - if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wdeclaration-after-statement" >&5 -$as_echo_n "checking whether gcc accepts -Wdeclaration-after-statement... " >&6; } -if ${ac_cv_gcc_accepts_declaration_after+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext - touch conftest.$ac_ext - if ( ( gcc -c -Wdeclaration-after-statement conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_declaration_after=no - else - ac_cv_gcc_accepts_declaration_after=yes - CC="$CC -Wdeclaration-after-statement" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_declaration_after" >&5 -$as_echo "$ac_cv_gcc_accepts_declaration_after" >&6; } - ac_gcc_accepts_declaration_after="$ac_cv_gcc_accepts_declaration_after" - fi - # "string length is greater than ISO C89 compilers required to support" if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-overlength-strings" >&5 -$as_echo_n "checking whether gcc accepts -Wno-overlength-strings... " >&6; } -if ${ac_cv_gcc_accepts_no_overlength_strings+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-overlength-strings" >&5 +printf %s "checking whether gcc accepts -Wno-overlength-strings... " >&6; } +if test ${ac_cv_gcc_accepts_no_overlength_strings+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c -Wno-overlength-strings conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo -Wno-overlength-strings | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_no_overlength_strings=no else ac_cv_gcc_accepts_no_overlength_strings=yes CC="$CC -Wno-overlength-strings" - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_no_overlength_strings" >&5 -$as_echo "$ac_cv_gcc_accepts_no_overlength_strings" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_no_overlength_strings" >&5 +printf "%s\n" "$ac_cv_gcc_accepts_no_overlength_strings" >&6; } ac_gcc_accepts_no_overlength_strings="$ac_cv_gcc_accepts_no_overlength_strings" fi - # Ignore warnings about using "inline" - if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-language-extension-token" >&5 -$as_echo_n "checking whether gcc accepts -Wno-language-extension-token... " >&6; } -if ${ac_cv_gcc_accepts_no_language_ext_token+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext - touch conftest.$ac_ext - if ( ( gcc -c -Wno-language-extension-token conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_no_language_ext_token=no - else - ac_cv_gcc_accepts_no_language_ext_token=yes - CC="$CC -Wno-language-extension-token" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_no_language_ext_token" >&5 -$as_echo "$ac_cv_gcc_accepts_no_language_ext_token" >&6; } - ac_gcc_accepts_no_language_ext_token="$ac_cv_gcc_accepts_no_language_ext_token" - fi - - # Xlib headers use named variadic macros. - if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-variadic-macros" >&5 -$as_echo_n "checking whether gcc accepts -Wno-variadic-macros... " >&6; } -if ${ac_cv_gcc_accepts_no_variadic_macros+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -rf conftest.$ac_ext - touch conftest.$ac_ext - if ( ( gcc -c -Wno-variadic-macros conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_no_variadic_macros=no - else - ac_cv_gcc_accepts_no_variadic_macros=yes - CC="$CC -Wno-variadic-macros" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_accepts_no_variadic_macros" >&5 -$as_echo "$ac_cv_gcc_accepts_no_variadic_macros" >&6; } - ac_gcc_accepts_no_variadic_macros="$ac_cv_gcc_accepts_no_variadic_macros" - fi - fi ac_ext=c @@ -3758,42 +4389,39 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -rf conftest.err conftest.i conftest.$ac_ext @@ -3803,56 +4431,56 @@ rm -rf conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -rf conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -rf conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi done ac_cv_prog_CPP=$CPP - + ;; +esac fi CPP=$ac_cv_prog_CPP else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -rf conftest.err conftest.i conftest.$ac_ext @@ -3862,26 +4490,30 @@ rm -rf conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -rf conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -rf conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi ac_ext=c @@ -3890,131 +4522,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - -#ifndef __cplusplus - /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; - const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this sort of thing. */ - char tx; - char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes -else - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -$as_echo "#define const /**/" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +# stuff for Makefiles -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -# stuff for Makefiles -# Find a good install program. We prefer a C program (faster), + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -4028,20 +4538,25 @@ esac # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -4051,13 +4566,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -4065,12 +4580,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -4084,9 +4599,10 @@ esac IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir - + ;; +esac fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -4096,8 +4612,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4107,12 +4623,13 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \"\${INSTALL} -d\" creates intermediate directories" >&5 -$as_echo_n "checking whether \"\${INSTALL} -d\" creates intermediate directories... " >&6; } -if ${ac_cv_install_d_creates_dirs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_install_d_creates_dirs=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether \"\${INSTALL} -d\" creates intermediate directories" >&5 +printf %s "checking whether \"\${INSTALL} -d\" creates intermediate directories... " >&6; } +if test ${ac_cv_install_d_creates_dirs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_install_d_creates_dirs=no rm -rf conftestdir if mkdir conftestdir; then cd conftestdir 2>/dev/null @@ -4123,18 +4640,20 @@ else cd .. 2>/dev/null rm -rf conftestdir fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_install_d_creates_dirs" >&5 -$as_echo "$ac_cv_install_d_creates_dirs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_install_d_creates_dirs" >&5 +printf "%s\n" "$ac_cv_install_d_creates_dirs" >&6; } if test "$ac_cv_install_d_creates_dirs" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \"mkdir -p\" creates intermediate directories" >&5 -$as_echo_n "checking whether \"mkdir -p\" creates intermediate directories... " >&6; } -if ${ac_cv_mkdir_p_creates_dirs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_mkdir_p_creates_dirs=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether \"mkdir -p\" creates intermediate directories" >&5 +printf %s "checking whether \"mkdir -p\" creates intermediate directories... " >&6; } +if test ${ac_cv_mkdir_p_creates_dirs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_mkdir_p_creates_dirs=no rm -rf conftestdir if mkdir conftestdir; then cd conftestdir 2>/dev/null @@ -4145,10 +4664,11 @@ else cd .. 2>/dev/null rm -rf conftestdir fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mkdir_p_creates_dirs" >&5 -$as_echo "$ac_cv_mkdir_p_creates_dirs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mkdir_p_creates_dirs" >&5 +printf "%s\n" "$ac_cv_mkdir_p_creates_dirs" >&6; } fi if test "$ac_cv_install_d_creates_dirs" = yes ; then @@ -4160,14 +4680,15 @@ $as_echo "$ac_cv_mkdir_p_creates_dirs" >&6; } INSTALL_DIRS='${INSTALL} -d' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' @@ -4179,15 +4700,16 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in *) eval ac_cv_prog_make_${ac_make}_set=no;; esac -rm -rf conftest.make +rm -rf conftest.make ;; +esac fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -4200,318 +4722,109 @@ INSTALL_SCRIPT='${INSTALL}' # random libc stuff -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item fi -else - ac_cv_path_GREP=$GREP -fi +done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; -esac +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = xyes +then : -else - ac_cv_header_stdc=no +else case e in #( + e) +printf "%s\n" "#define mode_t int" >>confdefs.h + ;; +esac fi -rm -rf conftest* -fi + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -for ac_header in unistd.h inttypes.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int _ACEOF - +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else case e in #( + e) ac_pid_type='__int64' ;; +esac fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + ;; +esac fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +if test "x$ac_cv_type_size_t" = xyes +then : +else case e in #( + e) +printf "%s\n" "#define size_t unsigned int" >>confdefs.h + ;; +esac fi -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE void -_ACEOF +printf "%s\n" "#define RETSIGTYPE void" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test ${ac_cv_header_sys_wait_h+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4523,7 +4836,7 @@ else #endif int -main () +main (void) { int s; wait (&s); @@ -4532,36 +4845,40 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes -else - ac_cv_header_sys_wait_h=no +else case e in #( + e) ac_cv_header_sys_wait_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +printf %s "checking for $ac_hdr that defines DIR... " >&6; } +if eval test \${$as_ac_Header+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -4569,19 +4886,23 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$as_ac_Header=yes" -else - eval "$as_ac_Header=no" +else case e in #( + e) eval "$as_ac_Header=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | sed "$as_sed_cpp"` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -4590,132 +4911,155 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char opendir (); +char opendir (void); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' dir; do +for ac_lib in '' dir +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else - ac_cv_search_opendir=no +else case e in #( + e) ac_cv_search_opendir=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char opendir (); +char opendir (void); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' x; do +for ac_lib in '' x +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else - ac_cv_search_opendir=no +else case e in #( + e) ac_cv_search_opendir=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to call gettimeofday" >&5 -$as_echo_n "checking how to call gettimeofday... " >&6; } - if ${ac_cv_gettimeofday_args+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to call gettimeofday" >&5 +printf %s "checking how to call gettimeofday... " >&6; } + if test ${ac_cv_gettimeofday_args+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { struct timeval tv; struct timezone tzp; gettimeofday(&tv, &tzp); @@ -4723,295 +5067,327 @@ struct timeval tv; struct timezone tzp; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_gettimeofday_args=2 -else - ac_gettimeofday_args=1 +else case e in #( + e) ac_gettimeofday_args=1 ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_gettimeofday_args=$ac_gettimeofday_args +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_gettimeofday_args=$ac_gettimeofday_args ;; +esac fi ac_gettimeofday_args=$ac_cv_gettimeofday_args if test "$ac_gettimeofday_args" = 1 ; then - $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: one argument" >&5 -$as_echo "one argument" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: one argument" >&5 +printf "%s\n" "one argument" >&6; } elif test "$ac_gettimeofday_args" = 2 ; then - $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h - $as_echo "#define GETTIMEOFDAY_TWO_ARGS 1" >>confdefs.h + printf "%s\n" "#define GETTIMEOFDAY_TWO_ARGS 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: two arguments" >&5 -$as_echo "two arguments" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: two arguments" >&5 +printf "%s\n" "two arguments" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 +printf "%s\n" "unknown" >&6; } fi # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi - -if test "$enable_largefile" != no; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if test "$enable_largefile,$enable_year2038" != no,no +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 +printf %s "checking for $CC option to enable large file support... " >&6; } +if test ${ac_cv_sys_largefile_opts+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CC="$CC" + ac_opt_found=no + for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do + if test x"$ac_opt" != x"none needed" +then : + CC="$ac_save_CC $ac_opt" +fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, +#ifndef FTYPE +# define FTYPE off_t +#endif + /* Check that FTYPE can represent 2**63 - 1 correctly. + We can't simply define LARGE_FTYPE to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) +#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) + int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 + && LARGE_FTYPE % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_opt" = x"none needed" +then : + # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. + CC="$CC -DFTYPE=ino_t" + if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) CC="$CC -D_FILE_OFFSET_BITS=64" + if ac_fn_c_try_compile "$LINENO" +then : + ac_opt='-D_FILE_OFFSET_BITS=64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam ;; +esac fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break +rm -f core conftest.err conftest.$ac_objext conftest.beam fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -rf conftest.$ac_ext - fi + ac_cv_sys_largefile_opts=$ac_opt + ac_opt_found=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test $ac_opt_found = no || break + done + CC="$ac_save_CC" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 +printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } + +ac_have_largefile=yes +case $ac_cv_sys_largefile_opts in #( + "none needed") : + ;; #( + "supported through gnulib") : + ;; #( + "support not detected") : + ac_have_largefile=no ;; #( + "-D_FILE_OFFSET_BITS=64") : + +printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h + ;; #( + "-D_LARGE_FILES=1") : + +printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h + ;; #( + "-n32") : + CC="$CC -n32" ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +esac - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break +if test "$enable_year2038" != no +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5 +printf %s "checking for $CC option for timestamps after 2038... " >&6; } +if test ${ac_cv_sys_year2038_opts+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no + for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do + if test x"$ac_opt" != x"none needed" +then : + CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + + #include + /* Check that time_t can represent 2**32 - 1 correctly. */ + #define LARGE_TIME_T \\ + ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) + int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 + && LARGE_TIME_T % 65537 == 0) + ? 1 : -1]; + int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_year2038_opts="$ac_opt" + ac_opt_found=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test $ac_opt_found = no || break + done + CPPFLAGS="$ac_save_CPPFLAGS" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 +printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } + +ac_have_year2038=yes +case $ac_cv_sys_year2038_opts in #( + "none needed") : + ;; #( + "support not detected") : + ac_have_year2038=no ;; #( + "-D_TIME_BITS=64") : + +printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h + ;; #( + "-D__MINGW_USE_VC2005_COMPAT") : + +printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h + ;; #( + "-U_USE_32_BIT_TIME_T"*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It +will stop working after mid-January 2038. Remove +_USE_32BIT_TIME_T from the compiler flags. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done +ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" +if test "x$ac_cv_func_select" = xyes +then : + printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* - fi +ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl" +if test "x$ac_cv_func_fcntl" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL 1" >>confdefs.h fi +ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname" +if test "x$ac_cv_func_uname" = xyes +then : + printf "%s\n" "#define HAVE_UNAME 1" >>confdefs.h -for ac_func in select fcntl uname nice setpriority getcwd getwd putenv sbrk -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice" +if test "x$ac_cv_func_nice" = xyes +then : + printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" +if test "x$ac_cv_func_setpriority" = xyes +then : + printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h -for ac_func in sigaction syslog realpath setrlimit -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +if test "x$ac_cv_func_getcwd" = xyes +then : + printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" +if test "x$ac_cv_func_getwd" = xyes +then : + printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h -for ac_func in setlocale sqrtf -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes +then : + printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "sbrk" "ac_cv_func_sbrk" +if test "x$ac_cv_func_sbrk" = xyes +then : + printf "%s\n" "#define HAVE_SBRK 1" >>confdefs.h -for ac_func in getaddrinfo -do : - ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" -if test "x$ac_cv_func_getaddrinfo" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETADDRINFO 1 -_ACEOF +fi + +ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes +then : + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog" +if test "x$ac_cv_func_syslog" = xyes +then : + printf "%s\n" "#define HAVE_SYSLOG 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath" +if test "x$ac_cv_func_realpath" = xyes +then : + printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit" +if test "x$ac_cv_func_setrlimit" = xyes +then : + printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" +if test "x$ac_cv_func_setlocale" = xyes +then : + printf "%s\n" "#define HAVE_SETLOCALE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sqrtf" "ac_cv_func_sqrtf" +if test "x$ac_cv_func_sqrtf" = xyes +then : + printf "%s\n" "#define HAVE_SQRTF 1" >>confdefs.h + +fi + +ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +if test "x$ac_cv_func_getaddrinfo" = xyes +then : + printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h fi -done ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include " -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct icmp" >&5 -$as_echo_n "checking for struct icmp... " >&6; } -if ${ac_cv_have_icmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct icmp" >&5 +printf %s "checking for struct icmp... " >&6; } +if test ${ac_cv_have_icmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5033,7 +5409,7 @@ else #include #include int -main () +main (void) { struct icmp i; struct sockaddr s; @@ -5055,25 +5431,29 @@ struct icmp i; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_have_icmp=yes -else - ac_cv_have_icmp=no +else case e in #( + e) ac_cv_have_icmp=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_icmp" >&5 -$as_echo "$ac_cv_have_icmp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_icmp" >&5 +printf "%s\n" "$ac_cv_have_icmp" >&6; } if test "$ac_cv_have_icmp" = yes ; then - $as_echo "#define HAVE_ICMP 1" >>confdefs.h + printf "%s\n" "#define HAVE_ICMP 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct icmphdr" >&5 -$as_echo_n "checking for struct icmphdr... " >&6; } -if ${ac_cv_have_icmphdr+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct icmphdr" >&5 +printf %s "checking for struct icmphdr... " >&6; } +if test ${ac_cv_have_icmphdr+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5095,7 +5475,7 @@ else #include #include int -main () +main (void) { struct icmphdr i; struct sockaddr s; @@ -5112,32 +5492,36 @@ struct icmphdr i; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_have_icmphdr=yes -else - ac_cv_have_icmphdr=no +else case e in #( + e) ac_cv_have_icmphdr=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_icmphdr" >&5 -$as_echo "$ac_cv_have_icmphdr" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_icmphdr" >&5 +printf "%s\n" "$ac_cv_have_icmphdr" >&6; } if test "$ac_cv_have_icmphdr" = yes ; then - $as_echo "#define HAVE_ICMPHDR 1" >>confdefs.h + printf "%s\n" "#define HAVE_ICMPHDR 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs" >&5 -$as_echo_n "checking for getifaddrs... " >&6; } -if ${ac_cv_have_getifaddrs+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getifaddrs" >&5 +printf %s "checking for getifaddrs... " >&6; } +if test ${ac_cv_have_getifaddrs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include #include #include int -main () +main (void) { struct ifaddrs *ifa; getifaddrs (&ifa); @@ -5147,74 +5531,82 @@ struct ifaddrs *ifa; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_have_getifaddrs=yes -else - ac_cv_have_getifaddrs=no +else case e in #( + e) ac_cv_have_getifaddrs=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getifaddrs" >&5 -$as_echo "$ac_cv_have_getifaddrs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getifaddrs" >&5 +printf "%s\n" "$ac_cv_have_getifaddrs" >&6; } if test "$ac_cv_have_getifaddrs" = yes ; then - $as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 -$as_echo_n "checking for socklen_t... " >&6; } -if ${ac_cv_type_socklen_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 +printf %s "checking for socklen_t... " >&6; } +if test ${ac_cv_type_socklen_t+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { socklen_t socklen; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_type_socklen_t=yes -else - ac_cv_type_socklen_t=no +else case e in #( + e) ac_cv_type_socklen_t=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 -$as_echo "$ac_cv_type_socklen_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_socklen_t" >&5 +printf "%s\n" "$ac_cv_type_socklen_t" >&6; } if test "$ac_cv_type_socklen_t" != yes; then -$as_echo "#define socklen_t int" >>confdefs.h +printf "%s\n" "#define socklen_t int" >>confdefs.h fi -for ac_header in crypt.h sys/select.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" +if test "x$ac_cv_header_crypt_h" = xyes +then : + printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h -done +fi for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PERL in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PERL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; @@ -5223,11 +5615,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5235,15 +5631,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$PERL" && break @@ -5252,15 +5649,17 @@ done if test -z "$PERL" ; then PERL_VERSION=0 else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking perl version" >&5 -$as_echo_n "checking perl version... " >&6; } -if ${ac_cv_perl_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_perl_version=`$PERL -e "$perl_version_cmd"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking perl version" >&5 +printf %s "checking perl version... " >&6; } +if test ${ac_cv_perl_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_perl_version=`$PERL -e "$perl_version_cmd"` ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_perl_version" >&5 -$as_echo "$ac_cv_perl_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_perl_version" >&5 +printf "%s\n" "$ac_cv_perl_version" >&6; } PERL_VERSION=$ac_cv_perl_version fi @@ -5269,27 +5668,57 @@ if test -z "$PERL" ; then PERL=/usr/bin/perl fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +printf %s "checking for X... " >&6; } # Check whether --with-x was given. -if test "${with_x+set}" = set; then : +if test ${with_x+y} +then : withval=$with_x; fi -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +# $have_x is 'yes', 'no', 'disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : - $as_echo_n "(cached) " >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir + *,NONE | NONE,*) if test ${ac_cv_have_x+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no +ac_x_libraries=no +# Do we need to do anything special at all? +ac_save_LIBS=$LIBS +LIBS="-lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + # We can compile and link X programs with no special options. + ac_x_includes= + ac_x_libraries= +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +# If that didn't work, only try xmkmf and file system searches +# for native compilation. +if test x"$ac_x_includes" = xno && test "$cross_compiling" = no +then : + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -5328,7 +5757,7 @@ _ACEOF rm -f -r conftest.dir fi -# Standard set of common directories for X headers. + # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -5355,6 +5784,8 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +/opt/X11/include + /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -5376,16 +5807,18 @@ if test "$ac_x_includes" = no; then /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # We can compile using X headers with no special include directory. ac_x_includes= -else - for ac_dir in $ac_x_header_dirs; do +else case e in #( + e) for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi -done +done ;; +esac fi rm -rf conftest.err conftest.i conftest.$ac_ext fi # $ac_x_includes = no @@ -5400,20 +5833,21 @@ if test "$ac_x_libraries" = no; then /* end confdefs.h. */ #include int -main () +main (void) { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +else case e in #( + e) LIBS=$ac_save_LIBS +for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -5422,21 +5856,25 @@ do break 2 fi done -done +done ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no +fi +# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) + no,* | *,no | *\'*) : # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) + ac_cv_have_x="have_x=no" ;; #( + *) : # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + ac_x_libraries='$ac_x_libraries'" ;; +esac ;; esac fi ;; #( @@ -5446,8 +5884,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +printf "%s\n" "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -5457,14 +5895,14 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -5477,8 +5915,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +printf %s "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -5486,42 +5924,46 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else - LIBS="$ac_xsave_LIBS -R $x_libraries" +else case e in #( + e) LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +printf "%s\n" "neither works" >&6; } ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -5543,106 +5985,127 @@ rm -f core conftest.err conftest.$ac_objext \ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XOpenDisplay (); +char XOpenDisplay (void); int -main () +main (void) { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +if ac_fn_c_try_link "$LINENO" +then : + +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +printf %s "checking for dnet_ntoa in -ldnet... " >&6; } +if test ${ac_cv_lib_dnet_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dnet_ntoa (); +char dnet_ntoa (void); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_dnet_ntoa=yes -else - ac_cv_lib_dnet_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_dnet_ntoa=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dnet_ntoa (); +char dnet_ntoa (void); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - ac_cv_lib_dnet_stub_dnet_ntoa=no +else case e in #( + e) ac_cv_lib_dnet_stub_dnet_ntoa=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi - fi + fi ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -5655,89 +6118,106 @@ rm -f core conftest.err conftest.$ac_objext \ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : +if test "x$ac_cv_func_gethostbyname" = xyes +then : fi if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char gethostbyname (void); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else - ac_cv_lib_nsl_gethostbyname=no +else case e in #( + e) ac_cv_lib_nsl_gethostbyname=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +printf %s "checking for gethostbyname in -lbsd... " >&6; } +if test ${ac_cv_lib_bsd_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gethostbyname (); +char gethostbyname (void); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_bsd_gethostbyname=yes -else - ac_cv_lib_bsd_gethostbyname=no +else case e in #( + e) ac_cv_lib_bsd_gethostbyname=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -5752,48 +6232,57 @@ fi # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes; then : +if test "x$ac_cv_func_connect" = xyes +then : fi if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if ${ac_cv_lib_socket_connect+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +printf %s "checking for connect in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_connect+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char connect (); +char connect (void); int -main () +main (void) { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_connect=yes -else - ac_cv_lib_socket_connect=no +else case e in #( + e) ac_cv_lib_socket_connect=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes +then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -5801,48 +6290,57 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes; then : +if test "x$ac_cv_func_remove" = xyes +then : fi if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if ${ac_cv_lib_posix_remove+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +printf %s "checking for remove in -lposix... " >&6; } +if test ${ac_cv_lib_posix_remove+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char remove (); +char remove (void); int -main () +main (void) { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix_remove=yes -else - ac_cv_lib_posix_remove=no +else case e in #( + e) ac_cv_lib_posix_remove=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -5850,48 +6348,57 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : +if test "x$ac_cv_func_shmat" = xyes +then : fi if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if ${ac_cv_lib_ipc_shmat+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +printf %s "checking for shmat in -lipc... " >&6; } +if test ${ac_cv_lib_ipc_shmat+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char shmat (); +char shmat (void); int -main () +main (void) { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ipc_shmat=yes -else - ac_cv_lib_ipc_shmat=no +else case e in #( + e) ac_cv_lib_ipc_shmat=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -5907,43 +6414,51 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +printf %s "checking for IceConnectionNumber in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceConnectionNumber+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char IceConnectionNumber (); +char IceConnectionNumber (void); int -main () +main (void) { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceConnectionNumber=yes -else - ac_cv_lib_ICE_IceConnectionNumber=no +else case e in #( + e) ac_cv_lib_ICE_IceConnectionNumber=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -5999,7 +6514,8 @@ case "$host" in # 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 + 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 @@ -6065,43 +6581,51 @@ case "$host" in MOTIF_LIBS="$MOTIF_LIBS -L/usr/dt/lib -R/usr/dt/lib" # Some versions of Slowlaris Motif require -lgen. But not all. Why? - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcmp in -lgen" >&5 -$as_echo_n "checking for regcmp in -lgen... " >&6; } -if ${ac_cv_lib_gen_regcmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for regcmp in -lgen" >&5 +printf %s "checking for regcmp in -lgen... " >&6; } +if test ${ac_cv_lib_gen_regcmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char regcmp (); +char regcmp (void); int -main () +main (void) { return regcmp (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_gen_regcmp=yes -else - ac_cv_lib_gen_regcmp=no +else case e in #( + e) ac_cv_lib_gen_regcmp=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_regcmp" >&5 -$as_echo "$ac_cv_lib_gen_regcmp" >&6; } -if test "x$ac_cv_lib_gen_regcmp" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_regcmp" >&5 +printf "%s\n" "$ac_cv_lib_gen_regcmp" >&6; } +if test "x$ac_cv_lib_gen_regcmp" = xyes +then : MOTIF_LIBS="$MOTIF_LIBS -lgen" fi @@ -6135,12 +6659,13 @@ fi fi ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5 -$as_echo_n "checking for XPointer... " >&6; } -if ${ac_cv_xpointer+:} false; then : - $as_echo_n "(cached) " >&6 -else - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5 +printf %s "checking for XPointer... " >&6; } +if test ${ac_cv_xpointer+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -6151,33 +6676,37 @@ else /* end confdefs.h. */ #include int -main () +main (void) { XPointer foo = (XPointer) 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_xpointer=yes -else - ac_cv_xpointer=no +else case e in #( + e) ac_cv_xpointer=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xpointer" >&5 -$as_echo "$ac_cv_xpointer" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xpointer" >&5 +printf "%s\n" "$ac_cv_xpointer" >&6; } if test "$ac_cv_xpointer" != yes; then - $as_echo "#define XPointer char*" >>confdefs.h + printf "%s\n" "#define XPointer char*" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xt" >&5 -$as_echo_n "checking for Xt... " >&6; } -if ${ac_cv_libxt+:} false; then : - $as_echo_n "(cached) " >&6 -else - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xt" >&5 +printf %s "checking for Xt... " >&6; } +if test ${ac_cv_libxt+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -6189,26 +6718,29 @@ else #include #include int -main () +main (void) { Widget foo = (Widget) 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_libxt=yes -else - ac_cv_libxt=no +else case e in #( + e) ac_cv_libxt=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libxt" >&5 -$as_echo "$ac_cv_libxt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libxt" >&5 +printf "%s\n" "$ac_cv_libxt" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is macOS" >&5 -$as_echo_n "checking whether this is macOS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether this is macOS" >&5 +printf %s "checking whether this is macOS... " >&6; } ac_macosx=no ac_irix=no case "$host" in @@ -6219,8 +6751,8 @@ $as_echo_n "checking whether this is macOS... " >&6; } ac_irix=yes ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_macosx" >&5 -$as_echo "$ac_macosx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_macosx" >&5 +printf "%s\n" "$ac_macosx" >&6; } ############################################################################### # @@ -6228,15 +6760,19 @@ $as_echo "$ac_macosx" >&6; } # ############################################################################### +# Note: In the decades since I wrote this, PKG_CHECK_MODULES came into +# existence, which could probably simplify the following quite a bit. + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_pkg_config+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $pkg_config in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_pkg_config+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $pkg_config in [\\/]* | ?:[\\/]*) ac_cv_path_pkg_config="$pkg_config" # Let the user override the test with a path. ;; @@ -6245,11 +6781,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_pkg_config="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_pkg_config="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6257,15 +6797,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi pkg_config=$ac_cv_path_pkg_config if test -n "$pkg_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkg_config" >&5 -$as_echo "$pkg_config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pkg_config" >&5 +printf "%s\n" "$pkg_config" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -6273,12 +6814,13 @@ if test -z "$ac_cv_path_pkg_config"; then ac_pt_pkg_config=$pkg_config # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_pkg_config+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_pkg_config in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_pkg_config+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $ac_pt_pkg_config in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_pkg_config="$ac_pt_pkg_config" # Let the user override the test with a path. ;; @@ -6287,11 +6829,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_pkg_config="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_pkg_config="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6299,15 +6845,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_pkg_config=$ac_cv_path_ac_pt_pkg_config if test -n "$ac_pt_pkg_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_pkg_config" >&5 -$as_echo "$ac_pt_pkg_config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_pkg_config" >&5 +printf "%s\n" "$ac_pt_pkg_config" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_pkg_config" = x; then @@ -6315,8 +6862,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac pkg_config=$ac_pt_pkg_config @@ -6326,8 +6873,8 @@ else fi if test -z "$pkg_config" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pkg-config not found!" >&5 -$as_echo "$as_me: WARNING: pkg-config not found!" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pkg-config not found!" >&5 +printf "%s\n" "$as_me: WARNING: pkg-config not found!" >&2;} pkg_config="false" fi @@ -6338,24 +6885,24 @@ pkg_check_version() { if test "$ok" = yes ; then req="$1" min="$2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $req" >&5 -$as_echo_n "checking for $req... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $req" >&5 +printf %s "checking for $req... " >&6; } if $pkg_config --exists "$req" ; then vers=`$pkg_config --modversion "$req"` if $pkg_config --exists "$req >= $min" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vers" >&5 -$as_echo "$vers" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vers" >&5 +printf "%s\n" "$vers" >&6; } pkgs="$pkgs $req" return 1 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vers (wanted >= $min)" >&5 -$as_echo "$vers (wanted >= $min)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vers (wanted >= $min)" >&5 +printf "%s\n" "$vers (wanted >= $min)" >&6; } ok=no return 0 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ok=no return 0 fi @@ -6376,17 +6923,19 @@ $as_echo "no" >&6; } # that uses wildcards, and write a sane set of rules to detect gettext(3) and # msgfmt(1) and just do the obviously straightforward thing? - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +printf %s "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test ${enable_nls+y} +then : enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes +else case e in #( + e) USE_NLS=yes ;; +esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } case "$am__api_version" in 1.01234) @@ -6400,22 +6949,23 @@ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 10 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 -$as_echo_n "checking for intltool >= ... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 +printf %s "checking for intltool >= ... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +printf "%s\n" "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || as_fn_error $? "Your intltool is too old. You need intltool or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_UPDATE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_UPDATE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ;; @@ -6424,11 +6974,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_UPDATE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6436,25 +6990,27 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +printf "%s\n" "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_MERGE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ;; @@ -6463,11 +7019,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_MERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6475,25 +7035,27 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +printf "%s\n" "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_EXTRACT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_EXTRACT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ;; @@ -6502,11 +7064,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_EXTRACT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6514,15 +7080,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +printf "%s\n" "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then @@ -6568,12 +7135,13 @@ fi # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $XGETTEXT in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; @@ -6582,11 +7150,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XGETTEXT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6594,25 +7166,27 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MSGMERGE in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ;; @@ -6621,11 +7195,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGMERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6633,25 +7211,27 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGFMT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $MSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; @@ -6660,11 +7240,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6672,25 +7256,27 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; @@ -6699,11 +7285,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6712,15 +7302,16 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; +esac ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then @@ -6737,1299 +7328,2650 @@ fi GETTEXT_PACKAGE=xscreensaver -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF +printf "%s\n" "#define GETTEXT_PACKAGE \"$GETTEXT_PACKAGE\"" >>confdefs.h ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" - for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 -_ACEOF - -fi - -done - - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes -else - am_cv_val_LC_MESSAGES=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + *'BusyBox '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - fi + test -d ./--version && rmdir ./--version + if test ${ac_cv_path_mkdir+y}; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use plain mkdir -p, + # in the hope it doesn't have the bugs of ancient mkdir. + MKDIR_P='mkdir -p' fi - USE_NLS=yes - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_CFPreferencesCopyAppValue=yes -else - gt_cv_func_CFPreferencesCopyAppValue=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } -$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in #( +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -CFLocaleCopyCurrent(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_CFLocaleCopyCurrent=yes else - gt_cv_func_CFLocaleCopyCurrent=no + ac_cv_path_SED=$SED fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - -$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h - - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -rf conftest.sed - # - # First check in libc - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + GETTEXT_MACRO_VERSION=0.20 -#include +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi -int -main () -{ -return !ngettext ("","", 1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_ngettext_libc=yes +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - gt_cv_func_ngettext_libc=no + ac_executable_p="test -f" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conf$$.file +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$gt_saved_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$gt_saved_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 -$as_echo "$gt_cv_func_ngettext_libc" >&6; } - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -#include + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes -else - gt_cv_func_dgettext_libc=no + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; + *) GMSGFMT_015=$GMSGFMT ;; + esac +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi -done - - fi - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : - $as_echo_n "(cached) " >&6 +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_executable_p="test -f" +fi +rm -f conf$$.file -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bindtextdomain (); -int -main () -{ -return bindtextdomain (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_bindtextdomain=yes -else - ac_cv_lib_intl_bindtextdomain=no +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$gt_saved_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$gt_saved_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes -else - ac_cv_lib_intl_ngettext=no + rm -f messages.po + + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; + *) XGETTEXT_015=$XGETTEXT ;; + esac + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dgettext (); -int -main () -{ -return dgettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dgettext=yes +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - ac_cv_lib_intl_dgettext=no + ac_executable_p="test -f" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$gt_saved_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$gt_saved_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -fi + if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then + MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt' + else + if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then + MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet' + else + MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet' + fi + fi + + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_saved_prefix" + +# Check whether --with-gnu-ld was given. +if test ${with_gnu_ld+y} +then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else case e in #( + e) with_gnu_ld=no ;; +esac fi - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 -$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +if test -n "$LD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 +printf %s "checking for ld... " >&6; } +elif test "$GCC" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } +elif test "$with_gnu_ld" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } +fi +if test -n "$LD"; then + # Let the user override the test with a path. + : else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test ${acl_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + acl_cv_path_LD= # Final result of this test + ac_prog=ld # Program to search in $PATH + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + case $host in + *-*-mingw* | windows*) + # gcc leaves a trailing carriage return which upsets mingw + acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + acl_output=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $acl_output in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` + while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do + acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` + done + # Got the pathname. No search in PATH is needed. + acl_cv_path_LD="$acl_output" + ac_prog= + ;; + "") + # If it fails, then pretend we aren't using GCC. + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac + fi + if test -n "$ac_prog"; then + # Search for $ac_prog in $PATH. + acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_saved_IFS" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 conftest.$ac_ext /* end confdefs.h. */ +#if defined __powerpc64__ || defined __LP64__ + int ok; + #else + error fail + #endif -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes -else - ac_cv_lib_intl_ngettext=no +if ac_fn_c_try_compile "$LINENO" +then : + # The compiler produces 64-bit code. Add option '-b64' so that the + # linker groks 64-bit object files. + case "$acl_cv_path_LD " in + *" -b64 "*) ;; + *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;; + esac + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; + sparc64-*-netbsd*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#if defined __sparcv9 || defined __arch64__ + int ok; + #else + error fail + #endif -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dcgettext (); -int -main () -{ -return dcgettext (); - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dcgettext=yes -else - ac_cv_lib_intl_dcgettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -else - : +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) # The compiler produces 32-bit code. Add option '-m elf32_sparc' + # so that the linker groks 32-bit object files. + case "$acl_cv_path_LD " in + *" -m elf32_sparc "*) ;; + *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; + esac + ;; +esac fi - -else - : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; + esac + ;; +esac fi - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF - + LD="$acl_cv_path_LD" fi -done - - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h - - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 +if test -n "$LD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${acl_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" +*) + acl_cv_prog_gnu_ld=no ;; +esac ;; esac fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 +printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$acl_cv_prog_gnu_ld + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +printf %s "checking for shared library run path origin... " >&6; } +if test ${acl_cv_rpath+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +printf "%s\n" "$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath was given. +if test ${enable_rpath+y} +then : + enableval=$enable_rpath; : +else case e in #( + e) enable_rpath=yes ;; +esac fi -done - MSGFMT_OPTS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 -$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF - -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5 +printf %s "checking 32-bit host C ABI... " >&6; } +if test ${gl_cv_host_cpu_c_abi_32bit+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case "$host_cpu" in + + # CPUs that only support a 32-bit ABI. + arc \ + | bfin \ + | cris* \ + | csky \ + | epiphany \ + | ft32 \ + | h8300 \ + | m68k \ + | microblaze | microblazeel \ + | nds32 | nds32le | nds32be \ + | nios2 | nios2eb | nios2el \ + | or1k* \ + | or32 \ + | sh | sh1234 | sh1234elb \ + | tic6x \ + | xtensa* ) + gl_cv_host_cpu_c_abi_32bit=yes + ;; + + # CPUs that only support a 64-bit ABI. + alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + gl_cv_host_cpu_c_abi_32bit=no + ;; + + *) + if test -n "$gl_cv_host_cpu_c_abi"; then + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; + x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; + esac + else + gl_cv_host_cpu_c_abi_32bit=unknown + fi + if test $gl_cv_host_cpu_c_abi_32bit = unknown; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int test_pointer_size[sizeof (void *) - 5]; _ACEOF -if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -echo "$as_me: failed input was:" >&5 -sed 's/^/| /' conftest.foo >&5 +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_host_cpu_c_abi_32bit=no +else case e in #( + e) gl_cv_host_cpu_c_abi_32bit=yes ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + ;; + esac + ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 +printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; } - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) + HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 +printf %s "checking for egrep -e... " >&6; } +if test ${ac_cv_path_EGREP_TRADITIONAL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; + rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + + $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + : + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi + if test "$ac_cv_path_EGREP_TRADITIONAL" +then : + ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E" +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; + rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + + $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL fi - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ;; +esac +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 +printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } + EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5 +printf %s "checking for ELF binary format... " >&6; } +if test ${gl_cv_elf+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#if defined __ELF__ || (defined __linux__ && defined __EDG__) + Extensible Linking Format + #endif -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - CATOBJEXT=.gmo - DATADIRNAME=share -else - CATOBJEXT=.mo - DATADIRNAME=lib +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1 +then : + gl_cv_elf=yes +else case e in #( + e) gl_cv_elf=no ;; +esac fi +rm -rf conftest* - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5 +printf "%s\n" "$gl_cv_elf" >&6; } + if test $gl_cv_elf = yes; then + # Extract the ELF class of a file (5th byte) in decimal. + # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header + if od -A x < /dev/null >/dev/null 2>/dev/null; then + # Use POSIX od. + func_elfclass () + { + od -A n -t d1 -j 4 -N 1 + } + else + # Use BSD hexdump. + func_elfclass () + { + dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "' + echo + } + fi + # Use 'expr', not 'test', to compare the values of func_elfclass, because on + # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002, + # not 1 or 2. + case $HOST_CPU_C_ABI_32BIT in + yes) + # 32-bit ABI. + acl_is_expected_elfclass () + { + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null + } + ;; + no) + # 64-bit ABI. + acl_is_expected_elfclass () + { + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null + } + ;; + *) + # Unknown. + acl_is_expected_elfclass () + { + : + } + ;; + esac + else + acl_is_expected_elfclass () + { + : + } + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 +printf %s "checking for the common suffixes of directories in the library search path... " >&6; } +if test ${acl_cv_libdirstems+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) acl_libdirstem=lib + acl_libdirstem2= + acl_libdirstem3= + case "$host_os" in + solaris*) + if test $HOST_CPU_C_ABI_32BIT = no; then + acl_libdirstem2=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem3=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem3=lib/amd64 ;; + esac + fi + ;; + netbsd*) + if test $HOST_CPU_C_ABI_32BIT != no; then + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparc ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test $HOST_CPU_C_ABI_32BIT != no; then + # 32-bit or unknown ABI. + if test -d /usr/lib32; then + acl_libdirstem2=lib32 + fi + fi + if test $HOST_CPU_C_ABI_32BIT != yes; then + # 64-bit or unknown ABI. + if test -d /usr/lib64; then + acl_libdirstem3=lib64 + fi + fi + if test -n "$searchpath"; then + acl_saved_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;; + */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib32 ) acl_libdirstem2=lib32 ;; + */lib64 ) acl_libdirstem3=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_saved_IFS" + if test $HOST_CPU_C_ABI_32BIT = yes; then + # 32-bit ABI. + acl_libdirstem3= + fi + if test $HOST_CPU_C_ABI_32BIT = no; then + # 64-bit ABI. + acl_libdirstem2= + fi + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem" + acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3" + ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 +printf "%s\n" "$acl_cv_libdirstems" >&6; } + acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` + acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'` + acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'` + + use_additional=yes + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" + + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + +# Check whether --with-libiconv-prefix was given. +if test ${with_libiconv_prefix+y} +then : + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then - if test "$gt_cv_have_gettext" = "yes" ; then + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" -$as_echo "#define ENABLE_NLS 1" >>confdefs.h + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - fi + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + additional_libdir2="$withval/$acl_libdirstem2" + additional_libdir3="$withval/$acl_libdirstem3" fi fi - # We need to process the po/ directory. - POSUB=po - - ac_config_commands="$ac_config_commands default-1" - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi +fi - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES + if test "X$additional_libdir2" = "X$additional_libdir"; then + additional_libdir2= + fi + if test "X$additional_libdir3" = "X$additional_libdir"; then + additional_libdir3= + fi + LIBICONV= + LTLIBICONV= + INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do + if test "X$found_dir" = "X"; then + eval dir=\$$additional_libdir_variable + if test -n "$dir"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + fi + done + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBICONV; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem3 | */$acl_libdirstem3/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + saved_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$saved_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then + haveit= + if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$dependency_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$dependency_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dep=`echo "X$dep" | sed -e 's/^X-l//'` + if test "X$dep" != Xc \ + || case $host_os in + linux* | gnu* | k*bsd*-gnu) false ;; + *) true ;; + esac; then + names_next_round="$names_next_round $dep" + fi + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_saved_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_saved_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi -MKINSTALLDIRS="$INSTALL_DIRS" + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" + gl_sed_escape_for_make_2='s,\$,\\$$,g' + case `echo r | tr -d '\r'` in + '') gl_tr_cr='\015' ;; + *) gl_tr_cr='\r' ;; + esac -############################################################################### -# -# The --with-x-app-defaults option -# -############################################################################### + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +printf %s "checking for CFPreferencesCopyAppValue... " >&6; } +if test ${gt_cv_func_CFPreferencesCopyAppValue+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) gt_saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else case e in #( + e) gt_cv_func_CFPreferencesCopyAppValue=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_saved_LIBS" ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -#### H1 +printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h -# Check whether --with-app-defaults was given. -if test "${with_app_defaults+set}" = set; then : - withval=$with_app_defaults; ac_cv_x_app_defaults="$withval" -else - eval ac_x_app_defaults="$withval" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5 +printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; } +if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) gt_saved_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +CFLocaleCopyPreferredLanguages(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gt_cv_func_CFLocaleCopyPreferredLanguages=yes +else case e in #( + e) gt_cv_func_CFLocaleCopyPreferredLanguages=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_saved_LIBS" ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 +printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } + if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X app-defaults directory" >&5 -$as_echo_n "checking for X app-defaults directory... " >&6; } -if ${ac_cv_x_app_defaults+:} false; then : - $as_echo_n "(cached) " >&6 -else - # skip this, it's always wrong these days. - # AC_PATH_X_APP_DEFAULTS_XMKMF - if test x"$ac_x_app_defaults" = x; then - true - # 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/share/X11/app-defaults \ - \ - /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 \ - \ - /etc/X11/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 +printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h - fi - if test x"$ac_x_app_defaults" = x; then - /bin/echo -n 'fallback: ' - 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 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x_app_defaults" >&5 -$as_echo "$ac_cv_x_app_defaults" >&6; } - eval ac_x_app_defaults="$ac_cv_x_app_defaults" + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + fi -############################################################################### -# -# Handle the --with-hackdir option -# -############################################################################### + LIBINTL= + LTLIBINTL= + POSUB= -have_hackdir=yes -with_hackdir_req=unspecified + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" -# Check whether --with-hackdir was given. -if test "${with_hackdir+set}" = set; then : - withval=$with_hackdir; with_hackdir="$withval"; with_hackdir_req="$withval" -else - with_hackdir=yes -fi + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no -if test x"$with_hackdir" = xyes; then - HACKDIR='${libexecdir}/xscreensaver' -elif test x"$with_hackdir" = xno; then - HACKDIR='${bindir}' -else - HACKDIR=$with_hackdir -fi + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi -# canonicalize slashes. -HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +printf %s "checking for GNU gettext in libc... " >&6; } +if eval test \${$gt_func_gnugettext_libc+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Expand HACKDIR as HACKDIR_FULL -HACKDIR_FULL=`eval eval eval eval eval eval eval eval eval echo $HACKDIR` +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code -# This option used to be called --enable-subdir; make sure that is no longer -# used, since configure brain-damagedly ignores unknown --enable options. +int +main (void) +{ -obsolete_enable= -# Check whether --enable-subdir was given. -if test "${enable_subdir+set}" = set; then : - enableval=$enable_subdir; obsolete_enable=yes -fi +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION -if test -n "$obsolete_enable"; then - echo "error: the --enable-subdir option has been replaced with" - echo " the new --with-hackdir option; see \`configure --help'" - echo " for more information." - exit 1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$gt_func_gnugettext_libc=yes" +else case e in #( + e) eval "$gt_func_gnugettext_libc=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext ;; +esac fi +eval ac_res=\$$gt_func_gnugettext_libc + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } -############################################################################### -# -# Handle the --with-configdir option -# -############################################################################### + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -have_configdir=yes -with_configdir_req=unspecified + gl_saved_CPPFLAGS="$CPPFLAGS" -# Check whether --with-configdir was given. -if test "${with_configdir+set}" = set; then : - withval=$with_configdir; with_configdir="$withval"; with_configdir_req="$withval" -else - with_configdir=yes -fi + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do -if test x"$with_configdir" = xyes; then - HACK_CONF_DIR='${datadir}/xscreensaver/config' -elif test x"$with_configdir" = xno; then - echo "error: must be yes, or a pathname: --with-configdir=$with_configdir" - exit 1 -else - # there must be a better way than this... - if test -z "`echo $with_configdir | sed 's@^/.*@@'`" ; then - # absolute path - HACK_CONF_DIR=$with_configdir - else - # relative path - HACK_CONF_DIR="\${exec_prefix}$with_configdir" - fi -fi + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" -############################################################################### -# -# Handle the --with-fontdir option -# -############################################################################### + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done -have_fontdir=yes -with_fontdir_req=unspecified + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +printf %s "checking for iconv... " >&6; } +if test ${am_cv_func_iconv+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --with-fontdir was given. -if test "${with_fontdir+set}" = set; then : - withval=$with_fontdir; with_fontdir="$withval"; with_fontdir_req="$withval" -else - with_fontdir=yes +#include +#include + +int +main (void) +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + am_cv_func_iconv=yes fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + gl_saved_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if test x"$with_fontdir" = xyes; then - FONT_DIR='${datarootdir}/fonts/xscreensaver' - if test "$ac_macosx" = yes; then - FONT_DIR='/Library/Fonts' - fi -elif test x"$with_fontdir" = xno; then - FONT_DIR='' -else - # there must be a better way than this... - if test -z "`echo $with_fontdir | sed 's@^/.*@@'`" ; then - # absolute path - FONT_DIR="$with_fontdir" - else - # relative path - FONT_DIR='${datarootdir}/fonts/'"$with_fontdir" - fi +#include +#include + +int +main (void) +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gl_saved_LIBS" + fi + ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +printf "%s\n" "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +printf %s "checking for working iconv... " >&6; } +if test ${am_cv_func_iconv_works+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + gl_saved_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes +then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -############################################################################### -# -# Check for the DPMS server extension. -# -############################################################################### +#include +#include -#### H1 +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif -have_dpms=no -with_dpms_req=unspecified +int +main (void) +{ +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; -# Check whether --with-dpms-ext was given. -if test "${with_dpms_ext+set}" = set; then : - withval=$with_dpms_ext; with_dpms="$withval"; with_dpms_req="$withval" -else - with_dpms=yes + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - case "$with_dpms" in - yes) ;; - no) ;; + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$gl_saved_LIBS" + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +printf "%s\n" "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMS headers" >&5 -$as_echo_n "checking for DPMS headers... " >&6; } - d=$with_dpms/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi +printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMS libs" >&5 -$as_echo_n "checking for DPMS libs... " >&6; } - d=$with_dpms/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi + fi + if test "$am_cv_lib_iconv" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +printf %s "checking how to link with libiconv... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +printf "%s\n" "$LIBICONV" >&6; } + else + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi - # replace the directory string with "yes". - with_dpms_req="yes" - with_dpms=$with_dpms_req - ;; + use_additional=yes - *) - echo "" - echo "error: argument to --with-dpms-ext 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 + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" -if test "$with_dpms" = yes; then + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - # first check for dpms.h + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" - 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_fn_c_check_header_compile "$LINENO" "X11/extensions/dpms.h" "ac_cv_header_X11_extensions_dpms_h" "#include - #include -" -if test "x$ac_cv_header_X11_extensions_dpms_h" = xyes; then : - have_dpms=yes -fi +# Check whether --with-libintl-prefix was given. +if test ${with_libintl_prefix+y} +then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then - CPPFLAGS="$ac_save_CPPFLAGS" + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" - # if that succeeded, then check for the DPMS code in the libraries - if test "$have_dpms" = yes; then + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\" + eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" - # first look in -lXext (this is where it is with XFree86 4.0) - have_dpms=no + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + additional_libdir2="$withval/$acl_libdirstem2" + additional_libdir3="$withval/$acl_libdirstem3" + fi + fi - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" - fi - # note: $X_CFLAGS includes $x_includes - CPPFLAGS="$CPPFLAGS $X_CFLAGS" +fi - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" + if test "X$additional_libdir2" = "X$additional_libdir"; then + additional_libdir2= + fi + if test "X$additional_libdir3" = "X$additional_libdir"; then + additional_libdir3= + fi + LIBINTL= + LTLIBINTL= + INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do + if test "X$found_dir" = "X"; then + eval dir=\$$additional_libdir_variable + if test -n "$dir"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + fi + done + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem3 | */$acl_libdirstem3/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + saved_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$saved_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \ + && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then + haveit= + if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \ + || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$dependency_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X-L$dependency_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$dependency_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$dependency_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dep=`echo "X$dep" | sed -e 's/^X-l//'` + if test "X$dep" != Xc \ + || case $host_os in + linux* | gnu* | k*bsd*-gnu) false ;; + *) true ;; + esac; then + names_next_round="$names_next_round $dep" + fi + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_saved_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_saved_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_saved_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXext" >&5 -$as_echo_n "checking for DPMSInfo in -lXext... " >&6; } -if ${ac_cv_lib_Xext_DPMSInfo+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lXext -lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +printf %s "checking for GNU gettext in libintl... " >&6; } +if eval test \${$gt_func_gnugettext_libintl+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern #ifdef __cplusplus -extern "C" +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #endif -char DPMSInfo (); +$gt_revision_test_code + int -main () +main (void) { -return DPMSInfo (); + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xext_DPMSInfo=yes -else - ac_cv_lib_Xext_DPMSInfo=no +if ac_fn_c_try_link "$LINENO" +then : + eval "$gt_func_gnugettext_libintl=yes" +else case e in #( + e) eval "$gt_func_gnugettext_libintl=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_DPMSInfo" >&5 -$as_echo "$ac_cv_lib_Xext_DPMSInfo" >&6; } -if test "x$ac_cv_lib_Xext_DPMSInfo" = xyes; then : - have_dpms=yes -else - true -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - # if that failed, look in -lXdpms (this is where it was in XFree86 3.x) - if test "$have_dpms" = no; then - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + gt_LIBINTL_EXTRA="$INTL_MACOSX_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" - - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXdpms" >&5 -$as_echo_n "checking for DPMSInfo in -lXdpms... " >&6; } -if ${ac_cv_lib_Xdpms_DPMSInfo+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXdpms -lXext -lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case "$host_os" in + aix*) gt_LIBINTL_EXTRA="-lpthread" ;; + esac + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \ + && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then + LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern #ifdef __cplusplus -extern "C" +"C" #endif -char DPMSInfo (); +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + int -main () +main (void) { -return DPMSInfo (); + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xdpms_DPMSInfo=yes -else - ac_cv_lib_Xdpms_DPMSInfo=no +if ac_fn_c_try_link "$LINENO" +then : + LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA" + LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA" + eval "$gt_func_gnugettext_libintl=yes" + fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 -$as_echo "$ac_cv_lib_Xdpms_DPMSInfo" >&6; } -if test "x$ac_cv_lib_Xdpms_DPMSInfo" = xyes; then : - have_dpms=yes; XDPMS_LIBS="-lXdpms" -else - true + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" ;; +esac fi +eval ac_res=\$$gt_func_gnugettext_libintl + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + fi - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi fi - fi - - # if that succeeded, then we've really got it. - if test "$have_dpms" = yes; then - $as_echo "#define HAVE_DPMS_EXTENSION 1" >>confdefs.h - - fi -elif test "$with_dpms" != no; then - echo "error: must be yes or no: --with-dpms-ext=$with_dpms" - exit 1 -fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then -############################################################################### -# -# Check for the XF86VMODE server extension (for virtual screens.) -# -############################################################################### +printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h -have_xf86vmode=no -with_xf86vmode_req=unspecified + else + USE_NLS=no + fi + fi -# Check whether --with-xf86vmode-ext was given. -if test "${with_xf86vmode_ext+set}" = set; then : - withval=$with_xf86vmode_ext; with_xf86vmode="$withval"; with_xf86vmode_req="$withval" -else - with_xf86vmode=yes -fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +printf %s "checking whether to use NLS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +printf %s "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +printf "%s\n" "$gt_source" >&6; } + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +printf %s "checking how to link with libintl... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +printf "%s\n" "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_saved_prefix="$prefix" + prefix="$acl_final_prefix" + acl_saved_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done - case "$with_xf86vmode" in - yes) ;; - no) ;; + fi - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xf86vmode headers" >&5 -$as_echo_n "checking for xf86vmode headers... " >&6; } - d=$with_xf86vmode/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi +printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xf86vmode libs" >&5 -$as_echo_n "checking for xf86vmode libs... " >&6; } - d=$with_xf86vmode/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi +printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h - # replace the directory string with "yes". - with_xf86vmode_req="yes" - with_xf86vmode=$with_xf86vmode_req - ;; + fi - *) - echo "" - echo "error: argument to --with-xf86vmode-ext 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 + POSUB=po + fi -VIDMODE_LIBS="" + INTLLIBS="$LIBINTL" -if test "$with_xf86vmode" = yes; then + gt_save_prefix="${prefix}" + gt_save_datarootdir="${datarootdir}" + gt_save_localedir="${localedir}" + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + eval datarootdir="$datarootdir" + eval localedir="$localedir" - # first check for xf86vmode.h + gl_final_localedir="$localedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw* | windows*) + gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; + esac + ;; + esac + localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"` + localedir_c='"'"$localedir_c"'"' - ac_save_CPPFLAGS="$CPPFLAGS" - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" + localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"` + if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then + localedir_c_make='\"$(localedir)\"' fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "#include -" -if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes; then : - have_xf86vmode=yes -fi - CPPFLAGS="$ac_save_CPPFLAGS" + localedir="${gt_save_localedir}" + datarootdir="${gt_save_datarootdir}" + prefix="${gt_save_prefix}" - # if that succeeded, then check for the -lXxf86vm - if test "$have_xf86vmode" = yes; then - have_xf86vmode=no +MKINSTALLDIRS="$INSTALL_DIRS" + +# The library is there, but neither $INTLLIBS nor $LIBINTL are getting set. +if test -z "$INTLLIBS" ; then INTLLIBS="$LIBINTL" ; fi +if test -z "$INTLLIBS" ; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8049,129 +9991,349 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeGetViewPort in -lXxf86vm" >&5 -$as_echo_n "checking for XF86VidModeGetViewPort in -lXxf86vm... " >&6; } -if ${ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86vm -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5 +printf %s "checking for gettext in -lintl... " >&6; } +if test ${ac_cv_lib_intl_gettext+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XF86VidModeGetViewPort (); +char gettext (void); int -main () +main (void) { -return XF86VidModeGetViewPort (); +return gettext (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort=yes -else - ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_intl_gettext=yes +else case e in #( + e) ac_cv_lib_intl_gettext=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" >&5 -$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" >&6; } -if test "x$ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" = xyes; then : - have_xf86vmode=yes; - VIDMODE_LIBS="-lXxf86vm"; - SAVER_LIBS="$SAVER_LIBS $VIDMODE_LIBS" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_gettext" >&5 +printf "%s\n" "$ac_cv_lib_intl_gettext" >&6; } +if test "x$ac_cv_lib_intl_gettext" = xyes +then : + INTLLIBS="-lintl" fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi +fi +LIBINTL="$INTLLIBS" - # if that succeeded, then we've really got it. - if test "$have_xf86vmode" = yes; then - $as_echo "#define HAVE_XF86VMODE 1" >>confdefs.h +############################################################################### +# +# The --with-x-app-defaults option +# +############################################################################### - fi +#### H1 -elif test "$with_xf86vmode" != no; then - echo "error: must be yes or no: --with-xf86vmode-ext=$with_xf86vmode" - exit 1 +# Check whether --with-app-defaults was given. +if test ${with_app_defaults+y} +then : + withval=$with_app_defaults; ac_cv_x_app_defaults="$withval" +else case e in #( + e) eval ac_x_app_defaults="$withval" ;; +esac fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X app-defaults directory" >&5 +printf %s "checking for X app-defaults directory... " >&6; } +if test ${ac_cv_x_app_defaults+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) # skip this, it's always wrong these days. + # AC_PATH_X_APP_DEFAULTS_XMKMF + if test x"$ac_x_app_defaults" = x; then + true + # 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/share/X11/app-defaults \ + \ + /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 \ + \ + /etc/X11/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 + + fi + if test x"$ac_x_app_defaults" = x; then + /bin/echo -n 'fallback: ' + 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 ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x_app_defaults" >&5 +printf "%s\n" "$ac_cv_x_app_defaults" >&6; } + eval ac_x_app_defaults="$ac_cv_x_app_defaults" + ############################################################################### # -# Check for the XINERAMA server extension. +# Handle the --with-hackdir option # ############################################################################### -have_xinerama=no -with_xinerama_req=unspecified +have_hackdir=yes +with_hackdir_req=unspecified -# Check whether --with-xinerama-ext was given. -if test "${with_xinerama_ext+set}" = set; then : - withval=$with_xinerama_ext; with_xinerama="$withval"; with_xinerama_req="$withval" +# Check whether --with-hackdir was given. +if test ${with_hackdir+y} +then : + withval=$with_hackdir; with_hackdir="$withval"; with_hackdir_req="$withval" +else case e in #( + e) with_hackdir=yes ;; +esac +fi + +if test x"$with_hackdir" = xyes; then + HACKDIR='${libexecdir}/xscreensaver' +elif test x"$with_hackdir" = xno; then + HACKDIR='${bindir}' else - with_xinerama=yes + HACKDIR=$with_hackdir fi - case "$with_xinerama" in - yes) ;; - no) ;; +# canonicalize slashes. +HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'` - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA headers" >&5 -$as_echo_n "checking for XINERAMA headers... " >&6; } - d=$with_xinerama/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi +# Expand HACKDIR as HACKDIR_FULL +HACKDIR_FULL=`eval eval eval eval eval eval eval eval eval echo $HACKDIR` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA libs" >&5 -$as_echo_n "checking for XINERAMA libs... " >&6; } - d=$with_xinerama/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi +# This option used to be called --enable-subdir; make sure that is no longer +# used, since configure brain-damagedly ignores unknown --enable options. - # replace the directory string with "yes". - with_xinerama_req="yes" - with_xinerama=$with_xinerama_req - ;; +obsolete_enable= +# Check whether --enable-subdir was given. +if test ${enable_subdir+y} +then : + enableval=$enable_subdir; obsolete_enable=yes +fi - *) - echo "" - echo "error: argument to --with-xinerama-ext 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 +if test -n "$obsolete_enable"; then + echo "error: the --enable-subdir option has been replaced with" + echo " the new --with-hackdir option; see \`configure --help'" + echo " for more information." + exit 1 +fi + +############################################################################### +# +# Handle the --with-configdir option +# +############################################################################### + +have_configdir=yes +with_configdir_req=unspecified + +# Check whether --with-configdir was given. +if test ${with_configdir+y} +then : + withval=$with_configdir; with_configdir="$withval"; with_configdir_req="$withval" +else case e in #( + e) with_configdir=yes ;; +esac +fi + +if test x"$with_configdir" = xyes; then + HACK_CONF_DIR='${datadir}/xscreensaver/config' +elif test x"$with_configdir" = xno; then + echo "error: must be yes, or a pathname: --with-configdir=$with_configdir" + exit 1 +else + # there must be a better way than this... + if test -z "`echo $with_configdir | sed 's@^/.*@@'`" ; then + # absolute path + HACK_CONF_DIR=$with_configdir + else + # relative path + HACK_CONF_DIR="\${exec_prefix}$with_configdir" + fi +fi + +############################################################################### +# +# Handle the --with-fontdir option +# +############################################################################### + +have_fontdir=yes +with_fontdir_req=unspecified + +# Check whether --with-fontdir was given. +if test ${with_fontdir+y} +then : + withval=$with_fontdir; with_fontdir="$withval"; with_fontdir_req="$withval" +else case e in #( + e) with_fontdir=yes ;; +esac +fi + +if test x"$with_fontdir" = xyes; then + FONT_DIR='${datarootdir}/fonts/xscreensaver' + if test "$ac_macosx" = yes; then + FONT_DIR='/Library/Fonts' + fi +elif test x"$with_fontdir" = xno; then + FONT_DIR='' +else + # there must be a better way than this... + if test -z "`echo $with_fontdir | sed 's@^/.*@@'`" ; then + # absolute path + FONT_DIR="$with_fontdir" + else + # relative path + FONT_DIR='${datarootdir}/fonts/'"$with_fontdir" + fi +fi + +############################################################################### +# +# Check for the DPMS server extension. +# +############################################################################### + +#### H1 + +have_dpms=no +with_dpms_req=unspecified + +# Check whether --with-dpms-ext was given. +if test ${with_dpms_ext+y} +then : + withval=$with_dpms_ext; with_dpms="$withval"; with_dpms_req="$withval" +else case e in #( + e) with_dpms=yes ;; +esac +fi + + case "$with_dpms" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DPMS headers" >&5 +printf %s "checking for DPMS headers... " >&6; } + d=$with_dpms/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DPMS libs" >&5 +printf %s "checking for DPMS libs... " >&6; } + d=$with_dpms/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_dpms_req="yes" + with_dpms=$with_dpms_req + ;; + + *) + echo "" + echo "error: argument to --with-dpms-ext 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 -if test "$with_xinerama" = yes; then +if test "$with_dpms" = yes; then - # first check for Xinerama.h + # first check for dpms.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -8179,19 +10341,21 @@ if test "$with_xinerama" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/dpms.h" "ac_cv_header_X11_extensions_dpms_h" "#include + #include " -if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes; then : - have_xinerama=yes +if test "x$ac_cv_header_X11_extensions_dpms_h" = xyes +then : + have_dpms=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - # if that succeeded, then check for the XINERAMA code in the libraries - if test "$have_xinerama" = yes; then + # if that succeeded, then check for the DPMS code in the libraries + if test "$have_dpms" = yes; then - # first look in -lXext - have_xinerama=no + # first look in -lXext (this is where it is with XFree86 4.0) + have_dpms=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8211,54 +10375,63 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXext" >&5 -$as_echo_n "checking for XineramaQueryScreens in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XineramaQueryScreens+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXext" >&5 +printf %s "checking for DPMSInfo in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_DPMSInfo+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lXext -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XineramaQueryScreens (); +char DPMSInfo (void); int -main () +main (void) { -return XineramaQueryScreens (); +return DPMSInfo (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xext_XineramaQueryScreens=yes -else - ac_cv_lib_Xext_XineramaQueryScreens=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xext_DPMSInfo=yes +else case e in #( + e) ac_cv_lib_Xext_DPMSInfo=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XineramaQueryScreens" >&5 -$as_echo "$ac_cv_lib_Xext_XineramaQueryScreens" >&6; } -if test "x$ac_cv_lib_Xext_XineramaQueryScreens" = xyes; then : - have_xinerama=yes -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_DPMSInfo" >&5 +printf "%s\n" "$ac_cv_lib_Xext_DPMSInfo" >&6; } +if test "x$ac_cv_lib_Xext_DPMSInfo" = xyes +then : + have_dpms=yes +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # if that failed, look in -lXinerama (this is where it is in XFree86 4.1.) - if test "$have_xinerama" = no; then + # if that failed, look in -lXdpms (this is where it was in XFree86 3.x) + if test "$have_dpms" = no; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8278,46 +10451,55 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 -$as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; } -if ${ac_cv_lib_Xinerama_XineramaQueryScreens+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXinerama -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DPMSInfo in -lXdpms" >&5 +printf %s "checking for DPMSInfo in -lXdpms... " >&6; } +if test ${ac_cv_lib_Xdpms_DPMSInfo+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXdpms -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XineramaQueryScreens (); +char DPMSInfo (void); int -main () +main (void) { -return XineramaQueryScreens (); +return DPMSInfo (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xinerama_XineramaQueryScreens=yes -else - ac_cv_lib_Xinerama_XineramaQueryScreens=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xdpms_DPMSInfo=yes +else case e in #( + e) ac_cv_lib_Xdpms_DPMSInfo=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 -$as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes; then : - have_xinerama=yes; XINERAMA_LIBS="-lXinerama" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdpms_DPMSInfo" >&5 +printf "%s\n" "$ac_cv_lib_Xdpms_DPMSInfo" >&6; } +if test "x$ac_cv_lib_Xdpms_DPMSInfo" = xyes +then : + have_dpms=yes; XDPMS_LIBS="-lXdpms" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -8328,82 +10510,82 @@ fi fi # if that succeeded, then we've really got it. - if test "$have_xinerama" = yes; then - $as_echo "#define HAVE_XINERAMA 1" >>confdefs.h + if test "$have_dpms" = yes; then + printf "%s\n" "#define HAVE_DPMS_EXTENSION 1" >>confdefs.h fi -elif test "$with_xinerama" != no; then - echo "error: must be yes or no: --with-xinerama-ext=$with_xinerama" +elif test "$with_dpms" != no; then + echo "error: must be yes or no: --with-dpms-ext=$with_dpms" exit 1 fi ############################################################################### # -# Check for the RANDR (Resize and Rotate) server extension. -# -# We need this to detect when the resolution of the desktop -# has changed out from under us (this is a newer, different -# mechanism than the XF86VMODE virtual viewports.) +# Check for the XF86VMODE server extension (for virtual screens.) # ############################################################################### -have_randr=no -with_randr_req=unspecified +have_xf86vmode=no +with_xf86vmode_req=unspecified -# Check whether --with-randr-ext was given. -if test "${with_randr_ext+set}" = set; then : - withval=$with_randr_ext; with_randr="$withval"; with_randr_req="$withval" -else - with_randr=yes +# Check whether --with-xf86vmode-ext was given. +if test ${with_xf86vmode_ext+y} +then : + withval=$with_xf86vmode_ext; with_xf86vmode="$withval"; with_xf86vmode_req="$withval" +else case e in #( + e) with_xf86vmode=yes ;; +esac fi - case "$with_randr" in + case "$with_xf86vmode" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RANDR headers" >&5 -$as_echo_n "checking for RANDR headers... " >&6; } - d=$with_randr/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xf86vmode headers" >&5 +printf %s "checking for xf86vmode headers... " >&6; } + d=$with_xf86vmode/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RANDR libs" >&5 -$as_echo_n "checking for RANDR libs... " >&6; } - d=$with_randr/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xf86vmode libs" >&5 +printf %s "checking for xf86vmode libs... " >&6; } + d=$with_xf86vmode/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_randr_req="yes" - with_randr=$with_randr_req + with_xf86vmode_req="yes" + with_xf86vmode=$with_xf86vmode_req ;; *) echo "" - echo "error: argument to --with-randr-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-xf86vmode-ext 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 -if test "$with_randr" = yes; then +VIDMODE_LIBS="" - # first check for Xrandr.h +if test "$with_xf86vmode" = yes; then + + # first check for xf86vmode.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -8411,19 +10593,18 @@ if test "$with_randr" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "#include " -if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes; then : - have_randr=yes +if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes +then : + have_xf86vmode=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - # if that succeeded, then check for the XRR code in the libraries - if test "$have_randr" = yes; then - - # RANDR probably needs -lXrender - xrender_libs= + # if that succeeded, then check for the -lXxf86vm + if test "$have_xf86vmode" = yes; then + have_xf86vmode=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8443,121 +10624,237 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderSetSubpixelOrder in -lXrender" >&5 -$as_echo_n "checking for XRenderSetSubpixelOrder in -lXrender... " >&6; } -if ${ac_cv_lib_Xrender_XRenderSetSubpixelOrder+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrender -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeGetViewPort in -lXxf86vm" >&5 +printf %s "checking for XF86VidModeGetViewPort in -lXxf86vm... " >&6; } +if test ${ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86vm -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XRenderSetSubpixelOrder (); +char XF86VidModeGetViewPort (void); int -main () +main (void) { -return XRenderSetSubpixelOrder (); +return XF86VidModeGetViewPort (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xrender_XRenderSetSubpixelOrder=yes -else - ac_cv_lib_Xrender_XRenderSetSubpixelOrder=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort=yes +else case e in #( + e) ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderSetSubpixelOrder" >&5 -$as_echo "$ac_cv_lib_Xrender_XRenderSetSubpixelOrder" >&6; } -if test "x$ac_cv_lib_Xrender_XRenderSetSubpixelOrder" = xyes; then : - xrender_libs="-lXrender" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" >&5 +printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" >&6; } +if test "x$ac_cv_lib_Xxf86vm_XF86VidModeGetViewPort" = xyes +then : + have_xf86vmode=yes; + VIDMODE_LIBS="-lXxf86vm"; + SAVER_LIBS="$SAVER_LIBS $VIDMODE_LIBS" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # first look for RANDR in -lXext - have_randr=no + fi - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + # if that succeeded, then we've really got it. + if test "$have_xf86vmode" = yes; then + printf "%s\n" "#define HAVE_XF86VMODE 1" >>confdefs.h - 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" +elif test "$with_xf86vmode" != no; then + echo "error: must be yes or no: --with-xf86vmode-ext=$with_xf86vmode" + exit 1 +fi - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenInfo in -lXext" >&5 -$as_echo_n "checking for XRRGetScreenInfo in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XRRGetScreenInfo+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $xrender_libs -lXext -lX11 $LIBS" +############################################################################### +# +# Check for the XINERAMA server extension. +# +############################################################################### + +have_xinerama=no +with_xinerama_req=unspecified + +# Check whether --with-xinerama-ext was given. +if test ${with_xinerama_ext+y} +then : + withval=$with_xinerama_ext; with_xinerama="$withval"; with_xinerama_req="$withval" +else case e in #( + e) with_xinerama=yes ;; +esac +fi + + case "$with_xinerama" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XINERAMA headers" >&5 +printf %s "checking for XINERAMA headers... " >&6; } + d=$with_xinerama/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XINERAMA libs" >&5 +printf %s "checking for XINERAMA libs... " >&6; } + d=$with_xinerama/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_xinerama_req="yes" + with_xinerama=$with_xinerama_req + ;; + + *) + echo "" + echo "error: argument to --with-xinerama-ext 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 + +if test "$with_xinerama" = yes; then + + # first check for Xinerama.h + + 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_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#include +" +if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes +then : + have_xinerama=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + + # if that succeeded, then check for the XINERAMA code in the libraries + if test "$have_xinerama" = yes; then + + # first look in -lXext + have_xinerama=no + + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXext" >&5 +printf %s "checking for XineramaQueryScreens in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_XineramaQueryScreens+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XRRGetScreenInfo (); +char XineramaQueryScreens (void); int -main () +main (void) { -return XRRGetScreenInfo (); +return XineramaQueryScreens (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xext_XRRGetScreenInfo=yes -else - ac_cv_lib_Xext_XRRGetScreenInfo=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xext_XineramaQueryScreens=yes +else case e in #( + e) ac_cv_lib_Xext_XineramaQueryScreens=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XRRGetScreenInfo" >&5 -$as_echo "$ac_cv_lib_Xext_XRRGetScreenInfo" >&6; } -if test "x$ac_cv_lib_Xext_XRRGetScreenInfo" = xyes; then : - have_randr=yes; SAVER_LIBS="$SAVER_LIBS $xrender_libs" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XineramaQueryScreens" >&5 +printf "%s\n" "$ac_cv_lib_Xext_XineramaQueryScreens" >&6; } +if test "x$ac_cv_lib_Xext_XineramaQueryScreens" = xyes +then : + have_xinerama=yes +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # if that failed, look in -lXrandr - if test "$have_randr" = no; then + # if that failed, look in -lXinerama (this is where it is in XFree86 4.1.) + if test "$have_xinerama" = no; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8577,46 +10874,56 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenInfo in -lXrandr" >&5 -$as_echo_n "checking for XRRGetScreenInfo in -lXrandr... " >&6; } -if ${ac_cv_lib_Xrandr_XRRGetScreenInfo+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrandr $xrender_libs -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 +printf %s "checking for XineramaQueryScreens in -lXinerama... " >&6; } +if test ${ac_cv_lib_Xinerama_XineramaQueryScreens+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XRRGetScreenInfo (); +char XineramaQueryScreens (void); int -main () +main (void) { -return XRRGetScreenInfo (); +return XineramaQueryScreens (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xrandr_XRRGetScreenInfo=yes -else - ac_cv_lib_Xrandr_XRRGetScreenInfo=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xinerama_XineramaQueryScreens=yes +else case e in #( + e) ac_cv_lib_Xinerama_XineramaQueryScreens=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRGetScreenInfo" >&5 -$as_echo "$ac_cv_lib_Xrandr_XRRGetScreenInfo" >&6; } -if test "x$ac_cv_lib_Xrandr_XRRGetScreenInfo" = xyes; then : - have_randr=yes; SAVER_LIBS="$SAVER_LIBS -lXrandr $xrender_libs" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 +printf "%s\n" "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes +then : + have_xinerama=yes; + XINERAMA_LIBS="$XINERAMA_LIBS -lXinerama" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -8627,124 +10934,84 @@ fi fi # if that succeeded, then we've really got it. - if test "$have_randr" = yes; then - $as_echo "#define HAVE_RANDR 1" >>confdefs.h - - # Now check for version 1.2 in the same libs. - # Try to compile, since on macOS 10.5.7, headers are older than libs! - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenResources" >&5 -$as_echo_n "checking for XRRGetScreenResources... " >&6; } -if ${ac_cv_randr_12+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_randr_12=no - - 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` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - #include -int -main () -{ -XRRScreenResources *res = - XRRGetScreenResources (0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_randr_12=yes -else - ac_cv_randr_12=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_randr_12" >&5 -$as_echo "$ac_cv_randr_12" >&6; } - if test "$ac_cv_randr_12" = yes ; then - $as_echo "#define HAVE_RANDR_12 1" >>confdefs.h + if test "$have_xinerama" = yes; then + printf "%s\n" "#define HAVE_XINERAMA 1" >>confdefs.h - fi -# AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)], -# [true], $SAVER_LIBS) fi -elif test "$with_randr" != no; then - echo "error: must be yes or no: --with-randr-ext=$with_randr" +elif test "$with_xinerama" != no; then + echo "error: must be yes or no: --with-xinerama-ext=$with_xinerama" exit 1 fi ############################################################################### # -# Check for the XINPUT server extension. +# Check for the RANDR (Resize and Rotate) server extension. +# +# We need this to detect when the resolution of the desktop +# has changed out from under us (this is a newer, different +# mechanism than the XF86VMODE virtual viewports.) # ############################################################################### -have_xinput=no -with_xinput_req=unspecified -xinput_halfassed=no +have_randr=no +with_randr_req=unspecified -# Check whether --with-xinput-ext was given. -if test "${with_xinput_ext+set}" = set; then : - withval=$with_xinput_ext; with_xinput="$withval"; with_xinput_req="$withval" -else - with_xinput=yes +# Check whether --with-randr-ext was given. +if test ${with_randr_ext+y} +then : + withval=$with_randr_ext; with_randr="$withval"; with_randr_req="$withval" +else case e in #( + e) with_randr=yes ;; +esac fi - case "$with_xinput" in + case "$with_randr" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINPUT headers" >&5 -$as_echo_n "checking for XINPUT headers... " >&6; } - d=$with_xinput/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RANDR headers" >&5 +printf %s "checking for RANDR headers... " >&6; } + d=$with_randr/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINPUT libs" >&5 -$as_echo_n "checking for XINPUT libs... " >&6; } - d=$with_xinput/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RANDR libs" >&5 +printf %s "checking for RANDR libs... " >&6; } + d=$with_randr/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_xinput_req="yes" - with_xinput=$with_xinput_req + with_randr_req="yes" + with_randr=$with_randr_req ;; *) echo "" - echo "error: argument to --with-xinput-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-randr-ext 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 -if test "$with_xinput" = yes; then +if test "$with_randr" = yes; then - # first check for Xinput2.h + # first check for Xrandr.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -8752,18 +11019,20 @@ if test "$with_xinput" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput2.h" "ac_cv_header_X11_extensions_XInput2_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "#include " -if test "x$ac_cv_header_X11_extensions_XInput2_h" = xyes; then : - have_xinput=yes +if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes +then : + have_randr=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - # if that succeeded, then check for libXi - if test "$have_xinput" = yes; then - have_xinput=no - xinput_halfassed=yes + # if that succeeded, then check for the XRR code in the libraries + if test "$have_randr" = yes; then + + # RANDR probably needs -lXrender + xrender_libs= ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -8783,221 +11052,139 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XISelectEvents in -lXi" >&5 -$as_echo_n "checking for XISelectEvents in -lXi... " >&6; } -if ${ac_cv_lib_Xi_XISelectEvents+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXi -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRenderSetSubpixelOrder in -lXrender" >&5 +printf %s "checking for XRenderSetSubpixelOrder in -lXrender... " >&6; } +if test ${ac_cv_lib_Xrender_XRenderSetSubpixelOrder+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrender -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XISelectEvents (); +char XRenderSetSubpixelOrder (void); int -main () +main (void) { -return XISelectEvents (); +return XRenderSetSubpixelOrder (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xi_XISelectEvents=yes -else - ac_cv_lib_Xi_XISelectEvents=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xrender_XRenderSetSubpixelOrder=yes +else case e in #( + e) ac_cv_lib_Xrender_XRenderSetSubpixelOrder=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xi_XISelectEvents" >&5 -$as_echo "$ac_cv_lib_Xi_XISelectEvents" >&6; } -if test "x$ac_cv_lib_Xi_XISelectEvents" = xyes; then : - have_xinput=yes; xinput_halfassed=no; - SAVER_LIBS="$SAVER_LIBS -lXi" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderSetSubpixelOrder" >&5 +printf "%s\n" "$ac_cv_lib_Xrender_XRenderSetSubpixelOrder" >&6; } +if test "x$ac_cv_lib_Xrender_XRenderSetSubpixelOrder" = xyes +then : + xrender_libs="-lXrender" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi + # first look for RANDR in -lXext + have_randr=no - # if that succeeded, then we've really got it. - if test "$have_xinput" = yes; then - $as_echo "#define HAVE_XINPUT 1" >>confdefs.h + 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" -elif test "$with_xinput" != no; then - echo "error: must be yes or no: --with-xinput-ext=$with_xinput" - exit 1 -fi + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" -############################################################################### -# -# Check for the XF86VMODE server extension (for gamma fading.) -# -############################################################################### - -have_xf86gamma=no -have_xf86gamma_ramp=no -with_xf86gamma_req=unspecified - -# Check whether --with-xf86gamma-ext was given. -if test "${with_xf86gamma_ext+set}" = set; then : - withval=$with_xf86gamma_ext; with_xf86gamma="$withval"; with_xf86gamma_req="$withval" -else - with_xf86gamma=yes -fi - - case "$with_xf86gamma" in - yes) ;; - no) ;; - - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xf86gamma headers" >&5 -$as_echo_n "checking for xf86gamma headers... " >&6; } - d=$with_xf86gamma/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xf86gamma libs" >&5 -$as_echo_n "checking for xf86gamma libs... " >&6; } - d=$with_xf86gamma/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - # replace the directory string with "yes". - with_xf86gamma_req="yes" - with_xf86gamma=$with_xf86gamma_req - ;; - - *) - echo "" - echo "error: argument to --with-xf86gamma-ext 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 - -if test "$with_xf86gamma" = yes; then - - # first check for xf86vmode.h, if we haven't already - if test "$have_xf86vmode" = yes; then - have_xf86gamma=yes - else - - 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_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "#include -" -if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes; then : - have_xf86gamma=yes -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - fi - - # if that succeeded, then check for the -lXxf86vm - if test "$have_xf86gamma" = yes; then - have_xf86gamma=no - - 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" - - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeSetGamma in -lXxf86vm" >&5 -$as_echo_n "checking for XF86VidModeSetGamma in -lXxf86vm... " >&6; } -if ${ac_cv_lib_Xxf86vm_XF86VidModeSetGamma+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86vm -lXext -lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenInfo in -lXext" >&5 +printf %s "checking for XRRGetScreenInfo in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_XRRGetScreenInfo+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext $xrender_libs -lXext -lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XF86VidModeSetGamma (); +char XRRGetScreenInfo (void); int -main () +main (void) { -return XF86VidModeSetGamma (); +return XRRGetScreenInfo (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xxf86vm_XF86VidModeSetGamma=yes -else - ac_cv_lib_Xxf86vm_XF86VidModeSetGamma=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xext_XRRGetScreenInfo=yes +else case e in #( + e) ac_cv_lib_Xext_XRRGetScreenInfo=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" >&5 -$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" >&6; } -if test "x$ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" = xyes; then : - have_xf86gamma=yes -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XRRGetScreenInfo" >&5 +printf "%s\n" "$ac_cv_lib_Xext_XRRGetScreenInfo" >&6; } +if test "x$ac_cv_lib_Xext_XRRGetScreenInfo" = xyes +then : + have_randr=yes; SAVER_LIBS="$SAVER_LIBS $xrender_libs" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi - - # check for the Ramp versions of the functions too. - if test "$have_xf86gamma" = yes; then - have_xf86gamma_ramp=no + # if that failed, look in -lXrandr + if test "$have_randr" = no; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9017,171 +11204,190 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeSetGammaRamp in -lXxf86vm" >&5 -$as_echo_n "checking for XF86VidModeSetGammaRamp in -lXxf86vm... " >&6; } -if ${ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXxf86vm -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenInfo in -lXrandr" >&5 +printf %s "checking for XRRGetScreenInfo in -lXrandr... " >&6; } +if test ${ac_cv_lib_Xrandr_XRRGetScreenInfo+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrandr $xrender_libs -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XF86VidModeSetGammaRamp (); +char XRRGetScreenInfo (void); int -main () +main (void) { -return XF86VidModeSetGammaRamp (); +return XRRGetScreenInfo (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp=yes -else - ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xrandr_XRRGetScreenInfo=yes +else case e in #( + e) ac_cv_lib_Xrandr_XRRGetScreenInfo=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" >&5 -$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" >&6; } -if test "x$ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" = xyes; then : - have_xf86gamma_ramp=yes -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRGetScreenInfo" >&5 +printf "%s\n" "$ac_cv_lib_Xrandr_XRRGetScreenInfo" >&6; } +if test "x$ac_cv_lib_Xrandr_XRRGetScreenInfo" = xyes +then : + have_randr=yes; + XINERAMA_LIBS="$XINERAMA_LIBS -lXrandr $xrender_libs" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" + fi fi - # if those tests succeeded, then we've really got the functions. - if test "$have_xf86gamma" = yes; then - $as_echo "#define HAVE_XF86VMODE_GAMMA 1" >>confdefs.h - - fi + # if that succeeded, then we've really got it. + if test "$have_randr" = yes; then + printf "%s\n" "#define HAVE_RANDR 1" >>confdefs.h - if test "$have_xf86gamma_ramp" = yes; then - $as_echo "#define HAVE_XF86VMODE_GAMMA_RAMP 1" >>confdefs.h + # Now check for version 1.2 in the same libs. + # Try to compile, since on macOS 10.5.7, headers are older than libs! + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenResources" >&5 +printf %s "checking for XRRGetScreenResources... " >&6; } +if test ${ac_cv_randr_12+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_randr_12=no + 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` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include +int +main (void) +{ +XRRScreenResources *res = + XRRGetScreenResources (0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_randr_12=yes +else case e in #( + e) ac_cv_randr_12=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_randr_12" >&5 +printf "%s\n" "$ac_cv_randr_12" >&6; } + if test "$ac_cv_randr_12" = yes ; then + printf "%s\n" "#define HAVE_RANDR_12 1" >>confdefs.h - # pull in the lib, if we haven't already - if test "$have_xf86gamma" = yes -a "$have_xf86vmode" = no; then - SAVER_LIBS="$SAVER_LIBS -lXxf86vm" + fi +# AC_CHECK_X_LIB(c, XRRGetOutputInfo, [AC_DEFINE(HAVE_RANDR_12)], +# [true], $SAVER_LIBS) fi -elif test "$with_xf86gamma" != no; then - echo "error: must be yes or no: --with-xf86gamma-ext=$with_xf86vmode" +elif test "$with_randr" != no; then + echo "error: must be yes or no: --with-randr-ext=$with_randr" exit 1 fi ############################################################################### # -# Check for the XIDLE server extension. +# Check for the XINPUT server extension. # ############################################################################### -have_xidle=no -with_xidle_req=unspecified +have_xinput=no +with_xinput_req=unspecified +xinput_halfassed=no -# Check whether --with-xidle-ext was given. -if test "${with_xidle_ext+set}" = set; then : - withval=$with_xidle_ext; with_xidle="$withval"; with_xidle_req="$withval" -else - with_xidle=yes +# Check whether --with-xinput-ext was given. +if test ${with_xinput_ext+y} +then : + withval=$with_xinput_ext; with_xinput="$withval"; with_xinput_req="$withval" +else case e in #( + e) with_xinput=yes ;; +esac fi - case "$with_xidle" in + case "$with_xinput" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIDLE headers" >&5 -$as_echo_n "checking for XIDLE headers... " >&6; } - d=$with_xidle/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XINPUT headers" >&5 +printf %s "checking for XINPUT headers... " >&6; } + d=$with_xinput/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIDLE libs" >&5 -$as_echo_n "checking for XIDLE libs... " >&6; } - d=$with_xidle/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XINPUT libs" >&5 +printf %s "checking for XINPUT libs... " >&6; } + d=$with_xinput/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_xidle_req="yes" - with_xidle=$with_xidle_req + with_xinput_req="yes" + with_xinput=$with_xinput_req ;; *) echo "" - echo "error: argument to --with-xidle-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-xinput-ext 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 -if test "$with_xidle" = yes; then - - 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_fn_c_check_header_compile "$LINENO" "X11/extensions/xidle.h" "ac_cv_header_X11_extensions_xidle_h" "#include -" -if test "x$ac_cv_header_X11_extensions_xidle_h" = xyes; then : - have_xidle=yes - $as_echo "#define HAVE_XIDLE_EXTENSION 1" >>confdefs.h - -fi - - CPPFLAGS="$ac_save_CPPFLAGS" -elif test "$with_xidle" != no; then - echo "error: must be yes or no: --with-xidle-ext=$with_xidle" - exit 1 -fi - -############################################################################### -# -# Check for the MIT-SCREEN-SAVER server extension. -# -############################################################################### - -have_mit=no -with_mit=no -with_mit_req=unspecified -#AC_ARG_WITH(mit-ext, -#[ --with-mit-ext Include support for the MIT-SCREEN-SAVER extension.], -# [with_mit="$withval"; with_mit_req="$withval"],[with_mit=no]) -#HANDLE_X_PATH_ARG(with_mit, --with-mit-ext, MIT-SCREEN-SAVER) +if test "$with_xinput" = yes; then -if test "$with_mit" = yes; then + # first check for Xinput2.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -9189,18 +11395,19 @@ if test "$with_mit" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput2.h" "ac_cv_header_X11_extensions_XInput2_h" "#include " -if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = xyes; then : - have_mit=yes +if test "x$ac_cv_header_X11_extensions_XInput2_h" = xyes +then : + have_xinput=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - # Now check to see if it's really in the library; XF86Free-3.3 ships - # scrnsaver.h, but doesn't include the code in libXext.a, the idiots! - # - if test "$have_mit" = yes; then + # if that succeeded, then check for libXi + if test "$have_xinput" = yes; then + have_xinput=no + xinput_halfassed=yes ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9220,55 +11427,167 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXext" >&5 -$as_echo_n "checking for XScreenSaverRegister in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XScreenSaverRegister+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XISelectEvents in -lXi" >&5 +printf %s "checking for XISelectEvents in -lXi... " >&6; } +if test ${ac_cv_lib_Xi_XISelectEvents+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXi -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XScreenSaverRegister (); +char XISelectEvents (void); int -main () +main (void) { -return XScreenSaverRegister (); +return XISelectEvents (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xext_XScreenSaverRegister=yes -else - ac_cv_lib_Xext_XScreenSaverRegister=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xi_XISelectEvents=yes +else case e in #( + e) ac_cv_lib_Xi_XISelectEvents=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XScreenSaverRegister" >&5 -$as_echo "$ac_cv_lib_Xext_XScreenSaverRegister" >&6; } -if test "x$ac_cv_lib_Xext_XScreenSaverRegister" = xyes; then : - true -else - have_mit=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xi_XISelectEvents" >&5 +printf "%s\n" "$ac_cv_lib_Xi_XISelectEvents" >&6; } +if test "x$ac_cv_lib_Xi_XISelectEvents" = xyes +then : + have_xinput=yes; xinput_halfassed=no; + SAVER_LIBS="$SAVER_LIBS -lXi" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - if test "$have_mit" = no; then - # Fuck! Looks like XF86Free-3.3 actually puts it in XExExt instead - # of in Xext. Thank you master, may I have another. + fi + + # if that succeeded, then we've really got it. + if test "$have_xinput" = yes; then + printf "%s\n" "#define HAVE_XINPUT 1" >>confdefs.h + + fi + +elif test "$with_xinput" = no; then + echo "error: --without-xinput-ext is not supported." + exit 1 + +elif test "$with_xinput" != no; then + echo "error: must be yes or no: --with-xinput-ext=$with_xinput" + exit 1 +fi + +############################################################################### +# +# Check for the XF86VMODE server extension (for gamma fading.) +# +############################################################################### + +have_xf86gamma=no +have_xf86gamma_ramp=no +with_xf86gamma_req=unspecified + +# Check whether --with-xf86gamma-ext was given. +if test ${with_xf86gamma_ext+y} +then : + withval=$with_xf86gamma_ext; with_xf86gamma="$withval"; with_xf86gamma_req="$withval" +else case e in #( + e) with_xf86gamma=yes ;; +esac +fi + + case "$with_xf86gamma" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xf86gamma headers" >&5 +printf %s "checking for xf86gamma headers... " >&6; } + d=$with_xf86gamma/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xf86gamma libs" >&5 +printf %s "checking for xf86gamma libs... " >&6; } + d=$with_xf86gamma/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_xf86gamma_req="yes" + with_xf86gamma=$with_xf86gamma_req + ;; + + *) + echo "" + echo "error: argument to --with-xf86gamma-ext 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 + +if test "$with_xf86gamma" = yes; then + + # first check for xf86vmode.h, if we haven't already + if test "$have_xf86vmode" = yes; then + have_xf86gamma=yes + else + + 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_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "#include +" +if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes +then : + have_xf86gamma=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + fi + + # if that succeeded, then check for the -lXxf86vm + if test "$have_xf86gamma" = yes; then + have_xf86gamma=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9288,59 +11607,66 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXExExt" >&5 -$as_echo_n "checking for XScreenSaverRegister in -lXExExt... " >&6; } -if ${ac_cv_lib_XExExt_XScreenSaverRegister+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXExExt -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeSetGamma in -lXxf86vm" >&5 +printf %s "checking for XF86VidModeSetGamma in -lXxf86vm... " >&6; } +if test ${ac_cv_lib_Xxf86vm_XF86VidModeSetGamma+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86vm -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XScreenSaverRegister (); +char XF86VidModeSetGamma (void); int -main () +main (void) { -return XScreenSaverRegister (); +return XF86VidModeSetGamma (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_XExExt_XScreenSaverRegister=yes -else - ac_cv_lib_XExExt_XScreenSaverRegister=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xxf86vm_XF86VidModeSetGamma=yes +else case e in #( + e) ac_cv_lib_Xxf86vm_XF86VidModeSetGamma=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XExExt_XScreenSaverRegister" >&5 -$as_echo "$ac_cv_lib_XExExt_XScreenSaverRegister" >&6; } -if test "x$ac_cv_lib_XExExt_XScreenSaverRegister" = xyes; then : - have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXExExt" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" >&5 +printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" >&6; } +if test "x$ac_cv_lib_Xxf86vm_XF86VidModeSetGamma" = xyes +then : + have_xf86gamma=yes +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi + fi - if test "$have_mit" = no; then - # Double fuck! Looks like some versions of XFree86 (whichever version - # it is that comes with RedHat Linux 2.0 -- I can't find a version - # number) put this garbage in Xss instead of Xext. Thank you master, - # may I have another. + # check for the Ramp versions of the functions too. + if test "$have_xf86gamma" = yes; then + have_xf86gamma_ramp=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9360,127 +11686,146 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXss" >&5 -$as_echo_n "checking for XScreenSaverRegister in -lXss... " >&6; } -if ${ac_cv_lib_Xss_XScreenSaverRegister+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXss -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeSetGammaRamp in -lXxf86vm" >&5 +printf %s "checking for XF86VidModeSetGammaRamp in -lXxf86vm... " >&6; } +if test ${ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86vm -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XScreenSaverRegister (); +char XF86VidModeSetGammaRamp (void); int -main () +main (void) { -return XScreenSaverRegister (); +return XF86VidModeSetGammaRamp (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xss_XScreenSaverRegister=yes -else - ac_cv_lib_Xss_XScreenSaverRegister=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp=yes +else case e in #( + e) ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverRegister" >&5 -$as_echo "$ac_cv_lib_Xss_XScreenSaverRegister" >&6; } -if test "x$ac_cv_lib_Xss_XScreenSaverRegister" = xyes; then : - have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXss" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" >&5 +printf "%s\n" "$ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" >&6; } +if test "x$ac_cv_lib_Xxf86vm_XF86VidModeSetGammaRamp" = xyes +then : + have_xf86gamma_ramp=yes +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi + fi - if test "$have_mit" = yes; then -# AC_DEFINE(HAVE_MIT_SAVER_EXTENSION) - echo "Using the MIT-SCREEN-SAVER extension will crash your server. Don't." - exit 1 - fi + # if those tests succeeded, then we've really got the functions. + if test "$have_xf86gamma" = yes; then + printf "%s\n" "#define HAVE_XF86VMODE_GAMMA 1" >>confdefs.h fi -elif test "$with_mit" != no; then - echo "error: must be yes or no: --with-mit-ext=$with_mit" + if test "$have_xf86gamma_ramp" = yes; then + printf "%s\n" "#define HAVE_XF86VMODE_GAMMA_RAMP 1" >>confdefs.h + + fi + + # pull in the lib, if we haven't already + if test "$have_xf86gamma" = yes -a "$have_xf86vmode" = no; then + SAVER_LIBS="$SAVER_LIBS -lXxf86vm" + fi + +elif test "$with_xf86gamma" != no; then + echo "error: must be yes or no: --with-xf86gamma-ext=$with_xf86vmode" exit 1 fi ############################################################################### # -# Check for the SGI SCREEN_SAVER server extension. +# Check for the XIDLE server extension. # ############################################################################### -have_sgi=no -with_sgi_req=unspecified +have_xidle=no +with_xidle_req=unspecified -# Check whether --with-sgi-ext was given. -if test "${with_sgi_ext+set}" = set; then : - withval=$with_sgi_ext; with_sgi="$withval"; with_sgi_req="$withval" -else - with_sgi=$ac_irix +# Check whether --with-xidle-ext was given. +if test ${with_xidle_ext+y} +then : + withval=$with_xidle_ext; with_xidle="$withval"; with_xidle_req="$withval" +else case e in #( + e) with_xidle=yes ;; +esac fi - case "$with_sgi" in + case "$with_xidle" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI SCREEN_SAVER headers" >&5 -$as_echo_n "checking for SGI SCREEN_SAVER headers... " >&6; } - d=$with_sgi/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XIDLE headers" >&5 +printf %s "checking for XIDLE headers... " >&6; } + d=$with_xidle/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI SCREEN_SAVER libs" >&5 -$as_echo_n "checking for SGI SCREEN_SAVER libs... " >&6; } - d=$with_sgi/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XIDLE libs" >&5 +printf %s "checking for XIDLE libs... " >&6; } + d=$with_xidle/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_sgi_req="yes" - with_sgi=$with_sgi_req + with_xidle_req="yes" + with_xidle=$with_xidle_req ;; *) echo "" - echo "error: argument to --with-sgi-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-xidle-ext 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 -if test "$with_sgi" = yes; then +if test "$with_xidle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -9488,83 +11833,36 @@ if test "$with_sgi" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XScreenSaver.h" "ac_cv_header_X11_extensions_XScreenSaver_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xidle.h" "ac_cv_header_X11_extensions_xidle_h" "#include " -if test "x$ac_cv_header_X11_extensions_XScreenSaver_h" = xyes; then : - have_sgi=yes - $as_echo "#define HAVE_SGI_SAVER_EXTENSION 1" >>confdefs.h +if test "x$ac_cv_header_X11_extensions_xidle_h" = xyes +then : + have_xidle=yes + printf "%s\n" "#define HAVE_XIDLE_EXTENSION 1" >>confdefs.h fi CPPFLAGS="$ac_save_CPPFLAGS" - -elif test "$with_sgi" != no; then - echo "error: must be yes or no: --with-sgi-ext=$with_sgi" +elif test "$with_xidle" != no; then + echo "error: must be yes or no: --with-xidle-ext=$with_xidle" exit 1 fi ############################################################################### # -# Check for the SGI-VIDEO-CONTROL server extension. +# Check for the MIT-SCREEN-SAVER server extension. # ############################################################################### -have_sgivc=no -with_sgivc_req=unspecified - -# Check whether --with-sgivc-ext was given. -if test "${with_sgivc_ext+set}" = set; then : - withval=$with_sgivc_ext; with_sgivc="$withval"; with_sgivc_req="$withval" -else - with_sgivc=$ac_irix -fi - - case "$with_sgivc" in - yes) ;; - no) ;; - - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI-VIDEO-CONTROL headers" >&5 -$as_echo_n "checking for SGI-VIDEO-CONTROL headers... " >&6; } - d=$with_sgivc/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI-VIDEO-CONTROL libs" >&5 -$as_echo_n "checking for SGI-VIDEO-CONTROL libs... " >&6; } - d=$with_sgivc/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - # replace the directory string with "yes". - with_sgivc_req="yes" - with_sgivc=$with_sgivc_req - ;; - - *) - echo "" - echo "error: argument to --with-sgivc-ext 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 - -if test "$with_sgivc" = yes; then +have_mit=no +with_mit=no +with_mit_req=unspecified +#AC_ARG_WITH(mit-ext, +#[ --with-mit-ext Include support for the MIT-SCREEN-SAVER extension.], +# [with_mit="$withval"; with_mit_req="$withval"],[with_mit=no]) +#HANDLE_X_PATH_ARG(with_mit, --with-mit-ext, MIT-SCREEN-SAVER) - # first check for XSGIvc.h +if test "$with_mit" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -9572,17 +11870,19 @@ if test "$with_sgivc" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XSGIvc.h" "ac_cv_header_X11_extensions_XSGIvc_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "#include " -if test "x$ac_cv_header_X11_extensions_XSGIvc_h" = xyes; then : - have_sgivc=yes +if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = xyes +then : + have_mit=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - # if that succeeded, then check for the -lXsgivc - if test "$have_sgivc" = yes; then - have_sgivc=no + # Now check to see if it's really in the library; XF86Free-3.3 ships + # scrnsaver.h, but doesn't include the code in libXext.a, the idiots! + # + if test "$have_mit" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9602,125 +11902,296 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSGIvcQueryGammaMap in -lXsgivc" >&5 -$as_echo_n "checking for XSGIvcQueryGammaMap in -lXsgivc... " >&6; } -if ${ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXsgivc -lXext -lX11 $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXext" >&5 +printf %s "checking for XScreenSaverRegister in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_XScreenSaverRegister+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XSGIvcQueryGammaMap (); +char XScreenSaverRegister (void); int -main () +main (void) { -return XSGIvcQueryGammaMap (); +return XScreenSaverRegister (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap=yes -else - ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xext_XScreenSaverRegister=yes +else case e in #( + e) ac_cv_lib_Xext_XScreenSaverRegister=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" >&5 -$as_echo "$ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" >&6; } -if test "x$ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" = xyes; then : - have_sgivc=yes; SAVER_LIBS="$SAVER_LIBS -lXsgivc" -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XScreenSaverRegister" >&5 +printf "%s\n" "$ac_cv_lib_Xext_XScreenSaverRegister" >&6; } +if test "x$ac_cv_lib_Xext_XScreenSaverRegister" = xyes +then : true +else case e in #( + e) have_mit=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" + if test "$have_mit" = no; then + # Fuck! Looks like XF86Free-3.3 actually puts it in XExExt instead + # of in Xext. Thank you master, may I have another. + + 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 that succeeded, then we've really got it. - if test "$have_sgivc" = yes; then - $as_echo "#define HAVE_SGI_VC_EXTENSION 1" >>confdefs.h + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXExExt" >&5 +printf %s "checking for XScreenSaverRegister in -lXExExt... " >&6; } +if test ${ac_cv_lib_XExExt_XScreenSaverRegister+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXExExt -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XScreenSaverRegister (void); +int +main (void) +{ +return XScreenSaverRegister (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_XExExt_XScreenSaverRegister=yes +else case e in #( + e) ac_cv_lib_XExExt_XScreenSaverRegister=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XExExt_XScreenSaverRegister" >&5 +printf "%s\n" "$ac_cv_lib_XExExt_XScreenSaverRegister" >&6; } +if test "x$ac_cv_lib_XExExt_XScreenSaverRegister" = xyes +then : + have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXExExt" +else case e in #( + e) true ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + fi + + if test "$have_mit" = no; then + # Double fuck! Looks like some versions of XFree86 (whichever version + # it is that comes with RedHat Linux 2.0 -- I can't find a version + # number) put this garbage in Xss instead of Xext. Thank you master, + # may I have another. + + 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" -elif test "$with_sgivc" != no; then - echo "error: must be yes or no: --with-sgivc-ext=$with_sgivc" + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverRegister in -lXss" >&5 +printf %s "checking for XScreenSaverRegister in -lXss... " >&6; } +if test ${ac_cv_lib_Xss_XScreenSaverRegister+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXss -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XScreenSaverRegister (void); +int +main (void) +{ +return XScreenSaverRegister (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xss_XScreenSaverRegister=yes +else case e in #( + e) ac_cv_lib_Xss_XScreenSaverRegister=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverRegister" >&5 +printf "%s\n" "$ac_cv_lib_Xss_XScreenSaverRegister" >&6; } +if test "x$ac_cv_lib_Xss_XScreenSaverRegister" = xyes +then : + have_mit=yes; SAVER_LIBS="$SAVER_LIBS -lXss" +else case e in #( + e) true ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + fi + + if test "$have_mit" = yes; then +# AC_DEFINE(HAVE_MIT_SAVER_EXTENSION) + echo "Using the MIT-SCREEN-SAVER extension will crash your server. Don't." + exit 1 + fi + + fi + +elif test "$with_mit" != no; then + echo "error: must be yes or no: --with-mit-ext=$with_mit" exit 1 fi ############################################################################### # -# Check for the SGI XReadDisplay server extension. +# Check for the SGI SCREEN_SAVER server extension. # ############################################################################### -have_readdisplay=no -with_readdisplay_req=unspecified +have_sgi=no +with_sgi_req=unspecified -# Check whether --with-readdisplay was given. -if test "${with_readdisplay+set}" = set; then : - withval=$with_readdisplay; with_readdisplay="$withval"; with_readdisplay_req="$withval" -else - with_readdisplay=$ac_irix +# Check whether --with-sgi-ext was given. +if test ${with_sgi_ext+y} +then : + withval=$with_sgi_ext; with_sgi="$withval"; with_sgi_req="$withval" +else case e in #( + e) with_sgi=$ac_irix ;; +esac fi - case "$with_readdisplay" in + case "$with_sgi" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XReadDisplay headers" >&5 -$as_echo_n "checking for XReadDisplay headers... " >&6; } - d=$with_readdisplay/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SGI SCREEN_SAVER headers" >&5 +printf %s "checking for SGI SCREEN_SAVER headers... " >&6; } + d=$with_sgi/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XReadDisplay libs" >&5 -$as_echo_n "checking for XReadDisplay libs... " >&6; } - d=$with_readdisplay/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SGI SCREEN_SAVER libs" >&5 +printf %s "checking for SGI SCREEN_SAVER libs... " >&6; } + d=$with_sgi/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_readdisplay_req="yes" - with_readdisplay=$with_readdisplay_req + with_sgi_req="yes" + with_sgi=$with_sgi_req ;; *) echo "" - echo "error: argument to --with-readdisplay must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-sgi-ext 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 -if test "$with_readdisplay" = yes; then +if test "$with_sgi" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -9728,81 +12199,86 @@ if test "$with_readdisplay" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/readdisplay.h" "ac_cv_header_X11_extensions_readdisplay_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XScreenSaver.h" "ac_cv_header_X11_extensions_XScreenSaver_h" "#include " -if test "x$ac_cv_header_X11_extensions_readdisplay_h" = xyes; then : - $as_echo "#define HAVE_READ_DISPLAY_EXTENSION 1" >>confdefs.h +if test "x$ac_cv_header_X11_extensions_XScreenSaver_h" = xyes +then : + have_sgi=yes + printf "%s\n" "#define HAVE_SGI_SAVER_EXTENSION 1" >>confdefs.h fi CPPFLAGS="$ac_save_CPPFLAGS" -elif test "$with_readdisplay" != no; then - echo "error: must be yes or no: --with-readdisplay=$with_readdisplay" + +elif test "$with_sgi" != no; then + echo "error: must be yes or no: --with-sgi-ext=$with_sgi" exit 1 fi ############################################################################### # -# Check for the XSHM server extension. +# Check for the SGI-VIDEO-CONTROL server extension. # ############################################################################### -have_xshm=no -with_xshm_req=unspecified +have_sgivc=no +with_sgivc_req=unspecified -# Check whether --with-xshm-ext was given. -if test "${with_xshm_ext+set}" = set; then : - withval=$with_xshm_ext; with_xshm="$withval"; with_xshm_req="$withval" -else - with_xshm=yes +# Check whether --with-sgivc-ext was given. +if test ${with_sgivc_ext+y} +then : + withval=$with_sgivc_ext; with_sgivc="$withval"; with_sgivc_req="$withval" +else case e in #( + e) with_sgivc=$ac_irix ;; +esac fi - case "$with_xshm" in + case "$with_sgivc" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSHM headers" >&5 -$as_echo_n "checking for XSHM headers... " >&6; } - d=$with_xshm/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SGI-VIDEO-CONTROL headers" >&5 +printf %s "checking for SGI-VIDEO-CONTROL headers... " >&6; } + d=$with_sgivc/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSHM libs" >&5 -$as_echo_n "checking for XSHM libs... " >&6; } - d=$with_xshm/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SGI-VIDEO-CONTROL libs" >&5 +printf %s "checking for SGI-VIDEO-CONTROL libs... " >&6; } + d=$with_sgivc/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_xshm_req="yes" - with_xshm=$with_xshm_req + with_sgivc_req="yes" + with_sgivc=$with_sgivc_req ;; *) echo "" - echo "error: argument to --with-xshm-ext must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-sgivc-ext 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 -if test "$with_xshm" = yes; then +if test "$with_sgivc" = yes; then - # first check for Xshm.h. + # first check for XSGIvc.h ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -9810,60 +12286,18 @@ if test "$with_xshm" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XShm.h" "ac_cv_header_X11_extensions_XShm_h" "#include + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XSGIvc.h" "ac_cv_header_X11_extensions_XSGIvc_h" "#include " -if test "x$ac_cv_header_X11_extensions_XShm_h" = xyes; then : - have_xshm=yes -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - - # if that succeeded, then check for sys/ipc.h. - if test "$have_xshm" = yes; then - have_xshm=no - - 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_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_ipc_h" = xyes; then : - have_xshm=yes -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - fi - - # if that succeeded, then check for sys/shm.h. - if test "$have_xshm" = yes; then - have_xshm=no - - 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_fn_c_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_shm_h" = xyes; then : - have_xshm=yes +if test "x$ac_cv_header_X11_extensions_XSGIvc_h" = xyes +then : + have_sgivc=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - fi - # AIX is pathological, as usual: apparently it's normal for the Xshm headers - # to exist, but the library code to not exist. And even better, the library - # code is in its own library: libXextSam.a. So, if we're on AIX, and that - # lib doesn't exist, give up. (This lib gets added to X_EXTRA_LIBS, and - # that's not quite right, but close enough.) - # - case "$host" in - *-aix*) - if `uname -v` -eq 3 ; then - have_xshm=no + # if that succeeded, then check for the -lXsgivc + if test "$have_sgivc" = yes; then + have_sgivc=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -9883,81 +12317,307 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXextSam" >&5 -$as_echo_n "checking for XShmQueryExtension in -lXextSam... " >&6; } -if ${ac_cv_lib_XextSam_XShmQueryExtension+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXextSam -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XSGIvcQueryGammaMap in -lXsgivc" >&5 +printf %s "checking for XSGIvcQueryGammaMap in -lXsgivc... " >&6; } +if test ${ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXsgivc -lXext -lX11 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XShmQueryExtension (); +char XSGIvcQueryGammaMap (void); int -main () +main (void) { -return XShmQueryExtension (); +return XSGIvcQueryGammaMap (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_XextSam_XShmQueryExtension=yes -else - ac_cv_lib_XextSam_XShmQueryExtension=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap=yes +else case e in #( + e) ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XextSam_XShmQueryExtension" >&5 -$as_echo "$ac_cv_lib_XextSam_XShmQueryExtension" >&6; } -if test "x$ac_cv_lib_XextSam_XShmQueryExtension" = xyes; then : - have_xshm=yes; X_EXTRA_LIBS="$X_EXTRA_LIBS -lXextSam" -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" >&5 +printf "%s\n" "$ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" >&6; } +if test "x$ac_cv_lib_Xsgivc_XSGIvcQueryGammaMap" = xyes +then : + have_sgivc=yes; SAVER_LIBS="$SAVER_LIBS -lXsgivc" +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi - ;; - esac + fi # if that succeeded, then we've really got it. - if test "$have_xshm" = yes; then - $as_echo "#define HAVE_XSHM_EXTENSION 1" >>confdefs.h + if test "$have_sgivc" = yes; then + printf "%s\n" "#define HAVE_SGI_VC_EXTENSION 1" >>confdefs.h fi -elif test "$with_xshm" != no; then - echo "error: must be yes or no: --with-xshm-ext=$with_xshm" +elif test "$with_sgivc" != no; then + echo "error: must be yes or no: --with-sgivc-ext=$with_sgivc" exit 1 fi ############################################################################### # -# Check for the DOUBLE-BUFFER server extension. +# Check for the XSHM server extension. # ############################################################################### -have_xdbe=no -with_xdbe_req=unspecified +have_xshm=no +with_xshm_req=unspecified -# Check whether --with-xdbe-ext was given. -if test "${with_xdbe_ext+set}" = set; then : - withval=$with_xdbe_ext; with_xdbe="$withval"; with_xdbe_req="$withval" -else - with_xdbe=yes +# Check whether --with-xshm-ext was given. +if test ${with_xshm_ext+y} +then : + withval=$with_xshm_ext; with_xshm="$withval"; with_xshm_req="$withval" +else case e in #( + e) with_xshm=yes ;; +esac +fi + + case "$with_xshm" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XSHM headers" >&5 +printf %s "checking for XSHM headers... " >&6; } + d=$with_xshm/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XSHM libs" >&5 +printf %s "checking for XSHM libs... " >&6; } + d=$with_xshm/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_xshm_req="yes" + with_xshm=$with_xshm_req + ;; + + *) + echo "" + echo "error: argument to --with-xshm-ext 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 + +if test "$with_xshm" = yes; then + + # first check for Xshm.h. + + 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_fn_c_check_header_compile "$LINENO" "X11/extensions/XShm.h" "ac_cv_header_X11_extensions_XShm_h" "#include +" +if test "x$ac_cv_header_X11_extensions_XShm_h" = xyes +then : + have_xshm=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + + # if that succeeded, then check for sys/ipc.h. + if test "$have_xshm" = yes; then + have_xshm=no + + 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_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ipc_h" = xyes +then : + have_xshm=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + fi + + # if that succeeded, then check for sys/shm.h. + if test "$have_xshm" = yes; then + have_xshm=no + + 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_fn_c_check_header_compile "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_shm_h" = xyes +then : + have_xshm=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + fi + + # AIX is pathological, as usual: apparently it's normal for the Xshm headers + # to exist, but the library code to not exist. And even better, the library + # code is in its own library: libXextSam.a. So, if we're on AIX, and that + # lib doesn't exist, give up. (This lib gets added to X_EXTRA_LIBS, and + # that's not quite right, but close enough.) + # + case "$host" in + *-aix*) + if `uname -v` -eq 3 ; then + have_xshm=no + + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXextSam" >&5 +printf %s "checking for XShmQueryExtension in -lXextSam... " >&6; } +if test ${ac_cv_lib_XextSam_XShmQueryExtension+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lXextSam -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XShmQueryExtension (void); +int +main (void) +{ +return XShmQueryExtension (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_XextSam_XShmQueryExtension=yes +else case e in #( + e) ac_cv_lib_XextSam_XShmQueryExtension=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XextSam_XShmQueryExtension" >&5 +printf "%s\n" "$ac_cv_lib_XextSam_XShmQueryExtension" >&6; } +if test "x$ac_cv_lib_XextSam_XShmQueryExtension" = xyes +then : + have_xshm=yes; X_EXTRA_LIBS="$X_EXTRA_LIBS -lXextSam" +else case e in #( + e) true ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + fi + ;; + esac + + # if that succeeded, then we've really got it. + if test "$have_xshm" = yes; then + printf "%s\n" "#define HAVE_XSHM_EXTENSION 1" >>confdefs.h + + fi + +elif test "$with_xshm" != no; then + echo "error: must be yes or no: --with-xshm-ext=$with_xshm" + exit 1 +fi + +############################################################################### +# +# Check for the DOUBLE-BUFFER server extension. +# +############################################################################### + +have_xdbe=no +with_xdbe_req=unspecified + +# Check whether --with-xdbe-ext was given. +if test ${with_xdbe_ext+y} +then : + withval=$with_xdbe_ext; with_xdbe="$withval"; with_xdbe_req="$withval" +else case e in #( + e) with_xdbe=yes ;; +esac fi case "$with_xdbe" in @@ -9965,28 +12625,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DOUBLE-BUFFER headers" >&5 -$as_echo_n "checking for DOUBLE-BUFFER headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DOUBLE-BUFFER headers" >&5 +printf %s "checking for DOUBLE-BUFFER headers... " >&6; } d=$with_xdbe/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DOUBLE-BUFFER libs" >&5 -$as_echo_n "checking for DOUBLE-BUFFER libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DOUBLE-BUFFER libs" >&5 +printf %s "checking for DOUBLE-BUFFER libs... " >&6; } d=$with_xdbe/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -10013,13 +12673,14 @@ if test "$with_xdbe" = yes; then CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xdbe.h" "ac_cv_header_X11_extensions_Xdbe_h" "#include " -if test "x$ac_cv_header_X11_extensions_Xdbe_h" = xyes; then : +if test "x$ac_cv_header_X11_extensions_Xdbe_h" = xyes +then : have_xdbe=yes fi CPPFLAGS="$ac_save_CPPFLAGS" if test "$have_xdbe" = yes; then - $as_echo "#define HAVE_DOUBLE_BUFFER_EXTENSION 1" >>confdefs.h + printf "%s\n" "#define HAVE_DOUBLE_BUFFER_EXTENSION 1" >>confdefs.h fi @@ -10067,10 +12728,12 @@ have_xkb=no with_xkb_req=unspecified # Check whether --with-xkb-ext was given. -if test "${with_xkb_ext+set}" = set; then : +if test ${with_xkb_ext+y} +then : withval=$with_xkb_ext; with_xkb="$withval"; with_xkb_req="$withval" -else - with_xkb=yes +else case e in #( + e) with_xkb=yes ;; +esac fi case "$with_xkb" in @@ -10078,28 +12741,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKB headers" >&5 -$as_echo_n "checking for XKB headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XKB headers" >&5 +printf %s "checking for XKB headers... " >&6; } d=$with_xkb/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKB libs" >&5 -$as_echo_n "checking for XKB libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XKB libs" >&5 +printf %s "checking for XKB libs... " >&6; } d=$with_xkb/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -10126,13 +12789,14 @@ if test "$with_xkb" = yes; then CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "#include " -if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : +if test "x$ac_cv_header_X11_XKBlib_h" = xyes +then : have_xkb=yes fi CPPFLAGS="$ac_save_CPPFLAGS" if test "$have_xkb" = yes; then - $as_echo "#define HAVE_XKB 1" >>confdefs.h + printf "%s\n" "#define HAVE_XKB 1" >>confdefs.h fi @@ -10147,8 +12811,8 @@ fi # ############################################################################### -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XHPDisableReset in X11/XHPlib.h" >&5 -$as_echo_n "checking for XHPDisableReset in X11/XHPlib.h... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XHPDisableReset in X11/XHPlib.h" >&5 +printf %s "checking for XHPDisableReset in X11/XHPlib.h... " >&6; } ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -10162,15 +12826,17 @@ $as_echo_n "checking for XHPDisableReset in X11/XHPlib.h... " >&6; } _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "XHPDisableReset" >/dev/null 2>&1; then : - $as_echo "#define HAVE_XHPDISABLERESET 1" >>confdefs.h + $EGREP_TRADITIONAL "XHPDisableReset" >/dev/null 2>&1 +then : + printf "%s\n" "#define HAVE_XHPDISABLERESET 1" >>confdefs.h SAVER_LIBS="-lXhp11 $SAVER_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -rf conftest* @@ -10186,10 +12852,12 @@ have_proc_interrupts=no with_proc_interrupts_req=unspecified # Check whether --with-proc-interrupts was given. -if test "${with_proc_interrupts+set}" = set; then : +if test ${with_proc_interrupts+y} +then : withval=$with_proc_interrupts; with_proc_interrupts="$withval"; with_proc_interrupts_req="$withval" -else - with_proc_interrupts=no +else case e in #( + e) with_proc_interrupts=no ;; +esac fi if test "$with_proc_interrupts" = yes; then @@ -10201,24 +12869,26 @@ if test "$with_proc_interrupts" = yes; then have_proc_interrupts=yes if test -f /proc/interrupts; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /proc/interrupts contains keyboard data" >&5 -$as_echo_n "checking whether /proc/interrupts contains keyboard data... " >&6; } -if ${ac_cv_have_proc_interrupts+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_have_proc_interrupts=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether /proc/interrupts contains keyboard data" >&5 +printf %s "checking whether /proc/interrupts contains keyboard data... " >&6; } +if test ${ac_cv_have_proc_interrupts+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_have_proc_interrupts=no if grep 'keyboard\|i8042' /proc/interrupts >/dev/null 2>&1 ; then ac_cv_have_proc_interrupts=yes fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_proc_interrupts" >&5 -$as_echo "$ac_cv_have_proc_interrupts" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_proc_interrupts" >&5 +printf "%s\n" "$ac_cv_have_proc_interrupts" >&6; } have_proc_interrupts=$ac_cv_have_proc_interrupts fi if test "$have_proc_interrupts" = yes; then - $as_echo "#define HAVE_PROC_INTERRUPTS 1" >>confdefs.h + printf "%s\n" "#define HAVE_PROC_INTERRUPTS 1" >>confdefs.h fi @@ -10238,10 +12908,12 @@ have_proc_oom=no with_proc_oom_req=unspecified # Check whether --with-proc-oom was given. -if test "${with_proc_oom+set}" = set; then : +if test ${with_proc_oom+y} +then : withval=$with_proc_oom; with_proc_oom="$withval"; with_proc_oom_req="$withval" -else - with_proc_oom=yes +else case e in #( + e) with_proc_oom=yes ;; +esac fi if test "$with_proc_oom_req" = yes; then @@ -10250,32 +12922,34 @@ if test "$with_proc_oom_req" = yes; then # without a proper /proc filesystem. # have_proc_oom=yes - $as_echo "#define HAVE_PROC_OOM 1" >>confdefs.h + printf "%s\n" "#define HAVE_PROC_OOM 1" >>confdefs.h elif test "$with_proc_oom_req" = unspecified; then have_proc_oom=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /proc/$$/oom_score_adj exists" >&5 -$as_echo_n "checking whether /proc/$$/oom_score_adj exists... " >&6; } -if ${ac_cv_have_proc_oom+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_have_proc_oom=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether /proc/$$/oom_score_adj exists" >&5 +printf %s "checking whether /proc/$$/oom_score_adj exists... " >&6; } +if test ${ac_cv_have_proc_oom+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_have_proc_oom=no if test -f /proc/$$/oom_score_adj; then ac_cv_have_proc_oom=yes fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_proc_oom" >&5 -$as_echo "$ac_cv_have_proc_oom" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_proc_oom" >&5 +printf "%s\n" "$ac_cv_have_proc_oom" >&6; } have_proc_oom=$ac_cv_have_proc_oom if test "$have_proc_oom" = yes; then - $as_echo "#define HAVE_PROC_OOM 1" >>confdefs.h + printf "%s\n" "#define HAVE_PROC_OOM 1" >>confdefs.h # Only root can write to /proc/$$/oom_score_adj, even though it's us. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling setuid to opt out of OOM-killer." >&5 -$as_echo "enabling setuid to opt out of OOM-killer." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enabling setuid to opt out of OOM-killer." >&5 +printf "%s\n" "enabling setuid to opt out of OOM-killer." >&6; } setuid_auth=yes fi @@ -10296,10 +12970,12 @@ systemd_halfassed=no systemd_too_old=no # Check whether --with-systemd was given. -if test "${with_systemd+set}" = set; then : +if test ${with_systemd+y} +then : withval=$with_systemd; with_systemd="$withval"; with_systemd_req="$withval" -else - with_systemd=yes +else case e in #( + e) with_systemd=yes ;; +esac fi case "$with_systemd" in @@ -10307,28 +12983,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemd headers" >&5 -$as_echo_n "checking for systemd headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for systemd headers" >&5 +printf %s "checking for systemd headers... " >&6; } d=$with_systemd/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemd libs" >&5 -$as_echo_n "checking for systemd libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for systemd libs" >&5 +printf %s "checking for systemd libs... " >&6; } d=$with_systemd/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -10364,24 +13040,28 @@ if test "$with_systemd" = yes; then fi if test "$have_systemd" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd includes" >&5 -$as_echo_n "checking for libsystemd includes... " >&6; } -if ${ac_cv_systemd_config_cflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_systemd_config_cflags=`$pkg_config --cflags $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_systemd_config_cflags" >&5 -$as_echo "$ac_cv_systemd_config_cflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd libs" >&5 -$as_echo_n "checking for libsystemd libs... " >&6; } -if ${ac_cv_systemd_config_libs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_systemd_config_libs=`$pkg_config --libs $pkgs` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd includes" >&5 +printf %s "checking for libsystemd includes... " >&6; } +if test ${ac_cv_systemd_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_systemd_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_systemd_config_libs" >&5 -$as_echo "$ac_cv_systemd_config_libs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_systemd_config_cflags" >&5 +printf "%s\n" "$ac_cv_systemd_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd libs" >&5 +printf %s "checking for libsystemd libs... " >&6; } +if test ${ac_cv_systemd_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_systemd_config_libs=`$pkg_config --libs $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_systemd_config_libs" >&5 +printf "%s\n" "$ac_cv_systemd_config_libs" >&6; } fi ac_systemd_config_cflags=$ac_cv_systemd_config_cflags @@ -10402,8 +13082,9 @@ $as_echo "$ac_cv_systemd_config_libs" >&6; } fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-bus.h" "ac_cv_header_systemd_sd_bus_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_bus_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "systemd/sd-bus.h" "ac_cv_header_systemd_sd_bus_h" "$ac_includes_default" +if test "x$ac_cv_header_systemd_sd_bus_h" = xyes +then : have_systemd=yes fi @@ -10416,8 +13097,9 @@ fi # we have the headers, now check for the libraries have_systemd=no systemd_halfassed=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for libsystemd usability..." >&5 -$as_echo "checking for libsystemd usability..." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libsystemd usability..." >&5 +printf "%s\n" "checking for libsystemd usability..." >&6; } + # sd_bus_track_count_name was added in some later version of systemd. ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -10437,43 +13119,51 @@ $as_echo "checking for libsystemd usability..." >&6; } CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_bus_open_system in -lc" >&5 -$as_echo_n "checking for sd_bus_open_system in -lc... " >&6; } -if ${ac_cv_lib_c_sd_bus_open_system+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sd_bus_track_count_name in -lc" >&5 +printf %s "checking for sd_bus_track_count_name in -lc... " >&6; } +if test ${ac_cv_lib_c_sd_bus_track_count_name+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc $ac_systemd_config_libs -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char sd_bus_open_system (); +char sd_bus_track_count_name (void); int -main () +main (void) { -return sd_bus_open_system (); +return sd_bus_track_count_name (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_sd_bus_open_system=yes -else - ac_cv_lib_c_sd_bus_open_system=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c_sd_bus_track_count_name=yes +else case e in #( + e) ac_cv_lib_c_sd_bus_track_count_name=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sd_bus_open_system" >&5 -$as_echo "$ac_cv_lib_c_sd_bus_open_system" >&6; } -if test "x$ac_cv_lib_c_sd_bus_open_system" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sd_bus_track_count_name" >&5 +printf "%s\n" "$ac_cv_lib_c_sd_bus_track_count_name" >&6; } +if test "x$ac_cv_lib_c_sd_bus_track_count_name" = xyes +then : have_systemd=yes; systemd_halfassed=no fi @@ -10484,8 +13174,8 @@ fi fi if test "$have_systemd" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for libsystemd usability... no" >&5 -$as_echo "checking for libsystemd usability... no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libsystemd usability... no" >&5 +printf "%s\n" "checking for libsystemd usability... no" >&6; } fi fi @@ -10493,7 +13183,7 @@ if test "$have_systemd" = yes; then INCLUDES="$INCLUDES $ac_systemd_config_cflags" EXES_SYSTEMD='$(EXES_SYSTEMD)' SYSTEMD_LIBS="$ac_systemd_config_libs" - $as_echo "#define HAVE_LIBSYSTEMD 1" >>confdefs.h + printf "%s\n" "#define HAVE_LIBSYSTEMD 1" >>confdefs.h else EXES_SYSTEMD='' @@ -10502,65 +13192,297 @@ fi ############################################################################### # -# The --enable-locking option -# -# Note: "configure --help" list all "--enable" options before any -# "--with" options, so we document the --enable options inline with -# the --with options where it looks better, instead of in AC_ARG_ENABLE -# where it would make sense, sigh... +# Check for -lelogind, a stripped down subset of systemd. # ############################################################################### -# Check whether --enable-locking was given. -if test "${enable_locking+set}" = set; then : - enableval=$enable_locking; # This is documented elsewhere because of --enable/--with option sorting. - enable_locking="$enableval" -else - if test "$ac_macosx" = yes; then - # We can't lock on macOS, so default to not compiling in support for it. - # But allow --enable-locking to override that, so I can debug Linux locking - # under macOS X11. - enable_locking=no - else - enable_locking=yes - fi +have_elogind=no +with_elogind_req=unspecified +elogind_halfassed=no +elogind_too_old=no + +# Check whether --with-elogind was given. +if test ${with_elogind+y} +then : + withval=$with_elogind; with_elogind="$withval"; with_elogind_req="$withval" +else case e in #( + e) with_elogind=yes ;; +esac fi -if test "$enable_locking" = yes; then - true -elif test "$enable_locking" = no; then - $as_echo "#define NO_LOCKING 1" >>confdefs.h + case "$with_elogind" in + yes) ;; + no) ;; -else - echo "error: must be yes or no: --enable-locking=$enable_locking" - exit 1 -fi + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for elogind headers" >&5 +printf %s "checking for elogind headers... " >&6; } + d=$with_elogind/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi -############################################################################## -# -# Whether to allow root password to unblank. -# -############################################################################### + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for elogind libs" >&5 +printf %s "checking for elogind libs... " >&6; } + d=$with_elogind/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi -# Check whether --enable-root-passwd was given. -if test "${enable_root_passwd+set}" = set; then : - enableval=$enable_root_passwd; # This is documented elsewhere because of --enable/--with option sorting. - enable_root_passwd="$enableval" -else - enable_root_passwd=no -fi + # replace the directory string with "yes". + with_elogind_req="yes" + with_elogind=$with_elogind_req + ;; -if test "$enable_root_passwd" = yes; then - $as_echo "#define ALLOW_ROOT_PASSWD 1" >>confdefs.h + *) + echo "" + echo "error: argument to --with-elogind 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 - true -elif test "$enable_root_passwd" != no; then - echo "error: must be yes or no: --enable-root-passwd=$enable_root_passwd" +if test "$with_elogind" != yes -a "$with_elogind" != no ; then + echo "error: must be yes or no: --with-elogind=$with_elogind" exit 1 fi -############################################################################### -# +if test "$with_elogind" = yes; then + + pkgs='' + ok="yes" + pkg_check_version libelogind 221 + have_elogind="$ok" + + if test "$have_elogind" = no; then + if $pkg_config --exists libelogind ; then + elogind_too_old=yes + fi + fi + + if test "$have_elogind" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind includes" >&5 +printf %s "checking for libelogind includes... " >&6; } +if test ${ac_cv_elogind_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_elogind_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_elogind_config_cflags" >&5 +printf "%s\n" "$ac_cv_elogind_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libelogind libs" >&5 +printf %s "checking for libelogind libs... " >&6; } +if test ${ac_cv_elogind_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_elogind_config_libs=`$pkg_config --libs $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_elogind_config_libs" >&5 +printf "%s\n" "$ac_cv_elogind_config_libs" >&6; } + fi + + ac_elogind_config_cflags=$ac_cv_elogind_config_cflags + ac_elogind_config_libs=$ac_cv_elogind_config_libs + + if test "$have_elogind" = yes; then + # + # we appear to have libelogind; check for headers/libs to be sure. + # + ac_save_elogind_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_elogind_config_cflags" + + have_elogind=no + + 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_fn_c_check_header_compile "$LINENO" "elogind/sd-bus.h" "ac_cv_header_elogind_sd_bus_h" "$ac_includes_default" +if test "x$ac_cv_header_elogind_sd_bus_h" = xyes +then : + have_elogind=yes +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + + CPPFLAGS="$ac_save_elogind_CPPFLAGS" + fi + + if test "$have_elogind" = yes; then + # we have the headers, now check for the libraries + have_elogind=no + elogind_halfassed=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libelogind usability..." >&5 +printf "%s\n" "checking for libelogind usability..." >&6; } + + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sd_bus_track_count_name in -lc" >&5 +printf %s "checking for sd_bus_track_count_name in -lc... " >&6; } +if test ${ac_cv_lib_c_sd_bus_track_count_name+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $ac_elogind_config_libs -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sd_bus_track_count_name (void); +int +main (void) +{ +return sd_bus_track_count_name (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c_sd_bus_track_count_name=yes +else case e in #( + e) ac_cv_lib_c_sd_bus_track_count_name=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sd_bus_track_count_name" >&5 +printf "%s\n" "$ac_cv_lib_c_sd_bus_track_count_name" >&6; } +if test "x$ac_cv_lib_c_sd_bus_track_count_name" = xyes +then : + have_elogind=yes; elogind_halfassed=no +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + fi + + if test "$have_elogind" = no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libelogind usability... no" >&5 +printf "%s\n" "checking for libelogind usability... no" >&6; } + fi +fi + +if test "$have_elogind" = yes; then + INCLUDES="$INCLUDES $ac_elogind_config_cflags" + EXES_SYSTEMD='$(EXES_SYSTEMD)' + SYSTEMD_LIBS="$ac_elogind_config_libs" + printf "%s\n" "#define HAVE_LIBELOGIND 1" >>confdefs.h + +fi + +############################################################################### +# +# The --enable-locking option +# +# Note: "configure --help" list all "--enable" options before any +# "--with" options, so we document the --enable options inline with +# the --with options where it looks better, instead of in AC_ARG_ENABLE +# where it would make sense, sigh... +# +############################################################################### + +# Check whether --enable-locking was given. +if test ${enable_locking+y} +then : + enableval=$enable_locking; # This is documented elsewhere because of --enable/--with option sorting. + enable_locking="$enableval" +else case e in #( + e) if test "$ac_macosx" = yes; then + # We can't lock on macOS, so default to not compiling in support for it. + # But allow --enable-locking to override that, so I can debug Linux locking + # under macOS X11. + enable_locking=no + else + enable_locking=yes + fi ;; +esac +fi + +if test "$enable_locking" = yes; then + true +elif test "$enable_locking" = no; then + printf "%s\n" "#define NO_LOCKING 1" >>confdefs.h + +else + echo "error: must be yes or no: --enable-locking=$enable_locking" + exit 1 +fi + +############################################################################## +# +# Whether to allow root password to unblank. +# +############################################################################### + +# Check whether --enable-root-passwd was given. +if test ${enable_root_passwd+y} +then : + enableval=$enable_root_passwd; # This is documented elsewhere because of --enable/--with option sorting. + enable_root_passwd="$enableval" +else case e in #( + e) enable_root_passwd=no ;; +esac +fi + +if test "$enable_root_passwd" = yes; then + printf "%s\n" "#define ALLOW_ROOT_PASSWD 1" >>confdefs.h + + true +elif test "$enable_root_passwd" != no; then + echo "error: must be yes or no: --enable-root-passwd=$enable_root_passwd" + exit 1 +fi + +############################################################################### +# # Check for PAM. # ############################################################################### @@ -10587,29 +13509,35 @@ have_pam=no with_pam_req=unspecified # Check whether --with-pam was given. -if test "${with_pam+set}" = set; then : +if test ${with_pam+y} +then : withval=$with_pam; with_pam="$withval"; with_pam_req="$withval" -else - with_pam=$with_pam_default +else case e in #( + e) with_pam=$with_pam_default ;; +esac fi # Check whether --with-pam_service_name was given. -if test "${with_pam_service_name+set}" = set; then : +if test ${with_pam_service_name+y} +then : withval=$with_pam_service_name; pam_service_name="$withval" -else - pam_service_name="xscreensaver" +else case e in #( + e) pam_service_name="xscreensaver" ;; +esac fi # Check whether --enable-pam-check-account-type was given. -if test "${enable_pam_check_account_type+set}" = set; then : +if test ${enable_pam_check_account_type+y} +then : enableval=$enable_pam_check_account_type; # This is documented elsewhere because of --enable/--with option sorting. enable_pam_check_account_type="$enableval" -else - enable_pam_check_account_type=no +else case e in #( + e) enable_pam_check_account_type=no ;; +esac fi if test "$enable_pam_check_account_type" = yes ; then - $as_echo "#define PAM_CHECK_ACCOUNT_TYPE 1" >>confdefs.h + printf "%s\n" "#define PAM_CHECK_ACCOUNT_TYPE 1" >>confdefs.h true elif test "$enable_pam_check_account_type" != no ; then @@ -10622,28 +13550,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PAM headers" >&5 -$as_echo_n "checking for PAM headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PAM headers" >&5 +printf %s "checking for PAM headers... " >&6; } d=$with_pam/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PAM libs" >&5 -$as_echo_n "checking for PAM libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PAM libs" >&5 +printf %s "checking for PAM libs... " >&6; } d=$with_pam/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -10661,12 +13589,13 @@ $as_echo "not found ($d: no such directory)" >&6; } esac if test "$enable_locking" = yes -a "$with_pam" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PAM" >&5 -$as_echo_n "checking for PAM... " >&6; } -if ${ac_cv_pam+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PAM" >&5 +printf %s "checking for PAM... " >&6; } +if test ${ac_cv_pam+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -10677,171 +13606,197 @@ else /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_pam=yes -else - ac_cv_pam=no +else case e in #( + e) ac_cv_pam=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pam" >&5 -$as_echo "$ac_cv_pam" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pam" >&5 +printf "%s\n" "$ac_cv_pam" >&6; } if test "$ac_cv_pam" = yes ; then have_pam=yes - $as_echo "#define HAVE_PAM 1" >>confdefs.h + printf "%s\n" "#define HAVE_PAM 1" >>confdefs.h - cat >>confdefs.h <<_ACEOF -#define PAM_SERVICE_NAME "$pam_service_name" -_ACEOF + printf "%s\n" "#define PAM_SERVICE_NAME \"$pam_service_name\"" >>confdefs.h PASSWD_LIBS="${PASSWD_LIBS} -lpam" # libpam typically requires dlopen and dlsym. On FreeBSD, # those are in libc. On Linux and Solaris, they're in libdl. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char dlopen (void); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no +else case e in #( + e) ac_cv_lib_dl_dlopen=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : PASSWD_LIBS="${PASSWD_LIBS} -ldl" fi # On Linux, sigtimedwait() is in libc; on Solaris, it's in librt. have_timedwait=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigtimedwait in -lc" >&5 -$as_echo_n "checking for sigtimedwait in -lc... " >&6; } -if ${ac_cv_lib_c_sigtimedwait+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sigtimedwait in -lc" >&5 +printf %s "checking for sigtimedwait in -lc... " >&6; } +if test ${ac_cv_lib_c_sigtimedwait+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char sigtimedwait (); +char sigtimedwait (void); int -main () +main (void) { return sigtimedwait (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_sigtimedwait=yes -else - ac_cv_lib_c_sigtimedwait=no +else case e in #( + e) ac_cv_lib_c_sigtimedwait=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sigtimedwait" >&5 -$as_echo "$ac_cv_lib_c_sigtimedwait" >&6; } -if test "x$ac_cv_lib_c_sigtimedwait" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sigtimedwait" >&5 +printf "%s\n" "$ac_cv_lib_c_sigtimedwait" >&6; } +if test "x$ac_cv_lib_c_sigtimedwait" = xyes +then : have_timedwait=yes - $as_echo "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h fi if test "$have_timedwait" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigtimedwait in -lrt" >&5 -$as_echo_n "checking for sigtimedwait in -lrt... " >&6; } -if ${ac_cv_lib_rt_sigtimedwait+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sigtimedwait in -lrt" >&5 +printf %s "checking for sigtimedwait in -lrt... " >&6; } +if test ${ac_cv_lib_rt_sigtimedwait+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char sigtimedwait (); +char sigtimedwait (void); int -main () +main (void) { return sigtimedwait (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_rt_sigtimedwait=yes -else - ac_cv_lib_rt_sigtimedwait=no +else case e in #( + e) ac_cv_lib_rt_sigtimedwait=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sigtimedwait" >&5 -$as_echo "$ac_cv_lib_rt_sigtimedwait" >&6; } -if test "x$ac_cv_lib_rt_sigtimedwait" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sigtimedwait" >&5 +printf "%s\n" "$ac_cv_lib_rt_sigtimedwait" >&6; } +if test "x$ac_cv_lib_rt_sigtimedwait" = xyes +then : have_timedwait=yes - $as_echo "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h PASSWD_LIBS="${PASSWD_LIBS} -lrt" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to call pam_strerror" >&5 -$as_echo_n "checking how to call pam_strerror... " >&6; } - if ${ac_cv_pam_strerror_args+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to call pam_strerror" >&5 +printf %s "checking how to call pam_strerror... " >&6; } + if test ${ac_cv_pam_strerror_args+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -10854,18 +13809,19 @@ else #include #include int -main () +main (void) { pam_handle_t *pamh = 0; - char *s = pam_strerror(pamh, PAM_SUCCESS); + const char *s = pam_strerror(pamh, PAM_SUCCESS); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_pam_strerror_args=2 -else - +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -10878,54 +13834,59 @@ else #include #include int -main () +main (void) { -char *s = +const char *s = pam_strerror(PAM_SUCCESS); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_pam_strerror_args=1 -else - ac_pam_strerror_args=0 +else case e in #( + e) ac_pam_strerror_args=0 ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="$ac_save_CPPFLAGS" - ac_cv_pam_strerror_args=$ac_pam_strerror_args + ac_cv_pam_strerror_args=$ac_pam_strerror_args ;; +esac fi ac_pam_strerror_args=$ac_cv_pam_strerror_args if test "$ac_pam_strerror_args" = 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: one argument" >&5 -$as_echo "one argument" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: one argument" >&5 +printf "%s\n" "one argument" >&6; } elif test "$ac_pam_strerror_args" = 2 ; then - $as_echo "#define PAM_STRERROR_TWO_ARGS 1" >>confdefs.h + printf "%s\n" "#define PAM_STRERROR_TWO_ARGS 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: two arguments" >&5 -$as_echo "two arguments" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: two arguments" >&5 +printf "%s\n" "two arguments" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 +printf "%s\n" "unknown" >&6; } fi # Check pam_fail_delay - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pam_fail_delay in -lpam" >&5 -$as_echo_n "checking pam_fail_delay in -lpam... " >&6; } - if ${ac_cv_pam_fail_delay+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_LDFLAGS="$LDFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pam_fail_delay in -lpam" >&5 +printf %s "checking pam_fail_delay in -lpam... " >&6; } + if test ${ac_cv_pam_fail_delay+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="-lpam" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { pam_handle_t *pamh = 0; unsigned int usec = 1; @@ -10934,25 +13895,28 @@ pam_handle_t *pamh = 0; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_pam_fail_delay=yes -else - ac_pam_fail_delay=no +else case e in #( + e) ac_pam_fail_delay=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_cv_pam_fail_delay=$ac_pam_fail_delay, - LDFLAGS=$ac_save_LDFLAGS + LDFLAGS=$ac_save_LDFLAGS ;; +esac fi if test "$ac_pam_fail_delay" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PAM_FAIL_DELAY 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_PAM_FAIL_DELAY 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -10969,10 +13933,12 @@ have_kerberos5=no with_kerberos_req=unspecified # Check whether --with-kerberos was given. -if test "${with_kerberos+set}" = set; then : +if test ${with_kerberos+y} +then : withval=$with_kerberos; with_kerberos="$withval"; with_kerberos_req="$withval" -else - with_kerberos=yes +else case e in #( + e) with_kerberos=yes ;; +esac fi case "$with_kerberos" in @@ -10980,28 +13946,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos headers" >&5 -$as_echo_n "checking for Kerberos headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos headers" >&5 +printf %s "checking for Kerberos headers... " >&6; } d=$with_kerberos/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos libs" >&5 -$as_echo_n "checking for Kerberos libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos libs" >&5 +printf %s "checking for Kerberos libs... " >&6; } d=$with_kerberos/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -11019,12 +13985,13 @@ $as_echo "not found ($d: no such directory)" >&6; } esac if test "$enable_locking" = yes -a "$with_kerberos" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 4" >&5 -$as_echo_n "checking for Kerberos 4... " >&6; } -if ${ac_cv_kerberos+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos 4" >&5 +printf %s "checking for Kerberos 4... " >&6; } +if test ${ac_cv_kerberos+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11035,29 +14002,33 @@ else /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_kerberos=yes -else - ac_cv_kerberos=no +else case e in #( + e) ac_cv_kerberos=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kerberos" >&5 -$as_echo "$ac_cv_kerberos" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 5" >&5 -$as_echo_n "checking for Kerberos 5... " >&6; } -if ${ac_cv_kerberos5+:} false; then : - $as_echo_n "(cached) " >&6 -else - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kerberos" >&5 +printf "%s\n" "$ac_cv_kerberos" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos 5" >&5 +printf %s "checking for Kerberos 5... " >&6; } +if test ${ac_cv_kerberos5+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11068,27 +14039,30 @@ else /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_kerberos5=yes -else - ac_cv_kerberos5=no +else case e in #( + e) ac_cv_kerberos5=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kerberos5" >&5 -$as_echo "$ac_cv_kerberos5" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kerberos5" >&5 +printf "%s\n" "$ac_cv_kerberos5" >&6; } if test "$ac_cv_kerberos" = yes ; then have_kerberos=yes - $as_echo "#define HAVE_KERBEROS 1" >>confdefs.h + printf "%s\n" "#define HAVE_KERBEROS 1" >>confdefs.h fi @@ -11123,46 +14097,55 @@ $as_echo "$ac_cv_kerberos5" >&6; } CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_tf_realm in -lkrb4" >&5 -$as_echo_n "checking for krb_get_tf_realm in -lkrb4... " >&6; } -if ${ac_cv_lib_krb4_krb_get_tf_realm+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb_get_tf_realm in -lkrb4" >&5 +printf %s "checking for krb_get_tf_realm in -lkrb4... " >&6; } +if test ${ac_cv_lib_krb4_krb_get_tf_realm+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lkrb4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char krb_get_tf_realm (); +char krb_get_tf_realm (void); int -main () +main (void) { return krb_get_tf_realm (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_krb4_krb_get_tf_realm=yes -else - ac_cv_lib_krb4_krb_get_tf_realm=no +else case e in #( + e) ac_cv_lib_krb4_krb_get_tf_realm=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_tf_realm" >&5 -$as_echo "$ac_cv_lib_krb4_krb_get_tf_realm" >&6; } -if test "x$ac_cv_lib_krb4_krb_get_tf_realm" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_tf_realm" >&5 +printf "%s\n" "$ac_cv_lib_krb4_krb_get_tf_realm" >&6; } +if test "x$ac_cv_lib_krb4_krb_get_tf_realm" = xyes +then : have_kerberos=yes -else - have_kerberos=no +else case e in #( + e) have_kerberos=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -11171,14 +14154,14 @@ fi if test "$have_kerberos" = yes ; then have_kerberos5=yes - $as_echo "#define HAVE_KERBEROS 1" >>confdefs.h + printf "%s\n" "#define HAVE_KERBEROS 1" >>confdefs.h - $as_echo "#define HAVE_KERBEROS5 1" >>confdefs.h + printf "%s\n" "#define HAVE_KERBEROS5 1" >>confdefs.h else have_kerberos5=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&5 -$as_echo "$as_me: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&5 +printf "%s\n" "$as_me: WARNING: Cannot find compat lib (libkrb4) needed to use Kerberos 5" >&2;} fi fi @@ -11209,43 +14192,51 @@ $as_echo "$as_me: WARNING: Cannot find compat lib (libkrb4) needed to use Kerber CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } -if ${ac_cv_lib_crypt_crypt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +printf %s "checking for crypt in -lcrypt... " >&6; } +if test ${ac_cv_lib_crypt_crypt+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char crypt (); +char crypt (void); int -main () +main (void) { return crypt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_crypt_crypt=yes -else - ac_cv_lib_crypt_crypt=no +else case e in #( + e) ac_cv_lib_crypt_crypt=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes +then : PASSWD_LIBS="$PASSWD_LIBS -lcrypt" fi @@ -11260,53 +14251,64 @@ fi if test "$have_kerberos" = yes ; then ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search" -if test "x$ac_cv_func_res_search" = xyes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 -$as_echo_n "checking for res_search in -lresolv... " >&6; } -if ${ac_cv_lib_resolv_res_search+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +if test "x$ac_cv_func_res_search" = xyes +then : + +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5 +printf %s "checking for res_search in -lresolv... " >&6; } +if test ${ac_cv_lib_resolv_res_search+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char res_search (); +char res_search (void); int -main () +main (void) { return res_search (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_resolv_res_search=yes -else - ac_cv_lib_resolv_res_search=no +else case e in #( + e) ac_cv_lib_resolv_res_search=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 -$as_echo "$ac_cv_lib_resolv_res_search" >&6; } -if test "x$ac_cv_lib_resolv_res_search" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5 +printf "%s\n" "$ac_cv_lib_resolv_res_search" >&6; } +if test "x$ac_cv_lib_resolv_res_search" = xyes +then : PASSWD_LIBS="${PASSWD_LIBS} -lresolv" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find DNS resolver libraries needed for Kerberos" >&5 -$as_echo "$as_me: WARNING: Can't find DNS resolver libraries needed for Kerberos" >&2;} - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can't find DNS resolver libraries needed for Kerberos" >&5 +printf "%s\n" "$as_me: WARNING: Can't find DNS resolver libraries needed for Kerberos" >&2;} + ;; +esac fi - + ;; +esac fi fi @@ -11322,10 +14324,12 @@ have_shadow=no with_shadow_req=unspecified # Check whether --with-shadow was given. -if test "${with_shadow+set}" = set; then : +if test ${with_shadow+y} +then : withval=$with_shadow; with_shadow="$withval"; with_shadow_req="$withval" -else - with_shadow=yes +else case e in #( + e) with_shadow=yes ;; +esac fi case "$with_shadow" in @@ -11333,28 +14337,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shadow password headers" >&5 -$as_echo_n "checking for shadow password headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shadow password headers" >&5 +printf %s "checking for shadow password headers... " >&6; } d=$with_shadow/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shadow password libs" >&5 -$as_echo_n "checking for shadow password libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shadow password libs" >&5 +printf %s "checking for shadow password libs... " >&6; } d=$with_shadow/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -11383,12 +14387,13 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sun-style shadow passwords" >&5 -$as_echo_n "checking for Sun-style shadow passwords... " >&6; } -if ${ac_cv_sun_adjunct+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Sun-style shadow passwords" >&5 +printf %s "checking for Sun-style shadow passwords... " >&6; } +if test ${ac_cv_sun_adjunct+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11404,7 +14409,7 @@ else #include #include int -main () +main (void) { struct passwd_adjunct *p = getpwanam("nobody"); const char *pw = p->pwa_passwd; @@ -11412,16 +14417,19 @@ struct passwd_adjunct *p = getpwanam("nobody"); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sun_adjunct=yes -else - ac_cv_sun_adjunct=no +else case e in #( + e) ac_cv_sun_adjunct=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sun_adjunct" >&5 -$as_echo "$ac_cv_sun_adjunct" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sun_adjunct" >&5 +printf "%s\n" "$ac_cv_sun_adjunct" >&6; } if test "$ac_cv_sun_adjunct" = yes; then have_shadow_adjunct=yes have_shadow=yes @@ -11436,12 +14444,13 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEC-style shadow passwords" >&5 -$as_echo_n "checking for DEC-style shadow passwords... " >&6; } -if ${ac_cv_enhanced_passwd+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DEC-style shadow passwords" >&5 +printf %s "checking for DEC-style shadow passwords... " >&6; } +if test ${ac_cv_enhanced_passwd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11457,7 +14466,7 @@ else #include #include int -main () +main (void) { struct pr_passwd *p; const char *pw; @@ -11469,16 +14478,19 @@ struct pr_passwd *p; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_enhanced_passwd=yes -else - ac_cv_enhanced_passwd=no +else case e in #( + e) ac_cv_enhanced_passwd=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enhanced_passwd" >&5 -$as_echo "$ac_cv_enhanced_passwd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enhanced_passwd" >&5 +printf "%s\n" "$ac_cv_enhanced_passwd" >&6; } if test $ac_cv_enhanced_passwd = yes; then have_shadow_enhanced=yes have_shadow=yes @@ -11488,85 +14500,102 @@ $as_echo "$ac_cv_enhanced_passwd" >&6; } # (I'm told it needs -lcurses too, but I don't understand why.) # But on DEC, it's in -lsecurity. # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lprot" >&5 -$as_echo_n "checking for getprpwnam in -lprot... " >&6; } -if ${ac_cv_lib_prot_getprpwnam+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lprot" >&5 +printf %s "checking for getprpwnam in -lprot... " >&6; } +if test ${ac_cv_lib_prot_getprpwnam+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lprot -lx $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char getprpwnam (); +char getprpwnam (void); int -main () +main (void) { return getprpwnam (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_prot_getprpwnam=yes -else - ac_cv_lib_prot_getprpwnam=no +else case e in #( + e) ac_cv_lib_prot_getprpwnam=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_prot_getprpwnam" >&5 -$as_echo "$ac_cv_lib_prot_getprpwnam" >&6; } -if test "x$ac_cv_lib_prot_getprpwnam" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_prot_getprpwnam" >&5 +printf "%s\n" "$ac_cv_lib_prot_getprpwnam" >&6; } +if test "x$ac_cv_lib_prot_getprpwnam" = xyes +then : PASSWD_LIBS="$PASSWD_LIBS -lprot -lcurses -lx" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsecurity" >&5 -$as_echo_n "checking for getprpwnam in -lsecurity... " >&6; } -if ${ac_cv_lib_security_getprpwnam+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsecurity" >&5 +printf %s "checking for getprpwnam in -lsecurity... " >&6; } +if test ${ac_cv_lib_security_getprpwnam+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsecurity $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char getprpwnam (); +char getprpwnam (void); int -main () +main (void) { return getprpwnam (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_security_getprpwnam=yes -else - ac_cv_lib_security_getprpwnam=no +else case e in #( + e) ac_cv_lib_security_getprpwnam=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5 -$as_echo "$ac_cv_lib_security_getprpwnam" >&6; } -if test "x$ac_cv_lib_security_getprpwnam" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5 +printf "%s\n" "$ac_cv_lib_security_getprpwnam" >&6; } +if test "x$ac_cv_lib_security_getprpwnam" = xyes +then : PASSWD_LIBS="$PASSWD_LIBS -lsecurity" fi - + ;; +esac fi fi @@ -11579,12 +14608,13 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HP-style shadow passwords" >&5 -$as_echo_n "checking for HP-style shadow passwords... " >&6; } -if ${ac_cv_hpux_passwd+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HP-style shadow passwords" >&5 +printf %s "checking for HP-style shadow passwords... " >&6; } +if test ${ac_cv_hpux_passwd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11600,7 +14630,7 @@ else #include #include int -main () +main (void) { struct s_passwd *p = getspwnam("nobody"); const char *pw = p->pw_passwd; @@ -11608,59 +14638,70 @@ struct s_passwd *p = getspwnam("nobody"); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_hpux_passwd=yes -else - ac_cv_hpux_passwd=no +else case e in #( + e) ac_cv_hpux_passwd=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hpux_passwd" >&5 -$as_echo "$ac_cv_hpux_passwd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hpux_passwd" >&5 +printf "%s\n" "$ac_cv_hpux_passwd" >&6; } if test "$ac_cv_hpux_passwd" = yes; then have_shadow_hpux=yes have_shadow=yes setuid_auth=yes # on HPUX, bigcrypt is in -lsec - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsec" >&5 -$as_echo_n "checking for bigcrypt in -lsec... " >&6; } -if ${ac_cv_lib_sec_bigcrypt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsec" >&5 +printf %s "checking for bigcrypt in -lsec... " >&6; } +if test ${ac_cv_lib_sec_bigcrypt+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsec $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char bigcrypt (); +char bigcrypt (void); int -main () +main (void) { return bigcrypt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_sec_bigcrypt=yes -else - ac_cv_lib_sec_bigcrypt=no +else case e in #( + e) ac_cv_lib_sec_bigcrypt=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_bigcrypt" >&5 -$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; } -if test "x$ac_cv_lib_sec_bigcrypt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_bigcrypt" >&5 +printf "%s\n" "$ac_cv_lib_sec_bigcrypt" >&6; } +if test "x$ac_cv_lib_sec_bigcrypt" = xyes +then : PASSWD_LIBS="$PASSWD_LIBS -lsec" fi @@ -11680,19 +14721,21 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD-style shadow passwords" >&5 -$as_echo_n "checking for FreeBSD-style shadow passwords... " >&6; } -if ${ac_cv_master_passwd+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -f /etc/master.passwd ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeBSD-style shadow passwords" >&5 +printf %s "checking for FreeBSD-style shadow passwords... " >&6; } +if test ${ac_cv_master_passwd+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -f /etc/master.passwd ; then ac_cv_master_passwd=yes else ac_cv_master_passwd=no - fi + fi ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_master_passwd" >&5 -$as_echo "$ac_cv_master_passwd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_master_passwd" >&5 +printf "%s\n" "$ac_cv_master_passwd" >&6; } if test "$ac_cv_master_passwd" = yes; then setuid_auth=yes fi @@ -11706,12 +14749,13 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenBSD-style shadow passwords" >&5 -$as_echo_n "checking for OpenBSD-style shadow passwords... " >&6; } -if ${ac_cv_pwnam_shadow+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenBSD-style shadow passwords" >&5 +printf %s "checking for OpenBSD-style shadow passwords... " >&6; } +if test ${ac_cv_pwnam_shadow+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11725,7 +14769,7 @@ else #include #include int -main () +main (void) { struct spwd *p = getspnam_shadow("nobody"); const char *pw = p->pw_passwd; @@ -11733,16 +14777,19 @@ struct spwd *p = getspnam_shadow("nobody"); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_pwnam_shadow=yes -else - ac_cv_pwnam_shadow=no +else case e in #( + e) ac_cv_pwnam_shadow=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwnam_shadow" >&5 -$as_echo "$ac_cv_pwnam_shadow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwnam_shadow" >&5 +printf "%s\n" "$ac_cv_pwnam_shadow" >&6; } if test "$ac_cv_pwnam_shadow" = yes; then have_pwnam_shadow=yes @@ -11760,12 +14807,13 @@ fi ############################################################################### if test "$with_shadow" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic shadow passwords" >&5 -$as_echo_n "checking for generic shadow passwords... " >&6; } -if ${ac_cv_shadow+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for generic shadow passwords" >&5 +printf %s "checking for generic shadow passwords... " >&6; } +if test ${ac_cv_shadow+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -11780,7 +14828,7 @@ else #include #include int -main () +main (void) { struct spwd *p = getspnam("nobody"); const char *pw = p->sp_pwdp; @@ -11788,16 +14836,19 @@ struct spwd *p = getspnam("nobody"); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_shadow=yes -else - ac_cv_shadow=no +else case e in #( + e) ac_cv_shadow=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_shadow" >&5 -$as_echo "$ac_cv_shadow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_shadow" >&5 +printf "%s\n" "$ac_cv_shadow" >&6; } if test "$ac_cv_shadow" = yes; then have_shadow=yes @@ -11808,84 +14859,100 @@ $as_echo "$ac_cv_shadow" >&6; } # On some systems (UnixWare 2.1), getspnam() is in -lgen instead of -lc. have_getspnam=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lc" >&5 -$as_echo_n "checking for getspnam in -lc... " >&6; } -if ${ac_cv_lib_c_getspnam+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lc" >&5 +printf %s "checking for getspnam in -lc... " >&6; } +if test ${ac_cv_lib_c_getspnam+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char getspnam (); +char getspnam (void); int -main () +main (void) { return getspnam (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_getspnam=yes -else - ac_cv_lib_c_getspnam=no +else case e in #( + e) ac_cv_lib_c_getspnam=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getspnam" >&5 -$as_echo "$ac_cv_lib_c_getspnam" >&6; } -if test "x$ac_cv_lib_c_getspnam" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getspnam" >&5 +printf "%s\n" "$ac_cv_lib_c_getspnam" >&6; } +if test "x$ac_cv_lib_c_getspnam" = xyes +then : have_getspnam=yes fi if test "$have_getspnam" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5 -$as_echo_n "checking for getspnam in -lgen... " >&6; } -if ${ac_cv_lib_gen_getspnam+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5 +printf %s "checking for getspnam in -lgen... " >&6; } +if test ${ac_cv_lib_gen_getspnam+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char getspnam (); +char getspnam (void); int -main () +main (void) { return getspnam (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_gen_getspnam=yes -else - ac_cv_lib_gen_getspnam=no +else case e in #( + e) ac_cv_lib_gen_getspnam=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5 -$as_echo "$ac_cv_lib_gen_getspnam" >&6; } -if test "x$ac_cv_lib_gen_getspnam" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5 +printf "%s\n" "$ac_cv_lib_gen_getspnam" >&6; } +if test "x$ac_cv_lib_gen_getspnam" = xyes +then : have_getspnam=yes; PASSWD_LIBS="$PASSWD_LIBS -lgen" fi @@ -11903,129 +14970,106 @@ if test "$enable_locking" = yes ; then # On some systems (UnixWare 2.1), crypt() is in -lcrypt instead of -lc. have_crypt=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lc" >&5 -$as_echo_n "checking for crypt in -lc... " >&6; } -if ${ac_cv_lib_c_crypt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lc" >&5 +printf %s "checking for crypt in -lc... " >&6; } +if test ${ac_cv_lib_c_crypt+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char crypt (); +char crypt (void); int -main () +main (void) { return crypt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_crypt=yes -else - ac_cv_lib_c_crypt=no +else case e in #( + e) ac_cv_lib_c_crypt=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_crypt" >&5 -$as_echo "$ac_cv_lib_c_crypt" >&6; } -if test "x$ac_cv_lib_c_crypt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_crypt" >&5 +printf "%s\n" "$ac_cv_lib_c_crypt" >&6; } +if test "x$ac_cv_lib_c_crypt" = xyes +then : have_crypt=yes fi if test "$have_crypt" = no ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } -if ${ac_cv_lib_crypt_crypt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +printf %s "checking for crypt in -lcrypt... " >&6; } +if test ${ac_cv_lib_crypt_crypt+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char crypt (); +char crypt (void); int -main () +main (void) { return crypt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_crypt_crypt=yes -else - ac_cv_lib_crypt_crypt=no +else case e in #( + e) ac_cv_lib_crypt_crypt=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes +then : have_crypt=yes; PASSWD_LIBS="$PASSWD_LIBS -lcrypt" fi fi fi -############################################################################### -# -# Strongly suspect that this hasn't been used in years. Also, the same -# goal is achieved by xscreensaver-auth in XScreenSaver 6. -- jwz, 2021 -# -# Check for external password helper -# On SuSE in 1993, instead of having xscreensaver be a setuid program, -# they fork an external program that takes the password on stdin, and -# returns true if that password is a valid one. Then only that smaller -# program needs to be setuid. -# -# (Note that this external program is not a GUI: the GUI is still -# all in xscreensaver itself; the external program just does auth.) -# -############################################################################### - -#have_passwd_helper=no -#with_passwd_helper_req=unspecified -# -#AC_ARG_WITH(passwd-helper, -#[ --with-passwd-helper Include support for external password verification.], -# [with_passwd_helper="$withval"; with_passwd_helper_req="$withval"],[with_passwd_helper=no]) -## no HANDLE_X_PATH_ARG for this one -# -#if test "$enable_locking" = no ; then -# with_passwd_helper_req=no -# with_passwd_helper=no -#fi -# -#case "$with_passwd_helper" in -# ""|no) : ;; -# /*) -# AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper") -# have_passwd_helper=yes;; -# *) -# echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2 -# exit 1 -#esac - # Most of the above shadow mechanisms will have set setuid_auth to yes, # if they were found. But, on some systems, we need setuid even when # using plain old vanilla passwords. @@ -12039,19 +15083,19 @@ if test "$enable_locking" = yes -a "$have_pam" = no ; then fi if test "$have_shadow_adjunct" = yes ; then - $as_echo "#define HAVE_ADJUNCT_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_ADJUNCT_PASSWD 1" >>confdefs.h elif test "$have_shadow_enhanced" = yes ; then - $as_echo "#define HAVE_ENHANCED_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_ENHANCED_PASSWD 1" >>confdefs.h elif test "$have_shadow_hpux" = yes ; then - $as_echo "#define HAVE_HPUX_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_HPUX_PASSWD 1" >>confdefs.h elif test "$have_shadow" = yes ; then - $as_echo "#define HAVE_SHADOW_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_SHADOW_PASSWD 1" >>confdefs.h elif test "$have_pwnam_shadow" = yes ; then - $as_echo "#define HAVE_PWNAM_SHADOW_PASSWD 1" >>confdefs.h + printf "%s\n" "#define HAVE_PWNAM_SHADOW_PASSWD 1" >>confdefs.h fi @@ -12067,10 +15111,12 @@ have_gtk=no with_gtk_req=unspecified # Check whether --with-gtk was given. -if test "${with_gtk+set}" = set; then : +if test ${with_gtk+y} +then : withval=$with_gtk; with_gtk="$withval"; with_gtk_req="$withval" -else - with_gtk=yes +else case e in #( + e) with_gtk=yes ;; +esac fi # if --with-gtk=/directory/ was specified, remember that directory so that @@ -12089,28 +15135,28 @@ esac no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gtk headers" >&5 -$as_echo_n "checking for Gtk headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Gtk headers" >&5 +printf %s "checking for Gtk headers... " >&6; } d=$with_gtk/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gtk libs" >&5 -$as_echo_n "checking for Gtk libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Gtk libs" >&5 +printf %s "checking for Gtk libs... " >&6; } d=$with_gtk/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -12137,13 +15183,14 @@ gtk_halfassed=no if test "$with_gtk" = yes; then have_gtk=no + pkgs='' ok="yes" - pkg_check_version gtk+-2.0 2.22.0 ; ac_gtk_version_string="$vers" - pkg_check_version gmodule-2.0 2.0.0 - pkg_check_version libxml-2.0 2.4.6 - pkg_check_version gdk-pixbuf-2.0 2.0.0 - pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 + pkg_check_version gtk+-3.0 3.0.0 ; ac_gtk_version_string="$vers" + pkg_check_version gmodule-2.0 2.0.0 + pkg_check_version libxml-2.0 2.4.6 + pkg_check_version gdk-pixbuf-2.0 2.0.0 have_gtk="$ok" + gtk_pkgs="$pkgs" if test "$have_gtk" = no; then if test -n "$ac_gtk_version_string" ; then @@ -12153,24 +15200,28 @@ if test "$with_gtk" = yes; then fi if test "$have_gtk" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gtk includes" >&5 -$as_echo_n "checking for Gtk includes... " >&6; } -if ${ac_cv_gtk_config_cflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gtk_config_cflags" >&5 -$as_echo "$ac_cv_gtk_config_cflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gtk libs" >&5 -$as_echo_n "checking for Gtk libs... " >&6; } -if ${ac_cv_gtk_config_libs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_gtk_config_libs=`$pkg_config --libs $pkgs` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Gtk includes" >&5 +printf %s "checking for Gtk includes... " >&6; } +if test ${ac_cv_gtk_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gtk_config_cflags" >&5 +printf "%s\n" "$ac_cv_gtk_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Gtk libs" >&5 +printf %s "checking for Gtk libs... " >&6; } +if test ${ac_cv_gtk_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_gtk_config_libs=`$pkg_config --libs $pkgs` ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gtk_config_libs" >&5 -$as_echo "$ac_cv_gtk_config_libs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gtk_config_libs" >&5 +printf "%s\n" "$ac_cv_gtk_config_libs" >&6; } fi ac_gtk_config_cflags=$ac_cv_gtk_config_cflags @@ -12178,20 +15229,34 @@ $as_echo "$ac_cv_gtk_config_libs" >&6; } GTK_DATADIR="" if test "$have_gtk" = yes; then - GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` GTK_DATADIR="$GTK_DATADIR/share" fi if test "$have_gtk" = yes; then INCLUDES="$INCLUDES $ac_gtk_config_cflags" GTK_LIBS="$GTK_LIBS $ac_gtk_config_libs" - $as_echo "#define HAVE_GTK 1" >>confdefs.h + printf "%s\n" "#define HAVE_GTK 1" >>confdefs.h - $as_echo "#define HAVE_GTK2 1" >>confdefs.h + printf "%s\n" "#define HAVE_XML 1" >>confdefs.h - $as_echo "#define HAVE_XML 1" >>confdefs.h + fi + if test "$have_gtk" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Glib resource compiler" >&5 +printf %s "checking for Glib resource compiler... " >&6; } +if test ${ac_cv_glib_res+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_glib_res=`$pkg_config --variable=glib_compile_resources gio-2.0` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_glib_res" >&5 +printf "%s\n" "$ac_cv_glib_res" >&6; } + GLIB_COMPILE_RESOURCES="$ac_cv_glib_res" fi + fi # Check for the various Gnome help and URL loading programs. @@ -12202,38 +15267,44 @@ if test "$have_gtk" = yes; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_gnome_open_program+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$gnome_open_program"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_gnome_open_program+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$gnome_open_program"; then ac_cv_prog_gnome_open_program="$gnome_open_program" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_gnome_open_program="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi gnome_open_program=$ac_cv_prog_gnome_open_program if test -n "$gnome_open_program"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_open_program" >&5 -$as_echo "$gnome_open_program" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gnome_open_program" >&5 +printf "%s\n" "$gnome_open_program" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$gnome_open_program" && break @@ -12243,38 +15314,44 @@ done do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_gnome_url_show_program+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$gnome_url_show_program"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_gnome_url_show_program+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$gnome_url_show_program"; then ac_cv_prog_gnome_url_show_program="$gnome_url_show_program" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_gnome_url_show_program="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS -fi +fi ;; +esac fi gnome_url_show_program=$ac_cv_prog_gnome_url_show_program if test -n "$gnome_url_show_program"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_url_show_program" >&5 -$as_echo "$gnome_url_show_program" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gnome_url_show_program" >&5 +printf "%s\n" "$gnome_url_show_program" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$gnome_url_show_program" && break @@ -12292,10 +15369,12 @@ have_motif=no with_motif_req=unspecified # Check whether --with-motif was given. -if test "${with_motif+set}" = set; then : +if test ${with_motif+y} +then : withval=$with_motif; with_motif="$withval"; with_motif_req="$withval" -else - with_motif=no +else case e in #( + e) with_motif=no ;; +esac fi case "$with_motif" in @@ -12303,28 +15382,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif headers" >&5 -$as_echo_n "checking for Motif headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif headers" >&5 +printf %s "checking for Motif headers... " >&6; } d=$with_motif/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif libs" >&5 -$as_echo_n "checking for Motif libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Motif libs" >&5 +printf %s "checking for Motif libs... " >&6; } d=$with_motif/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -12359,9 +15438,10 @@ if test "$with_motif" = yes; then #include #include " -if test "x$ac_cv_header_Xm_Xm_h" = xyes; then : +if test "x$ac_cv_header_Xm_Xm_h" = xyes +then : have_motif=yes - $as_echo "#define HAVE_MOTIF 1" >>confdefs.h + printf "%s\n" "#define HAVE_MOTIF 1" >>confdefs.h MOTIF_LIBS="$MOTIF_LIBS -lXm" fi @@ -12381,8 +15461,9 @@ if test "$have_motif" = yes; then #include #include " -if test "x$ac_cv_header_Xm_ComboBox_h" = xyes; then : - $as_echo "#define HAVE_XMCOMBOBOX 1" >>confdefs.h +if test "x$ac_cv_header_Xm_ComboBox_h" = xyes +then : + printf "%s\n" "#define HAVE_XMCOMBOBOX 1" >>confdefs.h fi @@ -12397,12 +15478,13 @@ fi have_lesstif=no if test "$have_motif" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Motif is really LessTif" >&5 -$as_echo_n "checking whether Motif is really LessTif... " >&6; } -if ${ac_cv_have_lesstif+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Motif is really LessTif" >&5 +printf %s "checking whether Motif is really LessTif... " >&6; } +if test ${ac_cv_have_lesstif+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" @@ -12413,23 +15495,26 @@ else /* end confdefs.h. */ #include int -main () +main (void) { long vers = LesstifVersion; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_have_lesstif=yes -else - ac_cv_have_lesstif=no +else case e in #( + e) ac_cv_have_lesstif=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$ac_save_CPPFLAGS" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lesstif" >&5 -$as_echo "$ac_cv_have_lesstif" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lesstif" >&5 +printf "%s\n" "$ac_cv_have_lesstif" >&6; } have_lesstif=$ac_cv_have_lesstif fi @@ -12439,23 +15524,25 @@ lesstif_version_string=unknown if test "$have_lesstif" = yes ; then ltv=unknown echo unknown > conftest-lt - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LessTif version number" >&5 -$as_echo_n "checking LessTif version number... " >&6; } -if ${ac_cv_lesstif_version_string+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LessTif version number" >&5 +printf %s "checking LessTif version number... " >&6; } +if test ${ac_cv_lesstif_version_string+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) 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` - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : ac_cv_lesstif_version=unknown ac_cv_lesstif_version_string=unknown -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -12468,22 +15555,26 @@ else exit(0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ltv=`cat conftest-lt` ac_cv_lesstif_version=`echo $ltv | sed 's/ .*//'` ac_cv_lesstif_version_string=`echo $ltv | sed 's/.* //'` -else - ac_cv_lesstif_version=unknown - ac_cv_lesstif_version_string=unknown +else case e in #( + e) ac_cv_lesstif_version=unknown + ac_cv_lesstif_version_string=unknown ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lesstif_version_string" >&5 -$as_echo "$ac_cv_lesstif_version_string" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lesstif_version_string" >&5 +printf "%s\n" "$ac_cv_lesstif_version_string" >&6; } rm -rf conftest-lt lesstif_version=$ac_cv_lesstif_version lesstif_version_string=$ac_cv_lesstif_version_string @@ -12493,23 +15584,25 @@ fi if test "$have_motif" = yes ; then mtv=unknown echo unknown > conftest-mt - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Motif version number" >&5 -$as_echo_n "checking Motif version number... " >&6; } -if ${ac_cv_motif_version_string+:} false; then : - $as_echo_n "(cached) " >&6 -else - + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Motif version number" >&5 +printf %s "checking Motif version number... " >&6; } +if test ${ac_cv_motif_version_string+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) 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` - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : ac_cv_motif_version=unknown ac_cv_motif_version_string=unknown -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -12522,22 +15615,26 @@ else exit(0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : mtv=`cat conftest-mt` ac_cv_motif_version=`echo $mtv | sed 's/ .*//'` ac_cv_motif_version_string=`echo $mtv | sed 's/.* //'` -else - ac_cv_motif_version=unknown - ac_cv_motif_version_string=unknown +else case e in #( + e) ac_cv_motif_version=unknown + ac_cv_motif_version_string=unknown ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS" ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_motif_version_string" >&5 -$as_echo "$ac_cv_motif_version_string" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_motif_version_string" >&5 +printf "%s\n" "$ac_cv_motif_version_string" >&6; } rm -rf conftest-mt motif_version=$ac_cv_motif_version motif_version_string=$ac_cv_motif_version_string @@ -12576,46 +15673,55 @@ if test "$have_motif" = yes ; then CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpQueryExtension in -lXp" >&5 -$as_echo_n "checking for XpQueryExtension in -lXp... " >&6; } -if ${ac_cv_lib_Xp_XpQueryExtension+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpQueryExtension in -lXp" >&5 +printf %s "checking for XpQueryExtension in -lXp... " >&6; } +if test ${ac_cv_lib_Xp_XpQueryExtension+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lXp -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XpQueryExtension (); +char XpQueryExtension (void); int -main () +main (void) { return XpQueryExtension (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xp_XpQueryExtension=yes -else - ac_cv_lib_Xp_XpQueryExtension=no +else case e in #( + e) ac_cv_lib_Xp_XpQueryExtension=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xp_XpQueryExtension" >&6; } -if test "x$ac_cv_lib_Xp_XpQueryExtension" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpQueryExtension" >&5 +printf "%s\n" "$ac_cv_lib_Xp_XpQueryExtension" >&6; } +if test "x$ac_cv_lib_Xp_XpQueryExtension" = xyes +then : have_xp_ext=yes; MOTIF_LIBS="$MOTIF_LIBS -lXp" -else - true +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -12651,46 +15757,55 @@ if test "$have_motif" = yes ; then CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Xsetlocale in -lXintl" >&5 -$as_echo_n "checking for _Xsetlocale in -lXintl... " >&6; } -if ${ac_cv_lib_Xintl__Xsetlocale+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _Xsetlocale in -lXintl" >&5 +printf %s "checking for _Xsetlocale in -lXintl... " >&6; } +if test ${ac_cv_lib_Xintl__Xsetlocale+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lXintl -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char _Xsetlocale (); +char _Xsetlocale (void); int -main () +main (void) { return _Xsetlocale (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xintl__Xsetlocale=yes -else - ac_cv_lib_Xintl__Xsetlocale=no +else case e in #( + e) ac_cv_lib_Xintl__Xsetlocale=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xintl__Xsetlocale" >&5 -$as_echo "$ac_cv_lib_Xintl__Xsetlocale" >&6; } -if test "x$ac_cv_lib_Xintl__Xsetlocale" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xintl__Xsetlocale" >&5 +printf "%s\n" "$ac_cv_lib_Xintl__Xsetlocale" >&6; } +if test "x$ac_cv_lib_Xintl__Xsetlocale" = xyes +then : have_xintl=yes -else - have_xintl=no +else case e in #( + e) have_xintl=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -12716,10 +15831,12 @@ default_login_manager_3='lxdm -c USER_SWITCH' default_login_manager_4='dm-tool switch-to-greeter' # Check whether --with-login-manager was given. -if test "${with_login_manager+set}" = set; then : +if test ${with_login_manager+y} +then : withval=$with_login_manager; with_login_manager="$withval"; with_login_manager_req="$withval" -else - with_login_manager=yes +else case e in #( + e) with_login_manager=yes ;; +esac fi # no HANDLE_X_PATH_ARG for this one @@ -12744,12 +15861,13 @@ case "$with_login_manager_req" in unset ac_cv_path_login_manager_tmp # don't cache # Extract the first word of "$login_manager_tmp", so it can be a program name with args. set dummy $login_manager_tmp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_login_manager_tmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $login_manager_tmp in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_login_manager_tmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $login_manager_tmp in [\\/]* | ?:[\\/]*) ac_cv_path_login_manager_tmp="$login_manager_tmp" # Let the user override the test with a path. ;; @@ -12758,11 +15876,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_login_manager_tmp="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_login_manager_tmp="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12770,15 +15892,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi login_manager_tmp=$ac_cv_path_login_manager_tmp if test -n "$login_manager_tmp"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 -$as_echo "$login_manager_tmp" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 +printf "%s\n" "$login_manager_tmp" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test ! -z "$login_manager_tmp" ; then @@ -12791,12 +15914,13 @@ fi unset ac_cv_path_login_manager_tmp # don't cache # Extract the first word of "$login_manager_tmp", so it can be a program name with args. set dummy $login_manager_tmp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_login_manager_tmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $login_manager_tmp in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_login_manager_tmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $login_manager_tmp in [\\/]* | ?:[\\/]*) ac_cv_path_login_manager_tmp="$login_manager_tmp" # Let the user override the test with a path. ;; @@ -12805,11 +15929,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_login_manager_tmp="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_login_manager_tmp="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12817,15 +15945,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi login_manager_tmp=$ac_cv_path_login_manager_tmp if test -n "$login_manager_tmp"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 -$as_echo "$login_manager_tmp" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 +printf "%s\n" "$login_manager_tmp" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test ! -z "$login_manager_tmp" ; then @@ -12838,12 +15967,13 @@ fi unset ac_cv_path_login_manager_tmp # don't cache # Extract the first word of "$login_manager_tmp", so it can be a program name with args. set dummy $login_manager_tmp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_login_manager_tmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $login_manager_tmp in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_login_manager_tmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $login_manager_tmp in [\\/]* | ?:[\\/]*) ac_cv_path_login_manager_tmp="$login_manager_tmp" # Let the user override the test with a path. ;; @@ -12852,11 +15982,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_login_manager_tmp="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_login_manager_tmp="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12864,15 +15998,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi login_manager_tmp=$ac_cv_path_login_manager_tmp if test -n "$login_manager_tmp"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 -$as_echo "$login_manager_tmp" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 +printf "%s\n" "$login_manager_tmp" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test ! -z "$login_manager_tmp" ; then @@ -12885,12 +16020,13 @@ fi unset ac_cv_path_login_manager_tmp # don't cache # Extract the first word of "$login_manager_tmp", so it can be a program name with args. set dummy $login_manager_tmp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_login_manager_tmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $login_manager_tmp in +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_login_manager_tmp+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) case $login_manager_tmp in [\\/]* | ?:[\\/]*) ac_cv_path_login_manager_tmp="$login_manager_tmp" # Let the user override the test with a path. ;; @@ -12899,11 +16035,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_login_manager_tmp="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_login_manager_tmp="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12911,15 +16051,16 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi login_manager_tmp=$ac_cv_path_login_manager_tmp if test -n "$login_manager_tmp"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 -$as_echo "$login_manager_tmp" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $login_manager_tmp" >&5 +printf "%s\n" "$login_manager_tmp" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test ! -z "$login_manager_tmp" ; then @@ -12939,16 +16080,16 @@ ac_cv_login_manager_program="$with_login_manager" NEW_LOGIN_COMMAND_P='' NEW_LOGIN_COMMAND="$ac_cv_login_manager_program" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for login manager" >&5 -$as_echo_n "checking for login manager... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for login manager" >&5 +printf %s "checking for login manager... " >&6; } if test -z "$NEW_LOGIN_COMMAND" ; then NEW_LOGIN_COMMAND="$default_login_manager_1" NEW_LOGIN_COMMAND_P='! ' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEW_LOGIN_COMMAND (disabled)" >&5 -$as_echo "$NEW_LOGIN_COMMAND (disabled)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NEW_LOGIN_COMMAND (disabled)" >&5 +printf "%s\n" "$NEW_LOGIN_COMMAND (disabled)" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEW_LOGIN_COMMAND" >&5 -$as_echo "$NEW_LOGIN_COMMAND" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NEW_LOGIN_COMMAND" >&5 +printf "%s\n" "$NEW_LOGIN_COMMAND" >&6; } fi ############################################################################### @@ -12962,10 +16103,12 @@ have_imagedir=no with_imagedir_req=unspecified # Check whether --with-image-directory was given. -if test "${with_image_directory+set}" = set; then : +if test ${with_image_directory+y} +then : withval=$with_image_directory; with_imagedir="$withval"; with_imagedir_req="$withval" -else - with_imagedir=yes +else case e in #( + e) with_imagedir=yes ;; +esac fi # no HANDLE_X_PATH_ARG for this one @@ -12973,14 +16116,14 @@ fi case "$with_imagedir" in /*) # absolute path - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for image directory $with_imagedir" >&5 -$as_echo_n "checking for image directory $with_imagedir... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for image directory $with_imagedir" >&5 +printf %s "checking for image directory $with_imagedir... " >&6; } if test -d "$with_imagedir" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } with_imagedir="" fi ;; @@ -12998,23 +16141,23 @@ $as_echo "no" >&6; } "/Library/Desktop Pictures/" \ ; do if test -z "$with_imagedir"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for image directory $dd" >&5 -$as_echo_n "checking for image directory $dd... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for image directory $dd" >&5 +printf %s "checking for image directory $dd... " >&6; } if test -d "$dd"; then if ( ls "$dd" | grep -q ... ) >&- 2>&- ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } with_imagedir="$dd" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty" >&5 -$as_echo "empty" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: empty" >&5 +printf "%s\n" "empty" >&6; } if test -z "$fallback_imgdir"; then fallback_imgdir="$dd" fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi done @@ -13052,10 +16195,12 @@ have_textfile=no with_textfile_req=unspecified # Check whether --with-text-file was given. -if test "${with_text_file+set}" = set; then : +if test ${with_text_file+y} +then : withval=$with_text_file; with_textfile="$withval"; with_textfile_req="$withval" -else - with_textfile=yes +else case e in #( + e) with_textfile=yes ;; +esac fi # no HANDLE_X_PATH_ARG for this one @@ -13063,14 +16208,14 @@ fi case "$with_textfile" in /*) # absolute path - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for text file $with_textfile" >&5 -$as_echo_n "checking for text file $with_textfile... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for text file $with_textfile" >&5 +printf %s "checking for text file $with_textfile... " >&6; } if test -f "$with_textfile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } with_textfile="" fi ;; @@ -13088,16 +16233,16 @@ $as_echo "no" >&6; } "/usr/share/doc/debian/debian-manifesto" \ ; do if test -z "$with_textfile"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for text file $f" >&5 -$as_echo_n "checking for text file $f... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for text file $f" >&5 +printf %s "checking for text file $f... " >&6; } f=`/bin/ls $f 2>&- | head -1` if test -f "$f" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } with_textfile="$f" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi done @@ -13126,10 +16271,12 @@ have_browser=no with_browser_req=unspecified # Check whether --with-browser was given. -if test "${with_browser+set}" = set; then : +if test ${with_browser+y} +then : withval=$with_browser; with_browser="$withval"; with_browser_req="$withval" -else - with_browser=no +else case e in #( + e) with_browser=no ;; +esac fi # no HANDLE_X_PATH_ARG for this one @@ -13140,18 +16287,18 @@ case "$with_browser" in * ) WITH_BROWSER=$with_browser gnome_open_program=$with_browser - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for browser $with_browser" >&5 -$as_echo_n "checking for browser $with_browser... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for browser $with_browser" >&5 +printf %s "checking for browser $with_browser... " >&6; } with_browser_fullpath=`which $with_browser 2>/dev/null` case $with_browser_fullpath in /* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_browser=yes ;; * ) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } # Only warning: we don't want to install all packages for the # dependency of the browser in building stage... echo "WARNING: browser not found: --with-browser=$with_browser" @@ -13264,10 +16411,11 @@ with_pthread_req=unspecified #serial 30 -# This is what autoupdate's m4 run will expand. It fires -# the warning (with _au_warn_XXX), outputs it into the -# updated configure.ac (with AC_DIAGNOSE), and then outputs -# the replacement expansion. +# This is what autoupdate's m4 run will expand. It fires the warning +# (with _au_warn_XXX), outputs it into the updated configure.ac (with +# m4_warn), and then outputs the replacement expansion. We need extra +# quotation around the m4_warn and dnl so they will be written +# unexpanded into the updated configure.ac. # This is an auxiliary macro that is also run when # autoupdate runs m4. It simply calls m4_warning, but @@ -13276,36 +16424,41 @@ with_pthread_req=unspecified # order to expand this macro's arguments, not AU_DEFUN's. # Finally, this is the expansion that is picked up by -# autoconf. It tells the user to run autoupdate, and -# then outputs the replacement expansion. We do not care -# about autoupdate's warning because that contains -# information on what to do *after* running autoupdate. +# autoconf, causing NAME to expand to NEW-CODE, plus +# (if SILENT is not "silent") a m4_warning telling the +# maintainer to run autoupdate. We don't issue MESSAGE +# from autoconf, because that's instructions for what +# to do *after* running autoupdate. # Check whether --with-pthread was given. -if test "${with_pthread+set}" = set; then : +if test ${with_pthread+y} +then : withval=$with_pthread; # This is documented after --with-gl in --with-xft. with_pthread="$withval"; with_pthread_req="$withval" -else - with_pthread=yes +else case e in #( + e) with_pthread=yes ;; +esac fi if test "$with_pthread" = yes; then # AX_PTHREAD might want a different compiler. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +printf %s "checking target system type... " >&6; } +if test ${ac_cv_target+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5 fi - + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +printf "%s\n" "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; @@ -13329,74 +16482,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -rf conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -rf conftest.sed ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13417,986 +16502,1968 @@ if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then ax_pthread_save_CC="$CC" ax_pthread_save_CFLAGS="$CFLAGS" ax_pthread_save_LIBS="$LIBS" - if test "x$PTHREAD_CC" != "x"; then : + if test "x$PTHREAD_CC" != "x" +then : CC="$PTHREAD_CC" fi - if test "x$PTHREAD_CXX" != "x"; then : + if test "x$PTHREAD_CXX" != "x" +then : CXX="$PTHREAD_CXX" fi CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5 -$as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5 +printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_join (void); +int +main (void) +{ +return pthread_join (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ax_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = "xno"; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + CC="$ax_pthread_save_CC" + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items with a "," contain both +# C compiler flags (before ",") and linker flags (after ","). Other items +# starting with a "-" are C compiler flags, and remaining items are +# library names, except for "none" which indicates that we try without +# any flags at all, and "pthread-config" which is a program returning +# the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 +# (Note: HP C rejects this with "bad form for `-t' option") +# -pthreads: Solaris/gcc (Note: HP C also rejects) +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads and +# -D_REENTRANT too), HP C (must be checked before -lpthread, which +# is present but should not be used directly; and before -mthreads, +# because the compiler interprets this as "-mt" + "-hreads") +# -mthreads: Mingw32/gcc, Lynx/gcc +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case $target_os in + + freebsd*) + + # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) + # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) + + ax_pthread_flags="-kthread lthread $ax_pthread_flags" + ;; + + hpux*) + + # From the cc(1) man page: "[-mt] Sets various -D flags to enable + # multi-threading and also sets -lpthread." + + ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" + ;; + + openedition*) + + # IBM z/OS requires a feature-test macro to be defined in order to + # enable POSIX threads at all, so give the user a hint if this is + # not set. (We don't define these ourselves, as they can affect + # other portions of the system API in unpredictable ways.) + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) + AX_PTHREAD_ZOS_MISSING +# endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP_TRADITIONAL "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 +printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} +fi +rm -rf conftest* + + ;; + + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (N.B.: The stubs are missing + # pthread_cleanup_push, or rather a function called by this macro, + # so we could check for that, but who knows whether they'll stub + # that too in a future libc.) So we'll check first for the + # standard Solaris way of linking pthreads (-mt -lpthread). + + ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags" + ;; +esac + +# Are we compiling with Clang? + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 +printf %s "checking whether $CC is Clang... " >&6; } +if test ${ax_cv_PTHREAD_CLANG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_CLANG=no + # Note that Autoconf sets GCC=yes for Clang as well as GCC + if test "x$GCC" = "xyes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +# if defined(__clang__) && defined(__llvm__) + AX_PTHREAD_CC_IS_CLANG +# endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP_TRADITIONAL "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 +then : + ax_cv_PTHREAD_CLANG=yes +fi +rm -rf conftest* + + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; } +ax_pthread_clang="$ax_cv_PTHREAD_CLANG" + +# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) + +# Note that for GCC and Clang -pthread generally implies -lpthread, +# except when -nostdlib is passed. +# This is problematic using libtool to build C++ shared libraries with pthread: +# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 +# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333 +# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 +# To solve this, first try -pthread together with -lpthread for GCC + +if test "x$GCC" = "xyes" +then : + ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags" +fi + +# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first + +if test "x$ax_pthread_clang" = "xyes" +then : + ax_pthread_flags="-pthread,-lpthread -pthread" +fi + +# The presence of a feature test macro requesting re-entrant function +# definitions is, on some systems, a strong hint that pthreads support is +# correctly enabled + +case $target_os in + darwin* | hpux* | linux* | osf* | solaris*) + ax_pthread_check_macro="_REENTRANT" + ;; + + aix*) + ax_pthread_check_macro="_THREAD_SAFE" + ;; + + *) + ax_pthread_check_macro="--" + ;; +esac +if test "x$ax_pthread_check_macro" = "x--" +then : + ax_pthread_check_cond=0 +else case e in #( + e) ax_pthread_check_cond="!defined($ax_pthread_check_macro)" ;; +esac +fi + +if test "x$ax_pthread_ok" = "xno"; then +for ax_pthread_try_flag in $ax_pthread_flags; do + + case $ax_pthread_try_flag in + none) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +printf %s "checking whether pthreads work without any flags... " >&6; } + ;; + + *,*) + PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` + PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5 +printf %s "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; } + ;; + + -*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5 +printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; } + PTHREAD_CFLAGS="$ax_pthread_try_flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ax_pthread_config+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$ax_pthread_config"; then + ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ax_pthread_config="yes" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" +fi ;; +esac +fi +ax_pthread_config=$ac_cv_prog_ax_pthread_config +if test -n "$ax_pthread_config"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +printf "%s\n" "$ax_pthread_config" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ax_pthread_config" = "xno" +then : + continue +fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5 +printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } + PTHREAD_LIBS="-l$ax_pthread_try_flag" + ;; + esac + + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +# if $ax_pthread_check_cond +# error "$ax_pthread_check_macro must be defined" +# endif + static void *some_global = NULL; + static void routine(void *a) + { + /* To avoid any unused-parameter or + unused-but-set-parameter warning. */ + some_global = a; + } + static void *start_routine(void *a) { return a; } +int +main (void) +{ +pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ax_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = "xyes" +then : + break +fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Clang needs special handling, because older versions handle the -pthread +# option in a rather... idiosyncratic way + +if test "x$ax_pthread_clang" = "xyes"; then + + # Clang takes -pthread; it has never supported any other flag + + # (Note 1: This will need to be revisited if a system that Clang + # supports has POSIX threads in a separate library. This tends not + # to be the way of modern systems, but it's conceivable.) + + # (Note 2: On some systems, notably Darwin, -pthread is not needed + # to get POSIX threads support; the API is always present and + # active. We could reasonably leave PTHREAD_CFLAGS empty. But + # -pthread does define _REENTRANT, and while the Darwin headers + # ignore this macro, third-party headers might not.) + + # However, older versions of Clang make a point of warning the user + # that, in an invocation where only linking and no compilation is + # taking place, the -pthread option has no effect ("argument unused + # during compilation"). They expect -pthread to be passed in only + # when source code is being compiled. + # + # Problem is, this is at odds with the way Automake and most other + # C build frameworks function, which is that the same flags used in + # compilation (CFLAGS) are also used in linking. Many systems + # supported by AX_PTHREAD require exactly this for POSIX threads + # support, and in fact it is often not straightforward to specify a + # flag that is used only in the compilation phase and not in + # linking. Such a scenario is extremely rare in practice. + # + # Even though use of the -pthread flag in linking would only print + # a warning, this can be a nuisance for well-run software projects + # that build with -Werror. So if the active version of Clang has + # this misfeature, we search for an option to squash it. + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 +printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } +if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown + # Create an alternate version of $ac_link that compiles and + # links in two steps (.c -> .o, .o -> exe) instead of one + # (.c -> exe), because the warning occurs only in the second + # step + ax_pthread_save_ac_link="$ac_link" + ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' + ax_pthread_link_step=`printf "%s\n" "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" + ax_pthread_save_CFLAGS="$CFLAGS" + for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do + if test "x$ax_pthread_try" = "xunknown" +then : + break +fi + CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" + ac_link="$ax_pthread_save_ac_link" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void){return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_link="$ax_pthread_2step_ac_link" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void){return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + done + ac_link="$ax_pthread_save_ac_link" + CFLAGS="$ax_pthread_save_CFLAGS" + if test "x$ax_pthread_try" = "x" +then : + ax_pthread_try=no +fi + ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } + + case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in + no | unknown) ;; + *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; + esac + +fi # $ax_pthread_clang = yes + +# Various other checks: +if test "x$ax_pthread_ok" = "xyes"; then + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +printf %s "checking for joinable pthread attribute... " >&6; } +if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_JOINABLE_ATTR=unknown + for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +int attr = $ax_pthread_attr; return attr /* ; */ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + done + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 +printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } + if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ + test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ + test "x$ax_pthread_joinable_attr_defined" != "xyes" +then : + +printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h + + ax_pthread_joinable_attr_defined=yes + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5 +printf %s "checking whether more special flags are required for pthreads... " >&6; } +if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_SPECIAL_FLAGS=no + case $target_os in + solaris*) + ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" + ;; + esac + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 +printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } + if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ + test "x$ax_pthread_special_flags_added" != "xyes" +then : + PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" + ax_pthread_special_flags_added=yes +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +int i = PTHREAD_PRIO_INHERIT; + return i; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ax_cv_PTHREAD_PRIO_INHERIT=yes +else case e in #( + e) ax_cv_PTHREAD_PRIO_INHERIT=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ + test "x$ax_pthread_prio_inherit_defined" != "xyes" +then : + +printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h + + ax_pthread_prio_inherit_defined=yes + +fi + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + # More AIX lossage: compile with *_r variant + if test "x$GCC" != "xyes"; then + case $target_os in + aix*) + case "x/$CC" in #( + x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) : + #handle absolute path differently from PATH based program lookup + case "x$CC" in #( + x/*) : + + if as_fn_executable_p ${CC}_r +then : + PTHREAD_CC="${CC}_r" +fi + if test "x${CXX}" != "x" +then : + if as_fn_executable_p ${CXX}_r +then : + PTHREAD_CXX="${CXX}_r" +fi +fi + ;; #( + *) : + + for ac_prog in ${CC}_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_PTHREAD_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +printf "%s\n" "$PTHREAD_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + test -n "$PTHREAD_CC" && break +done +test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + + if test "x${CXX}" != "x" +then : + for ac_prog in ${CXX}_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CXX+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -n "$PTHREAD_CXX"; then + ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_PTHREAD_CXX="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi ;; +esac +fi +PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX +if test -n "$PTHREAD_CXX"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5 +printf "%s\n" "$PTHREAD_CXX" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + test -n "$PTHREAD_CXX" && break +done +test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" + +fi + + ;; +esac + ;; #( + *) : + ;; +esac + ;; + esac + fi +fi + +test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" +test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test "x$ax_pthread_ok" = "xyes"; then + if test "$CC" = "$PTHREAD_CC" -o -z "$ac_original_cc"; then + have_pthread=yes + else + ac_prog_cc_no_pthread=yes + fi + + : +else + ax_pthread_ok=no + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$have_pthread" = yes; then + printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h + + CC="$PTHREAD_CC" + fi +fi + +############################################################################### +# +# Handle --with-gles +# Must come before --with-gl +# +############################################################################### + +with_jwzgles_req=unspecified +have_jwzgles=no + +# Check whether --with-gles was given. +if test ${with_gles+y} +then : + withval=$with_gles; # This is documented after --with-gl + with_jwzgles="$withval"; with_jwzgles_req="$withval" +else case e in #( + e) with_jwzgles=no ;; +esac +fi + + case "$with_jwzgles" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JWZGLES headers" >&5 +printf %s "checking for JWZGLES headers... " >&6; } + d=$with_jwzgles/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JWZGLES libs" >&5 +printf %s "checking for JWZGLES libs... " >&6; } + d=$with_jwzgles/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_jwzgles_req="yes" + with_jwzgles=$with_jwzgles_req + ;; + + *) + echo "" + echo "error: argument to --with-gles 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 + +if test "$with_jwzgles" = yes; then + have_jwzgles=yes + JWZGLES_OBJS='$(JWXYZ_BIN)/jwzgles.o' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: emulating OpenGL 1.3 in terms of OpenGLES 1.x." >&5 +printf "%s\n" "emulating OpenGL 1.3 in terms of OpenGLES 1.x." >&6; } +elif test "$with_jwzgles" != no; then + echo "error: must be yes or no: --with-gles=$with_jwzgles" + exit 1 +fi + +############################################################################### +# +# Check for -lGL or -lMesaGL. +# +############################################################################### + +#### H1 + +have_gl=no +ac_have_mesa_gl=no +with_gl_req=unspecified +gl_halfassed=no +have_glext=no + +# Check whether --with-gl was given. +if test ${with_gl+y} +then : + withval=$with_gl; with_gl="$withval"; with_gl_req="$withval" +else case e in #( + e) with_gl=yes ;; +esac +fi + + case "$with_gl" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GL headers" >&5 +printf %s "checking for GL headers... " >&6; } + d=$with_gl/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GL libs" >&5 +printf %s "checking for GL libs... " >&6; } + d=$with_gl/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_gl_req="yes" + with_gl=$with_gl_req + ;; + + *) + echo "" + echo "error: argument to --with-gl 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 + +# Some GL libraries require pthreads, so use the pthreads flags when +# testing them, then set them back after. +# +ac_save_pthreads_CFLAGS="$CFLAGS" +ac_save_pthreads_LIBS="$LIBS" +CFLAGS="$PTHREAD_CFLAGS $CFLAGS" +LIBS="$PTHREAD_LIBS $LIBS" + +if test "$with_gl" = yes; then + + 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_fn_c_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_gl_h" = xyes +then : + have_gl=yes +else case e in #( + e) have_gl=no ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS"; + if test "$have_gl" = yes; then + + 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_fn_c_check_header_compile "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" +if test "x$ac_cv_header_GL_glu_h" = xyes +then : + have_gl=yes +else case e in #( + e) have_gl=no ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS"; + fi +fi + +if test "$with_gl" = yes; then + # + # Since the OpenGL and GLES specifications are a complete dumpster fire, + # it's not easy to figure out how what libraries to use. + # + # OpenGLES library names: + # + # 1.x: libGLESv1_CM + # 2.x: libGLESv2 + # 3.x: libGLESv2 on Windows, libGLESv3 on Android + # + # On modern Linux systems, these libraries exist: + # + # libGL - a superset of everything up to and including OpenGL 4.6 + # libGLESv1_CM - OpenGLES 1.1, meaning it omits much of OpenGL 1.3 + # libGLESv2 - OpenGLES 2 and 3, meaning it omits even more of OpenGL 1.3 + # + # Since Linux systems support OpenGL 1.3, those link against only libGL. + # + # Unless we are using --with-gles on Linux, in which case we are attempting + # to simulate a system that does not natively support OpenGL 1.3. In that + # case, we use the v1 and/or v2 libraries instead. + # + # Common practice on Android seems to be to link against the v1, v2 and v3 + # libraries in order, and then do runtime checks to see which set of + # functions is actually supported by the runtime. Just because you linked + # against a GLES3 library doesn't mean that the hardware supports it: most + # of these functions are just syscall-like stubs. + # + # See the commentary atop jwxyz/jwzgles.c for discussion of OpenGL versions. + # + if test "$have_gl" = yes; then + have_gl=no + + if test "$have_jwzgles" = yes; then + + # Only check for the v1/2/3 libraries on Linux when using --with-gles + # to emulate a system that does not natively support OpenGL 1.3. + + # Check for GLES 3.x + + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv3" >&5 +printf %s "checking for glDrawElements in -lGLESv3... " >&6; } +if test ${ac_cv_lib_GLESv3_glDrawElements+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLESv3 $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char pthread_join (); +char glDrawElements (void); int -main () +main (void) { -return pthread_join (); +return glDrawElements (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_pthread_ok=yes +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_GLESv3_glDrawElements=yes +else case e in #( + e) ac_cv_lib_GLESv3_glDrawElements=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } - if test "x$ax_pthread_ok" = "xno"; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - CC="$ax_pthread_save_CC" - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv3_glDrawElements" >&5 +printf "%s\n" "$ac_cv_lib_GLESv3_glDrawElements" >&6; } +if test "x$ac_cv_lib_GLESv3_glDrawElements" = xyes +then : + have_gl=yes + gl_lib_1="GLESv3" + GL_LIBS="-lGLESv3 $GL_LIBS" fi -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items with a "," contain both -# C compiler flags (before ",") and linker flags (after ","). Other items -# starting with a "-" are C compiler flags, and remaining items are -# library names, except for "none" which indicates that we try without -# any flags at all, and "pthread-config" which is a program returning -# the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 -# (Note: HP C rejects this with "bad form for `-t' option") -# -pthreads: Solaris/gcc (Note: HP C also rejects) -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads and -# -D_REENTRANT too), HP C (must be checked before -lpthread, which -# is present but should not be used directly; and before -mthreads, -# because the compiler interprets this as "-mt" + "-hreads") -# -mthreads: Mingw32/gcc, Lynx/gcc -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case $target_os in - - freebsd*) - - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) - - ax_pthread_flags="-kthread lthread $ax_pthread_flags" - ;; - - hpux*) + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - # From the cc(1) man page: "[-mt] Sets various -D flags to enable - # multi-threading and also sets -lpthread." + # Check for GLES 2.x - ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" - ;; + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - openedition*) + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - # IBM z/OS requires a feature-test macro to be defined in order to - # enable POSIX threads at all, so give the user a hint if this is - # not set. (We don't define these ourselves, as they can affect - # other portions of the system API in unpredictable ways.) + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv2" >&5 +printf %s "checking for glDrawElements in -lGLESv2... " >&6; } +if test ${ac_cv_lib_GLESv2_glDrawElements+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLESv2 $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) - AX_PTHREAD_ZOS_MISSING -# endif - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glDrawElements (void); +int +main (void) +{ +return glDrawElements (); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 -$as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_GLESv2_glDrawElements=yes +else case e in #( + e) ac_cv_lib_GLESv2_glDrawElements=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glDrawElements" >&5 +printf "%s\n" "$ac_cv_lib_GLESv2_glDrawElements" >&6; } +if test "x$ac_cv_lib_GLESv2_glDrawElements" = xyes +then : + have_gl=yes + gl_lib_1="GLESv2" + GL_LIBS="-lGLESv2 $GL_LIBS" fi -rm -rf conftest* - ;; + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - solaris*) + # Check for GLES 1.x - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (N.B.: The stubs are missing - # pthread_cleanup_push, or rather a function called by this macro, - # so we could check for that, but who knows whether they'll stub - # that too in a future libc.) So we'll check first for the - # standard Solaris way of linking pthreads (-mt -lpthread). + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags" - ;; -esac + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" -# Are we compiling with Clang? + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 -$as_echo_n "checking whether $CC is Clang... " >&6; } -if ${ax_cv_PTHREAD_CLANG+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_PTHREAD_CLANG=no - # Note that Autoconf sets GCC=yes for Clang as well as GCC - if test "x$GCC" = "xyes"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv1_CM" >&5 +printf %s "checking for glDrawElements in -lGLESv1_CM... " >&6; } +if test ${ac_cv_lib_GLESv1_CM_glDrawElements+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLESv1_CM $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ -# if defined(__clang__) && defined(__llvm__) - AX_PTHREAD_CC_IS_CLANG -# endif +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glDrawElements (void); +int +main (void) +{ +return glDrawElements (); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then : - ax_cv_PTHREAD_CLANG=yes +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_GLESv1_CM_glDrawElements=yes +else case e in #( + e) ac_cv_lib_GLESv1_CM_glDrawElements=no ;; +esac fi -rm -rf conftest* - - fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv1_CM_glDrawElements" >&5 +printf "%s\n" "$ac_cv_lib_GLESv1_CM_glDrawElements" >&6; } +if test "x$ac_cv_lib_GLESv1_CM_glDrawElements" = xyes +then : + have_gl=yes + gl_lib_1="GLESv1_CM" + GL_LIBS="-lGLESv1_CM $GL_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 -$as_echo "$ax_cv_PTHREAD_CLANG" >&6; } -ax_pthread_clang="$ax_cv_PTHREAD_CLANG" - -# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) -# Note that for GCC and Clang -pthread generally implies -lpthread, -# except when -nostdlib is passed. -# This is problematic using libtool to build C++ shared libraries with pthread: -# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 -# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333 -# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 -# To solve this, first try -pthread together with -lpthread for GCC + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" -if test "x$GCC" = "xyes"; then : - ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags" -fi + else # $have_jwzgles = no -# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first + # Check for OpenGL 1.x and/or OpenGL 4.x -if test "x$ax_pthread_clang" = "xyes"; then : - ax_pthread_flags="-pthread,-lpthread -pthread" -fi + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" -# The presence of a feature test macro requesting re-entrant function -# definitions is, on some systems, a strong hint that pthreads support is -# correctly enabled + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" -case $target_os in - darwin* | hpux* | linux* | osf* | solaris*) - ax_pthread_check_macro="_REENTRANT" - ;; + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - aix*) - ax_pthread_check_macro="_THREAD_SAFE" - ;; + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lGL" >&5 +printf %s "checking for glEnable in -lGL... " >&6; } +if test ${ac_cv_lib_GL_glEnable+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - *) - ax_pthread_check_macro="--" - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glEnable (void); +int +main (void) +{ +return glEnable (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_GL_glEnable=yes +else case e in #( + e) ac_cv_lib_GL_glEnable=no ;; esac -if test "x$ax_pthread_check_macro" = "x--"; then : - ax_pthread_check_cond=0 -else - ax_pthread_check_cond="!defined($ax_pthread_check_macro)" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glEnable" >&5 +printf "%s\n" "$ac_cv_lib_GL_glEnable" >&6; } +if test "x$ac_cv_lib_GL_glEnable" = xyes +then : + have_gl=yes + gl_lib_1="GL" + GL_LIBS="-lGL $GL_LIBS" fi -if test "x$ax_pthread_ok" = "xno"; then -for ax_pthread_try_flag in $ax_pthread_flags; do + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - case $ax_pthread_try_flag in - none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } - ;; + # Check for MesaGL 1.x, but only if libGL doesn't exist. + if test "$have_gl" = no; then - *,*) - PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` - PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5 -$as_echo_n "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; } - ;; + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5 -$as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; } - PTHREAD_CFLAGS="$ax_pthread_try_flag" - ;; + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. -set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ax_pthread_config+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ax_pthread_config"; then - ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ax_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" fi -done - done -IFS=$as_save_IFS + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 +printf %s "checking for glEnable in -lMesaGL... " >&6; } +if test ${ac_cv_lib_MesaGL_glEnable+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lMesaGL $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glEnable (void); +int +main (void) +{ +return glEnable (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_MesaGL_glEnable=yes +else case e in #( + e) ac_cv_lib_MesaGL_glEnable=no ;; +esac fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -ax_pthread_config=$ac_cv_prog_ax_pthread_config -if test -n "$ax_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 -$as_echo "$ax_pthread_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 +printf "%s\n" "$ac_cv_lib_MesaGL_glEnable" >&6; } +if test "x$ac_cv_lib_MesaGL_glEnable" = xyes +then : + have_gl=yes + gl_lib_1="MesaGL" + GL_LIBS="-lMesaGL $GL_LIBS" fi - if test "x$ax_pthread_config" = "xno"; then : - continue -fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5 -$as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } - PTHREAD_LIBS="-l$ax_pthread_try_flag" - ;; - esac + fi + fi + fi - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" + # Figure out whether the GLU functions are in the main GL libraries or + # in -lGLU. Since Android does not have GLU, we don't link against libGLU + # when using --with-gles on Linux. + # + if test "$have_gl" = yes -a "$have_jwzgles" = no; then - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_gluBuild2DMipmaps" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBuild2DMipmaps in -l$gl_lib_1" >&5 +printf %s "checking for gluBuild2DMipmaps in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -# if $ax_pthread_check_cond -# error "$ax_pthread_check_macro must be defined" -# endif - static void *some_global = NULL; - static void routine(void *a) - { - /* To avoid any unused-parameter or - unused-but-set-parameter warning. */ - some_global = a; - } - static void *start_routine(void *a) { return a; } + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gluBuild2DMipmaps (void); int -main () +main (void) { -pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */ +return gluBuild2DMipmaps (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_pthread_ok=yes +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } - if test "x$ax_pthread_ok" = "xyes"; then : - break -fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done +LIBS=$ac_check_lib_save_LIBS ;; +esac fi +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + cat >>confdefs.h <<_ACEOF +#define `printf "%s\n" "HAVE_LIB$gl_lib_1" | sed "$as_sed_cpp"` 1 +_ACEOF -# Clang needs special handling, because older versions handle the -pthread -# option in a rather... idiosyncratic way + LIBS="-l$gl_lib_1 $LIBS" -if test "x$ax_pthread_clang" = "xyes"; then +else case e in #( + e) have_gl=no ;; +esac +fi - # Clang takes -pthread; it has never supported any other flag + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - # (Note 1: This will need to be revisited if a system that Clang - # supports has POSIX threads in a separate library. This tends not - # to be the way of modern systems, but it's conceivable.) + if test "$have_gl" = no; then - # (Note 2: On some systems, notably Darwin, -pthread is not needed - # to get POSIX threads support; the API is always present and - # active. We could reasonably leave PTHREAD_CFLAGS empty. But - # -pthread does define _REENTRANT, and while the Darwin headers - # ignore this macro, third-party headers might not.) + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - # However, older versions of Clang make a point of warning the user - # that, in an invocation where only linking and no compilation is - # taking place, the -pthread option has no effect ("argument unused - # during compilation"). They expect -pthread to be passed in only - # when source code is being compiled. - # - # Problem is, this is at odds with the way Automake and most other - # C build frameworks function, which is that the same flags used in - # compilation (CFLAGS) are also used in linking. Many systems - # supported by AX_PTHREAD require exactly this for POSIX threads - # support, and in fact it is often not straightforward to specify a - # flag that is used only in the compilation phase and not in - # linking. Such a scenario is extremely rare in practice. - # - # Even though use of the -pthread flag in linking would only print - # a warning, this can be a nuisance for well-run software projects - # that build with -Werror. So if the active version of Clang has - # this misfeature, we search for an option to squash it. + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 -$as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } -if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown - # Create an alternate version of $ac_link that compiles and - # links in two steps (.c -> .o, .o -> exe) instead of one - # (.c -> exe), because the warning occurs only in the second - # step - ax_pthread_save_ac_link="$ac_link" - ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' - ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` - ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" - ax_pthread_save_CFLAGS="$CFLAGS" - for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - if test "x$ax_pthread_try" = "xunknown"; then : - break -fi - CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" - ac_link="$ax_pthread_save_ac_link" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(void){return 0;} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_link="$ax_pthread_2step_ac_link" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBuild2DMipmaps in -lGLU" >&5 +printf %s "checking for gluBuild2DMipmaps in -lGLU... " >&6; } +if test ${ac_cv_lib_GLU_gluBuild2DMipmaps+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $GL_LIBS -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(void){return 0;} + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gluBuild2DMipmaps (void); +int +main (void) +{ +return gluBuild2DMipmaps (); + ; + return 0; +} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - break +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_GLU_gluBuild2DMipmaps=yes +else case e in #( + e) ac_cv_lib_GLU_gluBuild2DMipmaps=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - ac_link="$ax_pthread_save_ac_link" - CFLAGS="$ax_pthread_save_CFLAGS" - if test "x$ax_pthread_try" = "x"; then : - ax_pthread_try=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBuild2DMipmaps" >&5 +printf "%s\n" "$ac_cv_lib_GLU_gluBuild2DMipmaps" >&6; } +if test "x$ac_cv_lib_GLU_gluBuild2DMipmaps" = xyes +then : + have_gl=yes + GL_LIBS="-lGLU $GL_LIBS" +else case e in #( + e) have_gl=no + gl_halfassed=yes ;; +esac fi - ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 -$as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in - no | unknown) ;; - *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; - esac + fi + fi -fi # $ax_pthread_clang = yes + if test "$have_gl" = yes; then -# Various other checks: -if test "x$ax_pthread_ok" = "xyes"; then - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" + printf "%s\n" "#define HAVE_GL 1" >>confdefs.h - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } -if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_PTHREAD_JOINABLE_ATTR=unknown - for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # OpenGL 1.0 didn't have multiple textures. + + 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" + + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_glBindTexture" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBindTexture in -l$gl_lib_1" >&5 +printf %s "checking for glBindTexture in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBindTexture (void); int -main () +main (void) { -int attr = $ax_pthread_attr; return attr /* ; */ +return glBindTexture (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - done - +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + printf "%s\n" "#define HAVE_GLBINDTEXTURE 1" >>confdefs.h + +else case e in #( + e) true ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 -$as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } - if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ - test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ - test "x$ax_pthread_joinable_attr_defined" != "xyes"; then : -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR -_ACEOF + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - ax_pthread_joinable_attr_defined=yes + # Check for native GLES1 -fi + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5 -$as_echo_n "checking whether more special flags are required for pthreads... " >&6; } -if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_PTHREAD_SPECIAL_FLAGS=no - case $target_os in - solaris*) - ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" - ;; - esac + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 -$as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } - if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ - test "x$ax_pthread_special_flags_added" != "xyes"; then : - PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" - ax_pthread_special_flags_added=yes -fi + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 -$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } -if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_glBindBuffer" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBindBuffer in -l$gl_lib_1" >&5 +printf %s "checking for glBindBuffer in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBindBuffer (void); int -main () +main (void) { -int i = PTHREAD_PRIO_INHERIT; - return i; +return glBindBuffer (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ax_cv_PTHREAD_PRIO_INHERIT=yes -else - ax_cv_PTHREAD_PRIO_INHERIT=no +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 -$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } - if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ - test "x$ax_pthread_prio_inherit_defined" != "xyes"; then : - -$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h - - ax_pthread_prio_inherit_defined=yes - +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + printf "%s\n" "#define HAVE_GLES 1" >>confdefs.h + +else case e in #( + e) true ;; +esac fi - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != "xyes"; then - case $target_os in - aix*) - case "x/$CC" in #( - x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) : - #handle absolute path differently from PATH based program lookup - case "x$CC" in #( - x/*) : + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - if as_fn_executable_p ${CC}_r; then : - PTHREAD_CC="${CC}_r" -fi - if test "x${CXX}" != "x"; then : - if as_fn_executable_p ${CXX}_r; then : - PTHREAD_CXX="${CXX}_r" -fi -fi - ;; #( - *) : + # Check for GLSL and GLES2 - for ac_prog in ${CC}_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PTHREAD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + ac_save_CPPFLAGS="$CPPFLAGS" + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" fi -done - done -IFS=$as_save_IFS - -fi -fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + ac_fn_c_check_header_compile "$LINENO" "GL/glext.h" "ac_cv_header_GL_glext_h" "#include +" +if test "x$ac_cv_header_GL_glext_h" = xyes +then : + have_glext=yes +else case e in #( + e) have_glext=no ;; +esac fi - test -n "$PTHREAD_CC" && break -done -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + CPPFLAGS="$ac_save_CPPFLAGS" + if test "$have_glext" = yes ; then - if test "x${CXX}" != "x"; then : - for ac_prog in ${CXX}_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PTHREAD_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PTHREAD_CXX"; then - ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PTHREAD_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" -fi -fi -PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX -if test -n "$PTHREAD_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5 -$as_echo "$PTHREAD_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - test -n "$PTHREAD_CXX" && break -done -test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" -fi + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_glUseProgram" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glUseProgram in -l$gl_lib_1" >&5 +printf %s "checking for glUseProgram in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glUseProgram (void); +int +main (void) +{ +return glUseProgram (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; esac - ;; #( - *) : - ;; +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; esac - ;; - esac - fi fi +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + printf "%s\n" "#define HAVE_GLSL 1" >>confdefs.h -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" -test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" + printf "%s\n" "#define HAVE_GLES2 1" >>confdefs.h + +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test "x$ax_pthread_ok" = "xyes"; then - if test "$CC" = "$PTHREAD_CC" -o -z "$ac_original_cc"; then - have_pthread=yes - else - ac_prog_cc_no_pthread=yes fi - : -else - ax_pthread_ok=no + # Check for GLES3 -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" - if test "$have_pthread" = yes; then - $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - CC="$PTHREAD_CC" + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" fi -fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" -############################################################################### -# -# Handle --with-gles -# Must come before --with-gl -# -############################################################################### + CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` + LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_glBlitFramebuffer" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBlitFramebuffer in -l$gl_lib_1" >&5 +printf %s "checking for glBlitFramebuffer in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -with_jwzgles_req=unspecified -have_jwzgles=no +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char glBlitFramebuffer (void); +int +main (void) +{ +return glBlitFramebuffer (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS ;; +esac +fi +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + printf "%s\n" "#define HAVE_GLES3 1" >>confdefs.h -# Check whether --with-gles was given. -if test "${with_gles+set}" = set; then : - withval=$with_gles; # This is documented after --with-gl - with_jwzgles="$withval"; with_jwzgles_req="$withval" -else - with_jwzgles=no fi - case "$with_jwzgles" in - yes) ;; - no) ;; + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JWZGLES headers" >&5 -$as_echo_n "checking for JWZGLES headers... " >&6; } - d=$with_jwzgles/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi + if test "$have_jwzgles" = yes; then + printf "%s\n" "#define HAVE_JWZGLES 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JWZGLES libs" >&5 -$as_echo_n "checking for JWZGLES libs... " >&6; } - d=$with_jwzgles/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi + printf "%s\n" "#define HAVE_GLES 1" >>confdefs.h - # replace the directory string with "yes". - with_jwzgles_req="yes" - with_jwzgles=$with_jwzgles_req - ;; + fi - *) - echo "" - echo "error: argument to --with-gles 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 + fi -if test "$with_jwzgles" = yes; then - have_jwzgles=yes - JWZGLES_OBJS='$(JWXYZ_BIN)/jwzgles.o' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: emulating OpenGL 1.3 in terms of OpenGLES 1.x." >&5 -$as_echo "emulating OpenGL 1.3 in terms of OpenGLES 1.x." >&6; } -elif test "$with_jwzgles" != no; then - echo "error: must be yes or no: --with-gles=$with_jwzgles" +elif test "$with_gl" = no; then + echo "error: --without-opengl is not supported." + # You may be saying "but but but microcontrollers" -- bullshit. + # It is the Twenty-First Century, and in This Modern World, every + # extant microcontroller is more performant than the desktop + # computers on which I developed most of the OpenGL hacks. + exit 1 + +elif test "$with_gl" != no; then + echo "error: must be yes or no: --with-gl=$with_gl" exit 1 fi ############################################################################### # -# Check for -lGL or -lMesaGL. +# Handle --with-glx # ############################################################################### -#### H1 - -have_gl=no -ac_have_mesa_gl=no -with_gl_req=unspecified -gl_halfassed=no -have_glext=no +have_glx=no +have_egl=no +with_egl_req=unspecified -# Check whether --with-gl was given. -if test "${with_gl+set}" = set; then : - withval=$with_gl; with_gl="$withval"; with_gl_req="$withval" -else - with_gl=yes +# Check whether --with-glx was given. +if test ${with_glx+y} +then : + withval=$with_glx; with_egl="$withval"; with_egl_req="$withval" +else case e in #( + e) with_glx=no ;; +esac fi - case "$with_gl" in + case "$with_glx" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL headers" >&5 -$as_echo_n "checking for GL headers... " >&6; } - d=$with_gl/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLX headers" >&5 +printf %s "checking for GLX headers... " >&6; } + d=$with_glx/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL libs" >&5 -$as_echo_n "checking for GL libs... " >&6; } - d=$with_gl/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLX libs" >&5 +printf %s "checking for GLX libs... " >&6; } + d=$with_glx/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_gl_req="yes" - with_gl=$with_gl_req + with_glx_req="yes" + with_glx=$with_glx_req ;; *) echo "" - echo "error: argument to --with-gl must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-glx 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 - -# Some GL libraries require pthreads, so use the pthreads flags when -# testing them, then set them back after. -# -ac_save_pthreads_CFLAGS="$CFLAGS" -ac_save_pthreads_LIBS="$LIBS" -CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -LIBS="$PTHREAD_LIBS $LIBS" - -if test "$with_gl" = yes; then - - 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_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_gl_h" = xyes; then : - have_gl=yes -else - have_gl=no -fi - - CPPFLAGS="$ac_save_CPPFLAGS"; - if test "$have_gl" = yes; then - - 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_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glu_h" = xyes; then : - have_gl=yes -else - have_gl=no -fi - - CPPFLAGS="$ac_save_CPPFLAGS"; - fi -fi - -if test "$with_gl" = yes; then - # - # Since the OpenGL and GLES specifications are a complete dumpster fire, - # it's not easy to figure out how what libraries to use. - # - # OpenGLES library names: - # - # 1.x: libGLESv1_CM - # 2.x: libGLESv2 - # 3.x: libGLESv2 on Windows, libGLESv3 on Android - # - # On modern Linux systems, these libraries exist: - # - # libGL - a superset of everything up to and including OpenGL 4.6 - # libGLESv1_CM - OpenGLES 1.1, meaning it omits much of OpenGL 1.3 - # libGLESv2 - OpenGLES 2 and 3, meaning it omits even more of OpenGL 1.3 - # - # Since Linux systems support OpenGL 1.3, those link against only libGL. - # - # Unless we are using --with-gles on Linux, in which case we are attempting - # to simulate a system that does not natively support OpenGL 1.3. In that - # case, we use the v1 and/or v2 libraries instead. - # - # Common practice on Android seems to be to link against the v1, v2 and v3 - # libraries in order, and then do runtime checks to see which set of - # functions is actually supported by the runtime. Just because you linked - # against a GLES3 library doesn't mean that the hardware supports it: most - # of these functions are just syscall-like stubs. - # - # See the commentary atop jwxyz/jwzgles.c for discussion of OpenGL versions. - # - if test "$have_gl" = yes; then - have_gl=no - - if test "$have_jwzgles" = yes; then - - # Only check for the v1/2/3 libraries on Linux when using --with-gles - # to emulate a system that does not natively support OpenGL 1.3. + echo " the -I list, and \`DIR/lib' will be added to the -L list." + exit 1 + ;; + esac - # Check for GLES 3.x +if test "$with_glx" = yes; then 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" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv3" >&5 -$as_echo_n "checking for glDrawElements in -lGLESv3... " >&6; } -if ${ac_cv_lib_GLESv3_glDrawElements+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLESv3 $GL_LIBS -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glDrawElements (); -int -main () -{ -return glDrawElements (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_GLESv3_glDrawElements=yes -else - ac_cv_lib_GLESv3_glDrawElements=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv3_glDrawElements" >&5 -$as_echo "$ac_cv_lib_GLESv3_glDrawElements" >&6; } -if test "x$ac_cv_lib_GLESv3_glDrawElements" = xyes; then : - have_gl=yes - gl_lib_1="GLESv3" - GL_LIBS="-lGLESv3 $GL_LIBS" + ac_fn_c_check_header_compile "$LINENO" "GLX/glx.h" "ac_cv_header_GLX_glx_h" "$ac_includes_default" +if test "x$ac_cv_header_GLX_glx_h" = xyes +then : + have_glx=yes +else case e in #( + e) have_glx=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" +elif test "$with_glx" != no; then + echo "error: must be yes or no: --with-glx=$with_glx" + exit 1 +fi - # Check for GLES 2.x +if test "$have_gl" = yes; then + + # See if GLX functions are in -LGL. ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14416,53 +18483,65 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv2" >&5 -$as_echo_n "checking for glDrawElements in -lGLESv2... " >&6; } -if ${ac_cv_lib_GLESv2_glDrawElements+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLESv2 $GL_LIBS -lm $LIBS" + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_glXCreateContext" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -l$gl_lib_1" >&5 +printf %s "checking for glXCreateContext in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glDrawElements (); +char glXCreateContext (void); int -main () +main (void) { -return glDrawElements (); +return glXCreateContext (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_GLESv2_glDrawElements=yes -else - ac_cv_lib_GLESv2_glDrawElements=no +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv2_glDrawElements" >&5 -$as_echo "$ac_cv_lib_GLESv2_glDrawElements" >&6; } -if test "x$ac_cv_lib_GLESv2_glDrawElements" = xyes; then : - have_gl=yes - gl_lib_1="GLESv2" - GL_LIBS="-lGLESv2 $GL_LIBS" +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + have_glx=yes +else case e in #( + e) have_glx=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # Check for GLES 1.x + # See if EGL functions are in -LGL. + egl_lib="" ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14482,55 +18561,65 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glDrawElements in -lGLESv1_CM" >&5 -$as_echo_n "checking for glDrawElements in -lGLESv1_CM... " >&6; } -if ${ac_cv_lib_GLESv1_CM_glDrawElements+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLESv1_CM $GL_LIBS -lm $LIBS" + as_ac_Lib=`printf "%s\n" "ac_cv_lib_$gl_lib_1""_eglCreatePlatformWindowSurface" | sed "$as_sed_sh"` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eglCreatePlatformWindowSurface in -l$gl_lib_1" >&5 +printf %s "checking for eglCreatePlatformWindowSurface in -l$gl_lib_1... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glDrawElements (); +char eglCreatePlatformWindowSurface (void); int -main () +main (void) { -return glDrawElements (); +return eglCreatePlatformWindowSurface (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_GLESv1_CM_glDrawElements=yes -else - ac_cv_lib_GLESv1_CM_glDrawElements=no +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_Lib=yes" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLESv1_CM_glDrawElements" >&5 -$as_echo "$ac_cv_lib_GLESv1_CM_glDrawElements" >&6; } -if test "x$ac_cv_lib_GLESv1_CM_glDrawElements" = xyes; then : - have_gl=yes - gl_lib_1="GLESv1_CM" - GL_LIBS="-lGLESv1_CM $GL_LIBS" +eval ac_res=\$$as_ac_Lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : + have_egl=yes +else case e in #( + e) have_egl=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - else # $have_jwzgles = no - - # Check for OpenGL 1.x and/or OpenGL 4.x + if test "$have_egl" = no; then + # See if EGL functions are in -lEGL. ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14550,201 +18639,231 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lGL" >&5 -$as_echo_n "checking for glEnable in -lGL... " >&6; } -if ${ac_cv_lib_GL_glEnable+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGL $GL_LIBS -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eglCreatePlatformWindowSurface in -lEGL" >&5 +printf %s "checking for eglCreatePlatformWindowSurface in -lEGL... " >&6; } +if test ${ac_cv_lib_EGL_eglCreatePlatformWindowSurface+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lEGL $GL_LIBS -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glEnable (); +char eglCreatePlatformWindowSurface (void); int -main () +main (void) { -return glEnable (); +return eglCreatePlatformWindowSurface (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_GL_glEnable=yes -else - ac_cv_lib_GL_glEnable=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_EGL_eglCreatePlatformWindowSurface=yes +else case e in #( + e) ac_cv_lib_EGL_eglCreatePlatformWindowSurface=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glEnable" >&5 -$as_echo "$ac_cv_lib_GL_glEnable" >&6; } -if test "x$ac_cv_lib_GL_glEnable" = xyes; then : - have_gl=yes - gl_lib_1="GL" - GL_LIBS="-lGL $GL_LIBS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglCreatePlatformWindowSurface" >&5 +printf "%s\n" "$ac_cv_lib_EGL_eglCreatePlatformWindowSurface" >&6; } +if test "x$ac_cv_lib_EGL_eglCreatePlatformWindowSurface" = xyes +then : + have_egl=yes + egl_lib="EGL" +else case e in #( + e) have_egl=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # Check for MesaGL 1.x, but only if libGL doesn't exist. - if test "$have_gl" = no; then + fi - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + # If both GLX and EGL exist, use GLX only if requested. + if test "$with_glx" = yes -a "$have_glx" = yes; then + have_egl=no + fi - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" + if test "$have_egl" = yes; then + printf "%s\n" "#define HAVE_EGL 1" >>confdefs.h + + if test \! -z "$egl_lib"; then + GL_LIBS="-l$egl_lib $GL_LIBS" + fi fi - # note: $X_CFLAGS includes $x_includes - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" + # One of them is required + if test "$have_egl" = no -a "$have_glx" = no; then + have_gl=no + gl_halfassed=yes fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 -$as_echo_n "checking for glEnable in -lMesaGL... " >&6; } -if ${ac_cv_lib_MesaGL_glEnable+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lMesaGL $GL_LIBS -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + # --with-gles means that we are emulating a system that supports GLES but + # does not support OpenGL 1.3 (e.g., using Linux to simulate an Android-like + # environment). On such a system, GLE is required and GLX wouldn't exist. + # There is no way to request a GLES 3.0 runtime context using GLX. + # + if test "$have_jwzgles" = yes -a "$have_egl" = no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using --with-glx and --with-gles together is a bad idea." >&5 +printf "%s\n" "$as_me: WARNING: Using --with-glx and --with-gles together is a bad idea." >&2;} + fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glEnable (); -int -main () -{ -return glEnable (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_MesaGL_glEnable=yes -else - ac_cv_lib_MesaGL_glEnable=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 -$as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; } -if test "x$ac_cv_lib_MesaGL_glEnable" = xyes; then : - have_gl=yes - gl_lib_1="MesaGL" - GL_LIBS="-lMesaGL $GL_LIBS" + +# Restore flags after testing OpenGL libraries. +# +CFLAGS="$ac_save_pthreads_CFLAGS" +LIBS="$ac_save_pthreads_LIBS" + +############################################################################### +# +# Check for -lgle. +# +############################################################################### + +have_gle=no +with_gle_req=unspecified +gle_halfassed=no + +# Check whether --with-gle was given. +if test ${with_gle+y} +then : + withval=$with_gle; with_gle="$withval"; with_gle_req="$withval" +else case e in #( + e) with_gle=yes ;; +esac fi - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" + case "$with_gle" in + yes) ;; + no) ;; - fi - fi - fi + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLE headers" >&5 +printf %s "checking for GLE headers... " >&6; } + d=$with_gle/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi - # Figure out whether the GLU functions are in the main GL libraries or - # in -lGLU. Since Android does not have GLU, we don't link against libGLU - # when using --with-gles on Linux. - # - if test "$have_gl" = yes -a "$have_jwzgles" = no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLE libs" >&5 +printf %s "checking for GLE libs... " >&6; } + d=$with_gle/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_gle_req="yes" + with_gle=$with_gle_req + ;; + + *) + echo "" + echo "error: argument to --with-gle 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 + +GLE_LIBS="" + +if test "$have_gl" = no ; then + true +elif test "$with_gle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + 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_fn_c_check_header_compile "$LINENO" "GL/gle.h" "ac_cv_header_GL_gle_h" "#include +" +if test "x$ac_cv_header_GL_gle_h" = xyes +then : + have_gle3=yes +else case e in #( + e) have_gle3=no ;; +esac +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + if test "$have_gle3" = yes ; then + have_gle=yes; + else + ac_save_CPPFLAGS="$CPPFLAGS" 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" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_gluBuild2DMipmaps" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBuild2DMipmaps in -l$gl_lib_1" >&5 -$as_echo_n "checking for gluBuild2DMipmaps in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gluBuild2DMipmaps (); -int -main () -{ -return gluBuild2DMipmaps (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_fn_c_check_header_compile "$LINENO" "GL/gutil.h" "ac_cv_header_GL_gutil_h" "#include +" +if test "x$ac_cv_header_GL_gutil_h" = xyes +then : + have_gle=yes +else case e in #( + e) have_gle=no ;; +esac fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_LIB$gl_lib_1" | $as_tr_cpp` 1 -_ACEOF - LIBS="-l$gl_lib_1 $LIBS" + CPPFLAGS="$ac_save_CPPFLAGS" + if test "$have_gle" = yes ; then -else - have_gl=no + 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_fn_c_check_header_compile "$LINENO" "GL/tube.h" "ac_cv_header_GL_tube_h" "#include +" +if test "x$ac_cv_header_GL_tube_h" = xyes +then : + have_gle=yes +else case e in #( + e) have_gle=no ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" + fi + fi - if test "$have_gl" = no; then + if test "$have_gle" = yes ; then + have_gle=no + gle_halfassed=yes ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14764,62 +18883,76 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBuild2DMipmaps in -lGLU" >&5 -$as_echo_n "checking for gluBuild2DMipmaps in -lGLU... " >&6; } -if ${ac_cv_lib_GLU_gluBuild2DMipmaps+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $GL_LIBS -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gleCreateGC in -lgle" >&5 +printf %s "checking for gleCreateGC in -lgle... " >&6; } +if test ${ac_cv_lib_gle_gleCreateGC+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lgle $GL_LIBS -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gluBuild2DMipmaps (); +char gleCreateGC (void); int -main () +main (void) { -return gluBuild2DMipmaps (); +return gleCreateGC (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_GLU_gluBuild2DMipmaps=yes -else - ac_cv_lib_GLU_gluBuild2DMipmaps=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gle_gleCreateGC=yes +else case e in #( + e) ac_cv_lib_gle_gleCreateGC=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBuild2DMipmaps" >&5 -$as_echo "$ac_cv_lib_GLU_gluBuild2DMipmaps" >&6; } -if test "x$ac_cv_lib_GLU_gluBuild2DMipmaps" = xyes; then : - have_gl=yes - GL_LIBS="-lGLU $GL_LIBS" -else - have_gl=no - gl_halfassed=yes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gle_gleCreateGC" >&5 +printf "%s\n" "$ac_cv_lib_gle_gleCreateGC" >&6; } +if test "x$ac_cv_lib_gle_gleCreateGC" = xyes +then : + have_gle=yes; gle_halfassed=no; GLE_LIBS="-lgle" fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi fi + if test "$have_gle" = yes ; then + have_gle=no + gle_halfassed=yes - if test "$have_gl" = yes; then - - $as_echo "#define HAVE_GL 1" >>confdefs.h + # sometimes the libmatrix stuff is included in libgle. look there first. +# +# I don't get it. For some reason, this test passes on SGI, as if +# uview_direction_d() was in libgle -- but it's not, it's in libmatrix. +# Yet the link is succeeding. Why??? +# +# AC_CHECK_X_LIB(gle, uview_direction_d, +# [have_gle=yes; gle_halfassed=no], +# [], $GL_LIBS -lX11 -lXext -lm) - # OpenGL 1.0 didn't have multiple textures. + # As of GLE 3 this is in libgle, and has changed name to uview_direction! + # *sigh* + if test "$have_gle3" = yes ; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14839,56 +18972,61 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_glBindTexture" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBindTexture in -l$gl_lib_1" >&5 -$as_echo_n "checking for glBindTexture in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uview_direction in -lgle" >&5 +printf %s "checking for uview_direction in -lgle... " >&6; } +if test ${ac_cv_lib_gle_uview_direction+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lgle $GL_LIBS -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glBindTexture (); +char uview_direction (void); int -main () +main (void) { -return glBindTexture (); +return uview_direction (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_gle_uview_direction=yes +else case e in #( + e) ac_cv_lib_gle_uview_direction=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - $as_echo "#define HAVE_GLBINDTEXTURE 1" >>confdefs.h - -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gle_uview_direction" >&5 +printf "%s\n" "$ac_cv_lib_gle_uview_direction" >&6; } +if test "x$ac_cv_lib_gle_uview_direction" = xyes +then : + have_gle=yes; gle_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # Check for native GLES1 + fi + # if it wasn't in libgle, then look in libmatrix. + if test "$have_gle" = no ; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -14908,144 +19046,166 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_glBindBuffer" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBindBuffer in -l$gl_lib_1" >&5 -$as_echo_n "checking for glBindBuffer in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uview_direction_d in -lmatrix" >&5 +printf %s "checking for uview_direction_d in -lmatrix... " >&6; } +if test ${ac_cv_lib_matrix_uview_direction_d+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lmatrix $GL_LIBS -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glBindBuffer (); +char uview_direction_d (void); int -main () +main (void) { -return glBindBuffer (); +return uview_direction_d (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_matrix_uview_direction_d=yes +else case e in #( + e) ac_cv_lib_matrix_uview_direction_d=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - $as_echo "#define HAVE_GLES 1" >>confdefs.h - -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_matrix_uview_direction_d" >&5 +printf "%s\n" "$ac_cv_lib_matrix_uview_direction_d" >&6; } +if test "x$ac_cv_lib_matrix_uview_direction_d" = xyes +then : + have_gle=yes; gle_halfassed=no; + GLE_LIBS="$GLE_LIBS -lmatrix" fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # Check for GLSL and GLES2 - - ac_save_CPPFLAGS="$CPPFLAGS" - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" + fi fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "GL/glext.h" "ac_cv_header_GL_glext_h" "#include -" -if test "x$ac_cv_header_GL_glext_h" = xyes; then : - have_glext=yes -else - have_glext=no -fi - CPPFLAGS="$ac_save_CPPFLAGS" - if test "$have_glext" = yes ; then + if test "$have_gle" = yes ; then + printf "%s\n" "#define HAVE_GLE 1" >>confdefs.h - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" -# ac_save_LIBS="$LIBS" + if test "$have_gle3" = yes ; then + printf "%s\n" "#define HAVE_GLE3 1" >>confdefs.h - if test \! -z "$includedir" ; then - CPPFLAGS="$CPPFLAGS -I$includedir" + fi 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" +elif test "$with_gle" != no; then + echo "error: must be yes or no: --with-gle=$with_gle" + exit 1 - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_glUseProgram" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glUseProgram in -l$gl_lib_1" >&5 -$as_echo_n "checking for glUseProgram in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glUseProgram (); -int -main () -{ -return glUseProgram (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" +############################################################################### +# +# Check for -ljpeg +# +############################################################################### + +have_jpeg=no +with_jpeg_req=unspecified +jpeg_halfassed=no + +# Check whether --with-jpeg was given. +if test ${with_jpeg+y} +then : + withval=$with_jpeg; with_jpeg="$withval"; with_jpeg_req="$withval" +else case e in #( + e) with_jpeg=yes ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + case "$with_jpeg" in + yes) ;; + no) ;; + + /*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JPEG headers" >&5 +printf %s "checking for JPEG headers... " >&6; } + d=$with_jpeg/include + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JPEG libs" >&5 +printf %s "checking for JPEG libs... " >&6; } + d=$with_jpeg/lib + if test -d $d; then + X_LIBS="-L$d $X_LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } + fi + + # replace the directory string with "yes". + with_jpeg_req="yes" + with_jpeg=$with_jpeg_req + ;; + + *) + echo "" + echo "error: argument to --with-jpeg 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 + +if test "$with_jpeg" != yes -a "$with_jpeg" != no ; then + echo "error: must be yes or no: --with-jpeg=$with_jpeg" + exit 1 fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - $as_echo "#define HAVE_GLSL 1" >>confdefs.h - $as_echo "#define HAVE_GLES2 1" >>confdefs.h +if test "$with_jpeg" = yes; then + + have_jpeg=no + 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_fn_c_check_header_compile "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes +then : + have_jpeg=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - fi - # Check for GLES3 + if test "$have_jpeg" = yes; then + # we have the header, now check for the library + have_jpeg=no + jpeg_halfassed=yes ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -15065,46 +19225,55 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_glBlitFramebuffer" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBlitFramebuffer in -l$gl_lib_1" >&5 -$as_echo_n "checking for glBlitFramebuffer in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_compress in -ljpeg" >&5 +printf %s "checking for jpeg_start_compress in -ljpeg... " >&6; } +if test ${ac_cv_lib_jpeg_jpeg_start_compress+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-ljpeg $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char glBlitFramebuffer (); +char jpeg_start_compress (void); int -main () +main (void) { -return glBlitFramebuffer (); +return jpeg_start_compress (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_jpeg_jpeg_start_compress=yes +else case e in #( + e) ac_cv_lib_jpeg_jpeg_start_compress=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - $as_echo "#define HAVE_GLES3 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_compress" >&5 +printf "%s\n" "$ac_cv_lib_jpeg_jpeg_start_compress" >&6; } +if test "x$ac_cv_lib_jpeg_jpeg_start_compress" = xyes +then : + have_jpeg=yes + jpeg_halfassed=no + JPEG_LIBS="-ljpeg" + printf "%s\n" "#define HAVE_JPEGLIB 1" >>confdefs.h fi @@ -15112,173 +19281,98 @@ fi LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - if test "$have_jwzgles" = yes; then - $as_echo "#define HAVE_JWZGLES 1" >>confdefs.h - - $as_echo "#define HAVE_GLES 1" >>confdefs.h - - fi - fi - -elif test "$with_gl" != no; then - echo "error: must be yes or no: --with-gl=$with_gl" - exit 1 fi ############################################################################### # -# Handle --with-glx +# Check for -lpng # ############################################################################### -have_glx=no -have_egl=no -with_egl_req=unspecified +have_png=no +with_png_req=unspecified +png_halfassed=no -# Check whether --with-glx was given. -if test "${with_glx+set}" = set; then : - withval=$with_glx; with_egl="$withval"; with_egl_req="$withval" -else - with_glx=no +# Check whether --with-png was given. +if test ${with_png+y} +then : + withval=$with_png; with_png="$withval"; with_png_req="$withval" +else case e in #( + e) with_png=yes ;; +esac fi - case "$with_glx" in + case "$with_png" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLX headers" >&5 -$as_echo_n "checking for GLX headers... " >&6; } - d=$with_glx/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PNG headers" >&5 +printf %s "checking for PNG headers... " >&6; } + d=$with_png/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLX libs" >&5 -$as_echo_n "checking for GLX libs... " >&6; } - d=$with_glx/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PNG libs" >&5 +printf %s "checking for PNG libs... " >&6; } + d=$with_png/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_glx_req="yes" - with_glx=$with_glx_req + with_png_req="yes" + with_png=$with_png_req ;; *) echo "" - echo "error: argument to --with-glx must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-png 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 -if test "$with_glx" = yes; then - - 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_fn_c_check_header_mongrel "$LINENO" "GLX/glx.h" "ac_cv_header_GLX_glx_h" "$ac_includes_default" -if test "x$ac_cv_header_GLX_glx_h" = xyes; then : - have_glx=yes -else - have_glx=no -fi - - CPPFLAGS="$ac_save_CPPFLAGS" -elif test "$with_glx" != no; then - echo "error: must be yes or no: --with-glx=$with_glx" +if test "$with_png" != yes -a "$with_png" != no ; then + echo "error: must be yes or no: --with-png=$with_png" exit 1 fi -if test "$have_gl" = yes; then +if test "$with_png" = yes; then - # See if GLX functions are in -LGL. + have_png=no 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" - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_glXCreateContext" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -l$gl_lib_1" >&5 -$as_echo_n "checking for glXCreateContext in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glXCreateContext (); -int -main () -{ -return glXCreateContext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - have_glx=yes -else - have_glx=no + ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +if test "x$ac_cv_header_png_h" = xyes +then : + have_png=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - # See if EGL functions are in -LGL. - egl_lib="" + if test "$have_png" = yes; then + # we have the header, now check for the library + have_png=no + png_halfassed=yes ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -15298,116 +19392,56 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - as_ac_Lib=`$as_echo "ac_cv_lib_$gl_lib_1''_eglCreatePlatformWindowSurface" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglCreatePlatformWindowSurface in -l$gl_lib_1" >&5 -$as_echo_n "checking for eglCreatePlatformWindowSurface in -l$gl_lib_1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$gl_lib_1 $GL_LIBS -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in -lpng" >&5 +printf %s "checking for png_create_read_struct in -lpng... " >&6; } +if test ${ac_cv_lib_png_png_create_read_struct+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char eglCreatePlatformWindowSurface (); +char png_create_read_struct (void); int -main () +main (void) { -return eglCreatePlatformWindowSurface (); +return png_create_read_struct (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_png_png_create_read_struct=yes +else case e in #( + e) ac_cv_lib_png_png_create_read_struct=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - have_egl=yes -else - have_egl=no +LIBS=$ac_check_lib_save_LIBS ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5 +printf "%s\n" "$ac_cv_lib_png_png_create_read_struct" >&6; } +if test "x$ac_cv_lib_png_png_create_read_struct" = xyes +then : + have_png=yes + png_halfassed=no + PNG_LIBS="-lpng" + printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - if test "$have_egl" = no; then - # See if EGL functions are in -lEGL. - - 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" - - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eglCreatePlatformWindowSurface in -lEGL" >&5 -$as_echo_n "checking for eglCreatePlatformWindowSurface in -lEGL... " >&6; } -if ${ac_cv_lib_EGL_eglCreatePlatformWindowSurface+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lEGL $GL_LIBS -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char eglCreatePlatformWindowSurface (); -int -main () -{ -return eglCreatePlatformWindowSurface (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_EGL_eglCreatePlatformWindowSurface=yes -else - ac_cv_lib_EGL_eglCreatePlatformWindowSurface=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_EGL_eglCreatePlatformWindowSurface" >&5 -$as_echo "$ac_cv_lib_EGL_eglCreatePlatformWindowSurface" >&6; } -if test "x$ac_cv_lib_EGL_eglCreatePlatformWindowSurface" = xyes; then : - have_egl=yes - egl_lib="EGL" -else - have_egl=no fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -15415,144 +19449,135 @@ fi # LIBS="$ac_save_LIBS" fi - - # If both GLX and EGL exist, use GLX only if requested. - if test "$with_glx" = yes -a "$have_glx" = yes; then - have_egl=no - fi - - if test "$have_egl" = yes; then - $as_echo "#define HAVE_EGL 1" >>confdefs.h - - if test \! -z "$egl_lib"; then - GL_LIBS="-l$egl_lib $GL_LIBS" - fi - fi - - # One of them is required - if test "$have_egl" = no -a "$have_glx" = no; then - have_gl=no - gl_halfassed=yes - fi - - # --with-gles means that we are emulating a system that supports GLES but - # does not support OpenGL 1.3 (e.g., using Linux to simulate an Android-like - # environment). On such a system, GLE is required and GLX wouldn't exist. - # There is no way to request a GLES 3.0 runtime context using GLX. - # - if test "$have_jwzgles" = yes -a "$have_egl" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using --with-glx and --with-gles together is a bad idea." >&5 -$as_echo "$as_me: WARNING: Using --with-glx and --with-gles together is a bad idea." >&2;} - fi - fi -# Restore flags after testing OpenGL libraries. -# -CFLAGS="$ac_save_pthreads_CFLAGS" -LIBS="$ac_save_pthreads_LIBS" - ############################################################################### # -# Check for -lgle. +# Check for -lgdk_pixbuf. +# These tests are for gdk_pixbuf usage of the hacks, +# not xscreensaver-settings (thus we have to test again to get +# the libraries right: don't want to pull in all of GTK +# for the hacks.) # ############################################################################### -have_gle=no -with_gle_req=unspecified -gle_halfassed=no +have_gdk_pixbuf=no +have_gdk_pixbuf_xlib=no +with_gdk_pixbuf_req=unspecified -# Check whether --with-gle was given. -if test "${with_gle+set}" = set; then : - withval=$with_gle; with_gle="$withval"; with_gle_req="$withval" -else - with_gle=yes +# Check whether --with-pixbuf was given. +if test ${with_pixbuf+y} +then : + withval=$with_pixbuf; with_gdk_pixbuf="$withval"; with_gdk_pixbuf_req="$withval" +else case e in #( + e) with_gdk_pixbuf=yes ;; +esac fi - case "$with_gle" in +# if --with-pixbuf=/directory/ was specified, remember that directory so that +# we can also look for the `gdk-pixbuf-config' program in that directory. +case "$with_gdk_pixbuf" in + /*) + gdk_pixbuf_dir="$with_gdk_pixbuf" + ;; + *) + gdk_pixbuf_dir="" + ;; +esac + + case "$with_gdk_pixbuf" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLE headers" >&5 -$as_echo_n "checking for GLE headers... " >&6; } - d=$with_gle/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF headers" >&5 +printf %s "checking for GDK_PIXBUF headers... " >&6; } + d=$with_gdk_pixbuf/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLE libs" >&5 -$as_echo_n "checking for GLE libs... " >&6; } - d=$with_gle/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF libs" >&5 +printf %s "checking for GDK_PIXBUF libs... " >&6; } + d=$with_gdk_pixbuf/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - # replace the directory string with "yes". - with_gle_req="yes" - with_gle=$with_gle_req + # replace the directory string with "yes". + with_gdk_pixbuf_req="yes" + with_gdk_pixbuf=$with_gdk_pixbuf_req ;; *) echo "" - echo "error: argument to --with-gle must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-pixbuf 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 -GLE_LIBS="" - -if test "$have_gl" = no ; then - true -elif test "$with_gle" = yes; then - - 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_fn_c_check_header_compile "$LINENO" "GL/gle.h" "ac_cv_header_GL_gle_h" "#include -" -if test "x$ac_cv_header_GL_gle_h" = xyes; then : - have_gle3=yes -else - have_gle3=no +if test "$with_gdk_pixbuf" != yes -a "$with_gdk_pixbuf" != no ; then + echo "error: must be yes or no: --with-pixbuf=$with_gdk_pixbuf" + exit 1 fi - CPPFLAGS="$ac_save_CPPFLAGS" - if test "$have_gle3" = yes ; then - have_gle=yes; - else +if test "$with_gdk_pixbuf" = yes; then + have_gdk_pixbuf=no - 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_fn_c_check_header_compile "$LINENO" "GL/gutil.h" "ac_cv_header_GL_gutil_h" "#include -" -if test "x$ac_cv_header_GL_gutil_h" = xyes; then : - have_gle=yes -else - have_gle=no + pkgs='' + ok="yes" + pkg_check_version gdk-pixbuf-2.0 2.0.0 + pkg_check_version gio-2.0 2.0.0 + have_gdk_pixbuf="$ok" + pixbuf_pkgs="$pkgs" + + if test "$have_gdk_pixbuf" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf includes" >&5 +printf %s "checking for gdk-pixbuf includes... " >&6; } +if test ${ac_cv_gdk_pixbuf_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_gdk_pixbuf_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gdk_pixbuf_config_cflags" >&5 +printf "%s\n" "$ac_cv_gdk_pixbuf_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf libs" >&5 +printf %s "checking for gdk-pixbuf libs... " >&6; } +if test ${ac_cv_gdk_pixbuf_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_gdk_pixbuf_config_libs=`$pkg_config --libs $pkgs` ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gdk_pixbuf_config_libs" >&5 +printf "%s\n" "$ac_cv_gdk_pixbuf_config_libs" >&6; } + fi - CPPFLAGS="$ac_save_CPPFLAGS" - if test "$have_gle" = yes ; then + ac_gdk_pixbuf_config_cflags=$ac_cv_gdk_pixbuf_config_cflags + ac_gdk_pixbuf_config_libs=$ac_cv_gdk_pixbuf_config_libs + + if test "$have_gdk_pixbuf" = yes; then + # + # we appear to have pixbuf; check for headers/libs to be sure. + # + ac_save_gdk_pixbuf_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_gdk_pixbuf_config_cflags" + have_gdk_pixbuf=no ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -15560,21 +19585,21 @@ fi fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_compile "$LINENO" "GL/tube.h" "ac_cv_header_GL_tube_h" "#include -" -if test "x$ac_cv_header_GL_tube_h" = xyes; then : - have_gle=yes -else - have_gle=no + ac_fn_c_check_header_compile "$LINENO" "gdk-pixbuf/gdk-pixbuf.h" "ac_cv_header_gdk_pixbuf_gdk_pixbuf_h" "$ac_includes_default" +if test "x$ac_cv_header_gdk_pixbuf_gdk_pixbuf_h" = xyes +then : + have_gdk_pixbuf=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - fi + CPPFLAGS="$ac_save_gdk_pixbuf_CPPFLAGS" fi - if test "$have_gle" = yes ; then - have_gle=no - gle_halfassed=yes + if test "$have_gdk_pixbuf" = yes; then + # we have the headers, now check for the libraries + have_gdk_pixbuf=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for gdk_pixbuf usability..." >&5 +printf "%s\n" "checking for gdk_pixbuf usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -15594,44 +19619,52 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gleCreateGC in -lgle" >&5 -$as_echo_n "checking for gleCreateGC in -lgle... " >&6; } -if ${ac_cv_lib_gle_gleCreateGC+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgle $GL_LIBS -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_new_from_file in -lc" >&5 +printf %s "checking for gdk_pixbuf_new_from_file in -lc... " >&6; } +if test ${ac_cv_lib_c_gdk_pixbuf_new_from_file+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gleCreateGC (); +char gdk_pixbuf_new_from_file (void); int -main () +main (void) { -return gleCreateGC (); +return gdk_pixbuf_new_from_file (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gle_gleCreateGC=yes -else - ac_cv_lib_gle_gleCreateGC=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c_gdk_pixbuf_new_from_file=yes +else case e in #( + e) ac_cv_lib_c_gdk_pixbuf_new_from_file=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gle_gleCreateGC" >&5 -$as_echo "$ac_cv_lib_gle_gleCreateGC" >&6; } -if test "x$ac_cv_lib_gle_gleCreateGC" = xyes; then : - have_gle=yes; gle_halfassed=no; GLE_LIBS="-lgle" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gdk_pixbuf_new_from_file" >&5 +printf "%s\n" "$ac_cv_lib_c_gdk_pixbuf_new_from_file" >&6; } +if test "x$ac_cv_lib_c_gdk_pixbuf_new_from_file" = xyes +then : + have_gdk_pixbuf=yes fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -15639,89 +19672,18 @@ fi # LIBS="$ac_save_LIBS" fi - if test "$have_gle" = yes ; then - have_gle=no - gle_halfassed=yes - - # sometimes the libmatrix stuff is included in libgle. look there first. -# -# I don't get it. For some reason, this test passes on SGI, as if -# uview_direction_d() was in libgle -- but it's not, it's in libmatrix. -# Yet the link is succeeding. Why??? -# -# AC_CHECK_X_LIB(gle, uview_direction_d, -# [have_gle=yes; gle_halfassed=no], -# [], $GL_LIBS -lX11 -lXext -lm) - - # As of GLE 3 this is in libgle, and has changed name to uview_direction! - # *sigh* - if test "$have_gle3" = yes ; then - 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 "$have_gdk_pixbuf" = yes; then + INCLUDES="$INCLUDES $ac_gdk_pixbuf_config_cflags" + PNG_LIBS="$ac_gdk_pixbuf_config_libs" + printf "%s\n" "#define HAVE_GDK_PIXBUF 1" >>confdefs.h - if test \! -z "$libdir" ; then - LDFLAGS="$LDFLAGS -L$libdir" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for gdk_pixbuf usability... no" >&5 +printf "%s\n" "checking for gdk_pixbuf usability... no" >&6; } fi - # note: $X_LIBS includes $x_libraries - LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" - - CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uview_direction in -lgle" >&5 -$as_echo_n "checking for uview_direction in -lgle... " >&6; } -if ${ac_cv_lib_gle_uview_direction+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgle $GL_LIBS -lX11 -lXext -lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char uview_direction (); -int -main () -{ -return uview_direction (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gle_uview_direction=yes -else - ac_cv_lib_gle_uview_direction=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gle_uview_direction" >&5 -$as_echo "$ac_cv_lib_gle_uview_direction" >&6; } -if test "x$ac_cv_lib_gle_uview_direction" = xyes; then : - have_gle=yes; gle_halfassed=no -fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -# LIBS="$ac_save_LIBS" - - fi - # if it wasn't in libgle, then look in libmatrix. - if test "$have_gle" = no ; then + if test "$have_gdk_pixbuf" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -15741,155 +19703,131 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uview_direction_d in -lmatrix" >&5 -$as_echo_n "checking for uview_direction_d in -lmatrix... " >&6; } -if ${ac_cv_lib_matrix_uview_direction_d+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmatrix $GL_LIBS -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_apply_embedded_orientation in -lc" >&5 +printf %s "checking for gdk_pixbuf_apply_embedded_orientation in -lc... " >&6; } +if test ${ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char uview_direction_d (); +char gdk_pixbuf_apply_embedded_orientation (void); int -main () +main (void) { -return uview_direction_d (); +return gdk_pixbuf_apply_embedded_orientation (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_matrix_uview_direction_d=yes -else - ac_cv_lib_matrix_uview_direction_d=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation=yes +else case e in #( + e) ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_matrix_uview_direction_d" >&5 -$as_echo "$ac_cv_lib_matrix_uview_direction_d" >&6; } -if test "x$ac_cv_lib_matrix_uview_direction_d" = xyes; then : - have_gle=yes; gle_halfassed=no; - GLE_LIBS="$GLE_LIBS -lmatrix" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" >&5 +printf "%s\n" "$ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" >&6; } +if test "x$ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" = xyes +then : + printf "%s\n" "#define HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION 1" >>confdefs.h + fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi - fi - - if test "$have_gle" = yes ; then - $as_echo "#define HAVE_GLE 1" >>confdefs.h - - if test "$have_gle3" = yes ; then - $as_echo "#define HAVE_GLE3 1" >>confdefs.h - - fi fi - -elif test "$with_gle" != no; then - echo "error: must be yes or no: --with-gle=$with_gle" - exit 1 - fi -############################################################################### +# Now that we have checked for gdk_pixbuf, check for gdk_pixbuf_xlib +# separately, since it has fallen out of fashion in recent years. # -# Check for -ljpeg +#have_gdk_pixbuf_xlib=no +#gdk_pixbuf_xlib_halfassed=no +#if test "$with_gdk_pixbuf" = yes -a "$have_gdk_pixbuf" = yes; then # -############################################################################### - -have_jpeg=no -with_jpeg_req=unspecified -jpeg_halfassed=no - -# Check whether --with-jpeg was given. -if test "${with_jpeg+set}" = set; then : - withval=$with_jpeg; with_jpeg="$withval"; with_jpeg_req="$withval" -else - with_jpeg=yes -fi - - case "$with_jpeg" in - yes) ;; - no) ;; - - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JPEG headers" >&5 -$as_echo_n "checking for JPEG headers... " >&6; } - d=$with_jpeg/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JPEG libs" >&5 -$as_echo_n "checking for JPEG libs... " >&6; } - d=$with_jpeg/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - # replace the directory string with "yes". - with_jpeg_req="yes" - with_jpeg=$with_jpeg_req - ;; - - *) - echo "" - echo "error: argument to --with-jpeg 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 - -if test "$with_jpeg" != yes -a "$with_jpeg" != no ; then - echo "error: must be yes or no: --with-jpeg=$with_jpeg" - exit 1 -fi - -if test "$with_jpeg" = yes; then - - have_jpeg=no - - 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_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = xyes; then : - have_jpeg=yes -fi +# have_gdk_pixbuf_xlib=no +# pkgs="$pixbuf_pkgs" +# ok="yes" +# pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 +# pkg_check_version gdk-pixbuf-2.0 2.0.0 +# have_gdk_pixbuf_xlib="$ok" +# pixbuf_xlib_pkgs="$pkgs" +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# AC_CACHE_CHECK([for gdk-pixbuf-xlib includes], +# ac_cv_gdk_pixbuf_xlib_config_cflags, +# [ac_cv_gdk_pixbuf_xlib_config_cflags=`$pkg_config --cflags $pkgs`]) +# AC_CACHE_CHECK([for gdk-pixbuf-xlib libs], +# ac_cv_gdk_pixbuf_xlib_config_libs, +# [ac_cv_gdk_pixbuf_xlib_config_libs=`$pkg_config --libs $pkgs`]) +# fi +# +# ac_gdk_pixbuf_xlib_config_cflags=$ac_cv_gdk_pixbuf_xlib_config_cflags +# ac_gdk_pixbuf_xlib_config_libs=$ac_cv_gdk_pixbuf_xlib_config_libs +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# # +# # we appear to have pixbuf_xlib; check for headers/libs to be sure. +# # +# ac_save_gdk_pixbuf_xlib_CPPFLAGS="$CPPFLAGS" +# CPPFLAGS="$CPPFLAGS $ac_gdk_pixbuf_xlib_config_cflags" +# have_gdk_pixbuf_xlib=no +# gdk_pixbuf_xlib_halfassed=yes +# AC_CHECK_X_HEADER(gdk-pixbuf-xlib/gdk-pixbuf-xlib.h, +# [have_gdk_pixbuf_xlib=yes +# gdk_pixbuf_xlib_halfassed=no]) +# CPPFLAGS="$ac_save_gdk_pixbuf_xlib_CPPFLAGS" +# fi +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# # we have the headers, now check for the libraries +# have_gdk_pixbuf_xlib=no +# gdk_pixbuf_xlib_halfassed=yes +# +# AC_MSG_RESULT(checking for gdk_pixbuf_xlib usability...) +# AC_CHECK_X_LIB(c, gdk_pixbuf_xlib_init, +# [have_gdk_pixbuf_xlib=yes +# gdk_pixbuf_xlib_halfassed=no],, +# $ac_gdk_pixbuf_xlib_config_libs -lX11 -lXext -lm) +# fi +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# INCLUDES="$INCLUDES $ac_gdk_pixbuf_xlib_config_cflags" +# PNG_LIBS="$ac_gdk_pixbuf_xlib_config_libs" +# AC_DEFINE(HAVE_GDK_PIXBUF_XLIB) +# else +# AC_MSG_RESULT(checking for gdk_pixbuf_xlib usability... no) +# fi +#fi - CPPFLAGS="$ac_save_CPPFLAGS" +############################################################################### +# +# Check for -lXft +# +############################################################################### - if test "$have_jpeg" = yes; then - # we have the header, now check for the library - have_jpeg=no - jpeg_halfassed=yes +have_xutf8drawstring=no ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -15909,125 +19847,170 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_compress in -ljpeg" >&5 -$as_echo_n "checking for jpeg_start_compress in -ljpeg... " >&6; } -if ${ac_cv_lib_jpeg_jpeg_start_compress+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xutf8DrawString in -lX11" >&5 +printf %s "checking for Xutf8DrawString in -lX11... " >&6; } +if test ${ac_cv_lib_X11_Xutf8DrawString+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lX11 -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char jpeg_start_compress (); +char Xutf8DrawString (void); int -main () +main (void) { -return jpeg_start_compress (); +return Xutf8DrawString (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_jpeg_jpeg_start_compress=yes -else - ac_cv_lib_jpeg_jpeg_start_compress=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_X11_Xutf8DrawString=yes +else case e in #( + e) ac_cv_lib_X11_Xutf8DrawString=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_compress" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_start_compress" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_start_compress" = xyes; then : - have_jpeg=yes - jpeg_halfassed=no - JPEG_LIBS="-ljpeg" - $as_echo "#define HAVE_JPEGLIB 1" >>confdefs.h - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_Xutf8DrawString" >&5 +printf "%s\n" "$ac_cv_lib_X11_Xutf8DrawString" >&6; } +if test "x$ac_cv_lib_X11_Xutf8DrawString" = xyes +then : + have_xutf8drawstring=yes +else case e in #( + e) true ;; +esac fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi -fi +if test "$have_xutf8drawstring" = yes ; then + printf "%s\n" "#define HAVE_XUTF8DRAWSTRING 1" >>confdefs.h -############################################################################### -# -# Check for -lpng -# -############################################################################### +fi -have_png=no -with_png_req=unspecified -png_halfassed=no +have_xft=no +with_xft_req=unspecified +xft_halfassed=no -# Check whether --with-png was given. -if test "${with_png+set}" = set; then : - withval=$with_png; with_png="$withval"; with_png_req="$withval" -else - with_png=yes +# Check whether --with-xft was given. +if test ${with_xft+y} +then : + withval=$with_xft; with_xft="$withval"; with_xft_req="$withval" +else case e in #( + e) with_xft=yes ;; +esac fi - case "$with_png" in + case "$with_xft" in yes) ;; no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG headers" >&5 -$as_echo_n "checking for PNG headers... " >&6; } - d=$with_png/include + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xft headers" >&5 +printf %s "checking for Xft headers... " >&6; } + d=$with_xft/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG libs" >&5 -$as_echo_n "checking for PNG libs... " >&6; } - d=$with_png/lib + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xft libs" >&5 +printf %s "checking for Xft libs... " >&6; } + d=$with_xft/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". - with_png_req="yes" - with_png=$with_png_req + with_xft_req="yes" + with_xft=$with_xft_req ;; *) echo "" - echo "error: argument to --with-png must be \"yes\", \"no\", or a directory." + echo "error: argument to --with-xft 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 -if test "$with_png" != yes -a "$with_png" != no ; then - echo "error: must be yes or no: --with-png=$with_png" +if test "$with_xft" != yes -a "$with_xft" != no ; then + echo "error: must be yes or no: --with-xft=$with_xft" exit 1 fi -if test "$with_png" = yes; then +if test "$with_xft" = yes; then - have_png=no + pkgs='' + ok="yes" + pkg_check_version xft 2.1.0 + have_xft="$ok" + + if test "$have_xft" = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xft includes" >&5 +printf %s "checking for Xft includes... " >&6; } +if test ${ac_cv_xft_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_xft_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xft_config_cflags" >&5 +printf "%s\n" "$ac_cv_xft_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Xft libs" >&5 +printf %s "checking for Xft libs... " >&6; } +if test ${ac_cv_xft_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_xft_config_libs=`$pkg_config --libs $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xft_config_libs" >&5 +printf "%s\n" "$ac_cv_xft_config_libs" >&6; } + fi + + ac_xft_config_cflags=$ac_cv_xft_config_cflags + ac_xft_config_libs=$ac_cv_xft_config_libs + + if test "$have_xft" = yes; then + # + # we appear to have Xft; check for headers/libs to be sure. + # + ac_save_xft_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_xft_config_cflags" + + have_xft=no ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -16035,17 +20018,24 @@ if test "$with_png" = yes; then fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" -if test "x$ac_cv_header_png_h" = xyes; then : - have_png=yes + ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes +then : + have_xft=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - if test "$have_png" = yes; then - # we have the header, now check for the library - have_png=no - png_halfassed=yes + CPPFLAGS="$ac_save_xft_CPPFLAGS" + fi + + if test "$have_xft" = yes; then + # we have the headers, now check for the libraries + have_xft=no + xft_halfassed=yes + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for Xft usability..." >&5 +printf "%s\n" "checking for Xft usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16065,48 +20055,52 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in -lpng" >&5 -$as_echo_n "checking for png_create_read_struct in -lpng... " >&6; } -if ${ac_cv_lib_png_png_create_read_struct+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XftDrawStringUtf8 in -lc" >&5 +printf %s "checking for XftDrawStringUtf8 in -lc... " >&6; } +if test ${ac_cv_lib_c_XftDrawStringUtf8+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $ac_xft_config_libs -lX11 -lXext -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char png_create_read_struct (); +char XftDrawStringUtf8 (void); int -main () +main (void) { -return png_create_read_struct (); +return XftDrawStringUtf8 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_png_png_create_read_struct=yes -else - ac_cv_lib_png_png_create_read_struct=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_c_XftDrawStringUtf8=yes +else case e in #( + e) ac_cv_lib_c_XftDrawStringUtf8=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5 -$as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; } -if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then : - have_png=yes - png_halfassed=no - PNG_LIBS="-lpng" - $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_XftDrawStringUtf8" >&5 +printf "%s\n" "$ac_cv_lib_c_XftDrawStringUtf8" >&6; } +if test "x$ac_cv_lib_c_XftDrawStringUtf8" = xyes +then : + have_xft=yes fi CPPFLAGS="$ac_save_CPPFLAGS" @@ -16114,132 +20108,92 @@ fi # LIBS="$ac_save_LIBS" fi + + if test "$have_xft" = no; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for Xft usability... no" >&5 +printf "%s\n" "checking for Xft usability... no" >&6; } + fi +fi + +if test "$have_xft" = yes; then + INCLUDES="$INCLUDES $ac_xft_config_cflags" + XFT_LIBS="$ac_xft_config_libs" + XFT_SRCS='' + XFT_OBJS='' + printf "%s\n" "#define HAVE_XFT 1" >>confdefs.h + +else + XFT_LIBS='' + XFT_SRCS='$(UTILS_SRC)/xft.c' + XFT_OBJS='$(UTILS_BIN)/xft.o' fi ############################################################################### # -# Check for -lgdk_pixbuf. -# These tests are for gdk_pixbuf usage of the hacks, -# not xscreensaver-settings (thus we have to test again to get -# the libraries right: don't want to pull in all of GTK -# for the hacks.) +# Check for various ffmpeg libraries # ############################################################################### -have_gdk_pixbuf=no -with_gdk_pixbuf_req=unspecified +pkgs='' +ok="yes" +pkg_check_version libavutil 54.0.0 +have_avutil="$ok" +pkg_check_version libavcodec 56.0.0 +have_avcodec="$ok" +pkg_check_version libavformat 56.0.0 +have_avformat="$ok" +pkg_check_version libswscale 3.0.0 +have_swscale="$ok" +pkg_check_version libswresample 1.0.0 +have_swresample="$ok" + +# Check includes +if test "$have_avutil" = yes; then + ac_save_avutil_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avutil_config_cflags" + have_avutil=no -# Check whether --with-pixbuf was given. -if test "${with_pixbuf+set}" = set; then : - withval=$with_pixbuf; with_gdk_pixbuf="$withval"; with_gdk_pixbuf_req="$withval" -else - with_gdk_pixbuf=yes + 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_fn_c_check_header_compile "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default" +if test "x$ac_cv_header_libavutil_avutil_h" = xyes +then : + have_avutil=yes fi -# if --with-pixbuf=/directory/ was specified, remember that directory so that -# we can also look for the `gdk-pixbuf-config' program in that directory. -case "$with_gdk_pixbuf" in - /*) - gdk_pixbuf_dir="$with_gdk_pixbuf" - ;; - *) - gdk_pixbuf_dir="" - ;; -esac - - case "$with_gdk_pixbuf" in - yes) ;; - no) ;; - - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF headers" >&5 -$as_echo_n "checking for GDK_PIXBUF headers... " >&6; } - d=$with_gdk_pixbuf/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF libs" >&5 -$as_echo_n "checking for GDK_PIXBUF libs... " >&6; } - d=$with_gdk_pixbuf/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - # replace the directory string with "yes". - with_gdk_pixbuf_req="yes" - with_gdk_pixbuf=$with_gdk_pixbuf_req - ;; - - *) - echo "" - echo "error: argument to --with-pixbuf 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 - -if test "$with_gdk_pixbuf" != yes -a "$with_gdk_pixbuf" != no ; then - echo "error: must be yes or no: --with-pixbuf=$with_gdk_pixbuf" - exit 1 + CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_avutil_CPPFLAGS" fi -if test "$with_gdk_pixbuf" = yes; then - have_gdk_pixbuf=no - - pkgs='' - ok="yes" - - pkg_check_version gdk-pixbuf-2.0 2.0.0 - pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 - pkg_check_version gio-2.0 2.0.0 - have_gdk_pixbuf="$ok" +if test "$have_avcodec" = yes; then + ac_save_avcodec_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avcodec_config_cflags" + have_avcodec=no - if test "$have_gdk_pixbuf" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf includes" >&5 -$as_echo_n "checking for gdk-pixbuf includes... " >&6; } -if ${ac_cv_gdk_pixbuf_config_cflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_gdk_pixbuf_config_cflags=`$pkg_config --cflags $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gdk_pixbuf_config_cflags" >&5 -$as_echo "$ac_cv_gdk_pixbuf_config_cflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf libs" >&5 -$as_echo_n "checking for gdk-pixbuf libs... " >&6; } -if ${ac_cv_gdk_pixbuf_config_libs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_gdk_pixbuf_config_libs=`$pkg_config --libs $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gdk_pixbuf_config_libs" >&5 -$as_echo "$ac_cv_gdk_pixbuf_config_libs" >&6; } + 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_fn_c_check_header_compile "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default" +if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes +then : + have_avcodec=yes +fi - ac_gdk_pixbuf_config_cflags=$ac_cv_gdk_pixbuf_config_cflags - ac_gdk_pixbuf_config_libs=$ac_cv_gdk_pixbuf_config_libs - - if test "$have_gdk_pixbuf" = yes; then - # - # we appear to have pixbuf; check for headers/libs to be sure. - # - ac_save_gdk_pixbuf_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $ac_gdk_pixbuf_config_cflags" - - have_gdk_pixbuf=no + CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_avcodec_CPPFLAGS" +fi - # check for header A... +if test "$have_avformat" = yes; then + ac_save_avformat_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avformat_config_cflags" + have_avformat=no ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -16247,17 +20201,20 @@ $as_echo "$ac_cv_gdk_pixbuf_config_libs" >&6; } fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_mongrel "$LINENO" "gdk-pixbuf/gdk-pixbuf.h" "ac_cv_header_gdk_pixbuf_gdk_pixbuf_h" "$ac_includes_default" -if test "x$ac_cv_header_gdk_pixbuf_gdk_pixbuf_h" = xyes; then : - have_gdk_pixbuf=yes + ac_fn_c_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default" +if test "x$ac_cv_header_libavformat_avformat_h" = xyes +then : + have_avformat=yes fi CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_avformat_CPPFLAGS" +fi - # if that worked, check for header B... - if test "$have_gdk_pixbuf" = yes; then - have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes +if test "$have_swscale" = yes; then + ac_save_swscale_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_swscale_config_cflags" + have_swscale=no ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -16265,18 +20222,20 @@ fi fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_mongrel "$LINENO" "gdk-pixbuf/gdk-pixbuf-xlib.h" "ac_cv_header_gdk_pixbuf_gdk_pixbuf_xlib_h" "$ac_includes_default" -if test "x$ac_cv_header_gdk_pixbuf_gdk_pixbuf_xlib_h" = xyes; then : - have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no + ac_fn_c_check_header_compile "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "$ac_includes_default" +if test "x$ac_cv_header_libswscale_swscale_h" = xyes +then : + have_swscale=yes fi CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$ac_save_swscale_CPPFLAGS" +fi - # yay, it has a new name in Gtk 2.x... - if test "$have_gdk_pixbuf" = no; then - have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes +if test "$have_swresample" = yes; then + ac_save_swresample_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_swresample_config_cflags" + have_swresample=no ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -16284,27 +20243,29 @@ fi fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` - ac_fn_c_check_header_mongrel "$LINENO" "gdk-pixbuf-xlib/gdk-pixbuf-xlib.h" "ac_cv_header_gdk_pixbuf_xlib_gdk_pixbuf_xlib_h" "$ac_includes_default" -if test "x$ac_cv_header_gdk_pixbuf_xlib_gdk_pixbuf_xlib_h" = xyes; then : - have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no + ac_fn_c_check_header_compile "$LINENO" "libswresample/swresample.h" "ac_cv_header_libswresample_swresample_h" "$ac_includes_default" +if test "x$ac_cv_header_libswresample_swresample_h" = xyes +then : + have_swresample=yes fi CPPFLAGS="$ac_save_CPPFLAGS" - fi - fi - CPPFLAGS="$ac_save_gdk_pixbuf_CPPFLAGS" - fi + CPPFLAGS="$ac_save_swresample_CPPFLAGS" +fi - if test "$have_gdk_pixbuf" = yes; then - # we have the headers, now check for the libraries - have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes +# Check libs - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for gdk_pixbuf usability..." >&5 -$as_echo "checking for gdk_pixbuf usability..." >&6; } +# My CentOS 7.9 build against ffmpeg 4.2.1 requires all this extra crap too. +# Not required on Raspbian 11 or macOS. +extra_ffmpeg_bs="" +if grep -q '7\.' /etc/centos-release 2>/dev/null ; then + extra_ffmpeg_bs="-lfdk-aac -lmp3lame -lspeex -ltheora -ltheoraenc -ltheoradec -lvorbis -lvorbisenc -lx264 -lz -lbz2 -llzma -ldl -pthread" +fi - # library A... +if test "$have_avutil" = yes; then + have_avutil=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libavutil usability..." >&5 +printf "%s\n" "checking for libavutil usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16324,53 +20285,64 @@ $as_echo "checking for gdk_pixbuf usability..." >&6; } CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_new_from_file in -lc" >&5 -$as_echo_n "checking for gdk_pixbuf_new_from_file in -lc... " >&6; } -if ${ac_cv_lib_c_gdk_pixbuf_new_from_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avutil_version in -lavutil" >&5 +printf %s "checking for avutil_version in -lavutil... " >&6; } +if test ${ac_cv_lib_avutil_avutil_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lavutil `$pkg_config --libs libavutil libswresample` $extra_ffmpeg_bs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gdk_pixbuf_new_from_file (); +char avutil_version (void); int -main () +main (void) { -return gdk_pixbuf_new_from_file (); +return avutil_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_gdk_pixbuf_new_from_file=yes -else - ac_cv_lib_c_gdk_pixbuf_new_from_file=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_avutil_avutil_version=yes +else case e in #( + e) ac_cv_lib_avutil_avutil_version=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gdk_pixbuf_new_from_file" >&5 -$as_echo "$ac_cv_lib_c_gdk_pixbuf_new_from_file" >&6; } -if test "x$ac_cv_lib_c_gdk_pixbuf_new_from_file" = xyes; then : - have_gdk_pixbuf=yes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_avutil_version" >&5 +printf "%s\n" "$ac_cv_lib_avutil_avutil_version" >&6; } +if test "x$ac_cv_lib_avutil_avutil_version" = xyes +then : + have_avutil=yes; avutil_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - # library B... - if test "$have_gdk_pixbuf" = yes; then - have_gdk_pixbuf=no +fi + +if test "$have_avcodec" = yes; then + have_avcodec=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libavcodec usability..." >&5 +printf "%s\n" "checking for libavcodec usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16390,65 +20362,65 @@ fi CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lc" >&5 -$as_echo_n "checking for gdk_pixbuf_xlib_init in -lc... " >&6; } -if ${ac_cv_lib_c_gdk_pixbuf_xlib_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcodec_version in -lavcodec" >&5 +printf %s "checking for avcodec_version in -lavcodec... " >&6; } +if test ${ac_cv_lib_avcodec_avcodec_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lavcodec `$pkg_config --libs libavcodec libswresample` $PTHREAD_LIBS + -lm $extra_ffmpeg_bs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gdk_pixbuf_xlib_init (); +char avcodec_version (void); int -main () +main (void) { -return gdk_pixbuf_xlib_init (); +return avcodec_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_gdk_pixbuf_xlib_init=yes -else - ac_cv_lib_c_gdk_pixbuf_xlib_init=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_avcodec_avcodec_version=yes +else case e in #( + e) ac_cv_lib_avcodec_avcodec_version=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gdk_pixbuf_xlib_init" >&5 -$as_echo "$ac_cv_lib_c_gdk_pixbuf_xlib_init" >&6; } -if test "x$ac_cv_lib_c_gdk_pixbuf_xlib_init" = xyes; then : - have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_version" >&5 +printf "%s\n" "$ac_cv_lib_avcodec_avcodec_version" >&6; } +if test "x$ac_cv_lib_avcodec_avcodec_version" = xyes +then : + have_avcodec=yes; avcodec_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi - fi - - if test "$have_gdk_pixbuf" = yes; then - INCLUDES="$INCLUDES $ac_gdk_pixbuf_config_cflags" - PNG_LIBS="$ac_gdk_pixbuf_config_libs" - $as_echo "#define HAVE_GDK_PIXBUF 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for gdk_pixbuf usability... no" >&5 -$as_echo "checking for gdk_pixbuf usability... no" >&6; } - fi +fi - if test "$have_gdk_pixbuf" = yes; then +if test "$have_avformat" = yes; then + have_avformat=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libavformat usability..." >&5 +printf "%s\n" "checking for libavformat usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16468,61 +20440,65 @@ $as_echo "checking for gdk_pixbuf usability... no" >&6; } CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_apply_embedded_orientation in -lc" >&5 -$as_echo_n "checking for gdk_pixbuf_apply_embedded_orientation in -lc... " >&6; } -if ${ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avformat_version in -lavformat" >&5 +printf %s "checking for avformat_version in -lavformat... " >&6; } +if test ${ac_cv_lib_avformat_avformat_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lavformat `$pkg_config --libs libavformat libswresample` $PTHREAD_LIBS + -lm $extra_ffmpeg_bs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char gdk_pixbuf_apply_embedded_orientation (); +char avformat_version (void); int -main () +main (void) { -return gdk_pixbuf_apply_embedded_orientation (); +return avformat_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation=yes -else - ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_avformat_avformat_version=yes +else case e in #( + e) ac_cv_lib_avformat_avformat_version=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" >&5 -$as_echo "$ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" >&6; } -if test "x$ac_cv_lib_c_gdk_pixbuf_apply_embedded_orientation" = xyes; then : - $as_echo "#define HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION 1" >>confdefs.h - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_version" >&5 +printf "%s\n" "$ac_cv_lib_avformat_avformat_version" >&6; } +if test "x$ac_cv_lib_avformat_avformat_version" = xyes +then : + have_avformat=yes; avformat_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi fi -############################################################################### -# -# Check for -lXft -# -############################################################################### - -have_xutf8drawstring=no +if test "$have_swscale" = yes; then + have_swscale=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libswscale usability..." >&5 +printf "%s\n" "checking for libswscale usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16542,179 +20518,65 @@ have_xutf8drawstring=no CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xutf8DrawString in -lX11" >&5 -$as_echo_n "checking for Xutf8DrawString in -lX11... " >&6; } -if ${ac_cv_lib_X11_Xutf8DrawString+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for swscale_version in -lswscale" >&5 +printf %s "checking for swscale_version in -lswscale... " >&6; } +if test ${ac_cv_lib_swscale_swscale_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lswscale `$pkg_config --libs libswscale` $PTHREAD_LIBS -lm + $extra_ffmpeg_bs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char Xutf8DrawString (); +char swscale_version (void); int -main () +main (void) { -return Xutf8DrawString (); +return swscale_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_X11_Xutf8DrawString=yes -else - ac_cv_lib_X11_Xutf8DrawString=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_swscale_swscale_version=yes +else case e in #( + e) ac_cv_lib_swscale_swscale_version=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_Xutf8DrawString" >&5 -$as_echo "$ac_cv_lib_X11_Xutf8DrawString" >&6; } -if test "x$ac_cv_lib_X11_Xutf8DrawString" = xyes; then : - have_xutf8drawstring=yes -else - true +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_swscale_version" >&5 +printf "%s\n" "$ac_cv_lib_swscale_swscale_version" >&6; } +if test "x$ac_cv_lib_swscale_swscale_version" = xyes +then : + have_swscale=yes; swscale_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" -if test "$have_xutf8drawstring" = yes ; then - $as_echo "#define HAVE_XUTF8DRAWSTRING 1" >>confdefs.h - -fi - -have_xft=no -with_xft_req=unspecified -xft_halfassed=no - -# Check whether --with-xft was given. -if test "${with_xft+set}" = set; then : - withval=$with_xft; with_xft="$withval"; with_xft_req="$withval" -else - with_xft=yes -fi - - case "$with_xft" in - yes) ;; - no) ;; - - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xft headers" >&5 -$as_echo_n "checking for Xft headers... " >&6; } - d=$with_xft/include - if test -d $d; then - X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xft libs" >&5 -$as_echo_n "checking for Xft libs... " >&6; } - d=$with_xft/lib - if test -d $d; then - X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } - fi - - # replace the directory string with "yes". - with_xft_req="yes" - with_xft=$with_xft_req - ;; - - *) - echo "" - echo "error: argument to --with-xft 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 - -if test "$with_xft" != yes -a "$with_xft" != no ; then - echo "error: must be yes or no: --with-xft=$with_xft" - exit 1 -fi - -if test "$with_xft" = yes; then - - pkgs='' - ok="yes" - pkg_check_version xft 2.1.0 - have_xft="$ok" - - if test "$have_xft" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xft includes" >&5 -$as_echo_n "checking for Xft includes... " >&6; } -if ${ac_cv_xft_config_cflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_xft_config_cflags=`$pkg_config --cflags $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xft_config_cflags" >&5 -$as_echo "$ac_cv_xft_config_cflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xft libs" >&5 -$as_echo_n "checking for Xft libs... " >&6; } -if ${ac_cv_xft_config_libs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_xft_config_libs=`$pkg_config --libs $pkgs` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_xft_config_libs" >&5 -$as_echo "$ac_cv_xft_config_libs" >&6; } - fi - - ac_xft_config_cflags=$ac_cv_xft_config_cflags - ac_xft_config_libs=$ac_cv_xft_config_libs - - if test "$have_xft" = yes; then - # - # we appear to have Xft; check for headers/libs to be sure. - # - ac_save_xft_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $ac_xft_config_cflags" - - have_xft=no - - 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_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : - have_xft=yes fi - CPPFLAGS="$ac_save_CPPFLAGS" - - CPPFLAGS="$ac_save_xft_CPPFLAGS" - fi - - if test "$have_xft" = yes; then - # we have the headers, now check for the libraries - have_xft=no - xft_halfassed=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Xft usability..." >&5 -$as_echo "checking for Xft usability..." >&6; } +if test "$have_swresample" = yes; then + have_swresample=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for libswresample usability..." >&5 +printf "%s\n" "checking for libswresample usability..." >&6; } ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16734,69 +20596,101 @@ $as_echo "checking for Xft usability..." >&6; } CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftDrawStringUtf8 in -lc" >&5 -$as_echo_n "checking for XftDrawStringUtf8 in -lc... " >&6; } -if ${ac_cv_lib_c_XftDrawStringUtf8+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $ac_xft_config_libs -lX11 -lXext -lm $LIBS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for swresample_version in -lswresample" >&5 +printf %s "checking for swresample_version in -lswresample... " >&6; } +if test ${ac_cv_lib_swresample_swresample_version+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +LIBS="-lswresample `$pkg_config --libs libswresample` $PTHREAD_LIBS -lm + $extra_ffmpeg_bs $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char XftDrawStringUtf8 (); +char swresample_version (void); int -main () +main (void) { -return XftDrawStringUtf8 (); +return swresample_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_XftDrawStringUtf8=yes -else - ac_cv_lib_c_XftDrawStringUtf8=no +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_swresample_swresample_version=yes +else case e in #( + e) ac_cv_lib_swresample_swresample_version=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_XftDrawStringUtf8" >&5 -$as_echo "$ac_cv_lib_c_XftDrawStringUtf8" >&6; } -if test "x$ac_cv_lib_c_XftDrawStringUtf8" = xyes; then : - have_xft=yes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swresample_swresample_version" >&5 +printf "%s\n" "$ac_cv_lib_swresample_swresample_version" >&6; } +if test "x$ac_cv_lib_swresample_swresample_version" = xyes +then : + have_swresample=yes; swresample_halfassed=no fi CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" - fi +fi - if test "$have_xft" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Xft usability... no" >&5 -$as_echo "checking for Xft usability... no" >&6; } - fi +have_ffmpeg=no +if test "$have_avformat" = yes -a \ + "$have_avcodec" = yes -a \ + "$have_avutil" = yes -a \ + "$have_swscale" = yes -a \ + "$have_swresample" = yes ; then + have_ffmpeg=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ffmpeg includes" >&5 +printf %s "checking for ffmpeg includes... " >&6; } +if test ${ac_cv_ffmpeg_config_cflags+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_ffmpeg_config_cflags=`$pkg_config --cflags $pkgs` ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffmpeg_config_cflags" >&5 +printf "%s\n" "$ac_cv_ffmpeg_config_cflags" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ffmpeg libs" >&5 +printf %s "checking for ffmpeg libs... " >&6; } +if test ${ac_cv_ffmpeg_config_libs+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_ffmpeg_config_libs=`$pkg_config --libs $pkgs` ;; +esac fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffmpeg_config_libs" >&5 +printf "%s\n" "$ac_cv_ffmpeg_config_libs" >&6; } + printf "%s\n" "#define HAVE_FFMPEG 1" >>confdefs.h -if test "$have_xft" = yes; then - INCLUDES="$INCLUDES $ac_xft_config_cflags" - XFT_LIBS="$ac_xft_config_libs" - XFT_SRCS='' - XFT_OBJS='' - $as_echo "#define HAVE_XFT 1" >>confdefs.h + FFMPEG_OBJS='$(FFMPEG_OBJS)' +fi +ac_ffmpeg_config_cflags=$ac_cv_ffmpeg_config_cflags +ac_ffmpeg_config_libs=$ac_cv_ffmpeg_config_libs +FFMPEG_CFLAGS="$ac_ffmpeg_config_cflags" +FFMPEG_LIBS="$ac_ffmpeg_config_libs" -else - XFT_LIBS='' - XFT_SRCS='$(UTILS_SRC)/xft.c' - XFT_OBJS='$(UTILS_BIN)/xft.o' +if test "$have_ffmpeg" = yes ; then + FFMPEG_LIBS="$FFMPEG_LIBS $extra_ffmpeg_bs" fi ############################################################################### @@ -16807,18 +20701,24 @@ fi ############################################################################### PTY_LIBS= -for ac_header in pty.h util.h sys/termios.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default" +if test "x$ac_cv_header_pty_h" = xyes +then : + printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "util.h" "ac_cv_header_util_h" "$ac_includes_default" +if test "x$ac_cv_header_util_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIL_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "sys/termios.h" "ac_cv_header_sys_termios_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_termios_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TERMIOS_H 1" >>confdefs.h + +fi ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" @@ -16838,46 +20738,54 @@ done CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5 -$as_echo_n "checking for forkpty in -lutil... " >&6; } -if ${ac_cv_lib_util_forkpty+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5 +printf %s "checking for forkpty in -lutil... " >&6; } +if test ${ac_cv_lib_util_forkpty+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char forkpty (); +char forkpty (void); int -main () +main (void) { return forkpty (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_util_forkpty=yes -else - ac_cv_lib_util_forkpty=no +else case e in #( + e) ac_cv_lib_util_forkpty=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5 -$as_echo "$ac_cv_lib_util_forkpty" >&6; } -if test "x$ac_cv_lib_util_forkpty" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5 +printf "%s\n" "$ac_cv_lib_util_forkpty" >&6; } +if test "x$ac_cv_lib_util_forkpty" = xyes +then : PTY_LIBS="-lutil" ac_have_forkpty=yes - $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h fi @@ -16906,45 +20814,53 @@ if test "$ac_have_forkpty" != yes ; then CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS` LDFLAGS=`eval eval eval eval eval eval eval eval eval echo $LDFLAGS` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lc" >&5 -$as_echo_n "checking for forkpty in -lc... " >&6; } -if ${ac_cv_lib_c_forkpty+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lc" >&5 +printf %s "checking for forkpty in -lc... " >&6; } +if test ${ac_cv_lib_c_forkpty+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ #ifdef __cplusplus extern "C" #endif -char forkpty (); +char forkpty (void); int -main () +main (void) { return forkpty (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_forkpty=yes -else - ac_cv_lib_c_forkpty=no +else case e in #( + e) ac_cv_lib_c_forkpty=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_forkpty" >&5 -$as_echo "$ac_cv_lib_c_forkpty" >&6; } -if test "x$ac_cv_lib_c_forkpty" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_forkpty" >&5 +printf "%s\n" "$ac_cv_lib_c_forkpty" >&6; } +if test "x$ac_cv_lib_c_forkpty" = xyes +then : PTY_LIBS="" - $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h fi @@ -17009,10 +20925,12 @@ fi setuid_hacks="$setuid_hacks_default" # Check whether --with-setuid-hacks was given. -if test "${with_setuid_hacks+set}" = set; then : +if test ${with_setuid_hacks+y} +then : withval=$with_setuid_hacks; setuid_hacks="$withval" -else - setuid_hacks="$setuid_hacks_default" +else case e in #( + e) setuid_hacks="$setuid_hacks_default" ;; +esac fi case "$setuid_hacks" in @@ -17020,28 +20938,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setuid hacks headers" >&5 -$as_echo_n "checking for setuid hacks headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setuid hacks headers" >&5 +printf %s "checking for setuid hacks headers... " >&6; } d=$setuid_hacks/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setuid hacks libs" >&5 -$as_echo_n "checking for setuid hacks libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setuid hacks libs" >&5 +printf %s "checking for setuid hacks libs... " >&6; } d=$setuid_hacks/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -17075,10 +20993,12 @@ record_anim_default=no record_anim="$record_anim_default" # Check whether --with-record-animation was given. -if test "${with_record_animation+set}" = set; then : +if test ${with_record_animation+y} +then : withval=$with_record_animation; record_anim="$withval" -else - record_anim="$record_anim_default" +else case e in #( + e) record_anim="$record_anim_default" ;; +esac fi case "$record_anim" in @@ -17086,28 +21006,28 @@ fi no) ;; /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for record animation headers" >&5 -$as_echo_n "checking for record animation headers... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for record animation headers" >&5 +printf %s "checking for record animation headers... " >&6; } d=$record_anim/include if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for record animation libs" >&5 -$as_echo_n "checking for record animation libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for record animation libs" >&5 +printf %s "checking for record animation libs... " >&6; } d=$record_anim/lib if test -d $d; then X_LIBS="-L$d $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $d" >&5 -$as_echo "$d" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $d" >&5 +printf "%s\n" "$d" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 -$as_echo "not found ($d: no such directory)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found ($d: no such directory)" >&5 +printf "%s\n" "not found ($d: no such directory)" >&6; } fi # replace the directory string with "yes". @@ -17132,12 +21052,13 @@ elif test "$record_anim" != no; then fi if test "$record_anim" = yes; then - if test "$have_gdk_pixbuf" != yes; then - as_fn_error $? "--with-record-animation requires GDK-Pixbuf" "$LINENO" 5 + if test "$have_ffmpeg" != yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with-record-animation requires the ffmpeg libraries" >&5 +printf "%s\n" "$as_me: WARNING: --with-record-animation requires the ffmpeg libraries" >&2;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling --with-record-animation" >&5 -$as_echo "enabling --with-record-animation" >&6; } - $as_echo "#define HAVE_RECORD_ANIM 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enabling --with-record-animation" >&5 +printf "%s\n" "enabling --with-record-animation" >&6; } + printf "%s\n" "#define HAVE_RECORD_ANIM 1" >>confdefs.h ANIM_OBJS='$(ANIM_OBJS)' ANIM_LIBS='$(ANIM_LIBS)' @@ -17188,12 +21109,8 @@ if test "$enable_pam_check_account_type" = yes; then else COMMENT_PAM_CHECK_ACCOUNT="#" fi -#if test "$have_passwd_helper" = yes; then -# PASSWD_SRCS="$PASSWD_SRCS \$(PWHELPER_SRCS)" -# PASSWD_OBJS="$PASSWD_OBJS \$(PWHELPER_OBJS)" -#fi - PASSWD_SRCS="$PASSWD_SRCS \$(PWENT_SRCS)" - PASSWD_OBJS="$PASSWD_OBJS \$(PWENT_OBJS)" +PASSWD_SRCS="$PASSWD_SRCS \$(PWENT_SRCS)" +PASSWD_OBJS="$PASSWD_OBJS \$(PWENT_OBJS)" if test "$enable_locking" = yes; then LOCK_SRCS='$(LOCK_SRCS_1) $(PASSWD_SRCS)' @@ -17272,12 +21189,12 @@ fi # Set PO_DATADIR to something sensible. # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale directory" >&5 -$as_echo_n "checking for locale directory... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale directory" >&5 +printf %s "checking for locale directory... " >&6; } if test -n "$GTK_DATADIR" ; then PO_DATADIR="$GTK_DATADIR" elif test "$have_gtk" = yes; then - PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` PO_DATADIR="$PO_DATADIR/share" fi @@ -17291,8 +21208,8 @@ if test -z "$PO_DATADIR" ; then PO_DATADIR=`echo $dd | sed 's@/X11R6/@/@'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PO_DATADIR/locale" >&5 -$as_echo "$PO_DATADIR/locale" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PO_DATADIR/locale" >&5 +printf "%s\n" "$PO_DATADIR/locale" >&6; } # canonicalize slashes. HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` @@ -17328,8 +21245,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -17345,8 +21262,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -17359,14 +21276,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -17376,15 +21293,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -17398,8 +21315,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -17416,7 +21333,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -17426,14 +21343,20 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +# Check whether --enable-year2038 was given. +if test ${enable_year2038+y} +then : + enableval=$enable_year2038; +fi + ac_config_commands="$ac_config_commands po/stamp-it" : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -17456,62 +21379,63 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -17519,13 +21443,6 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -17534,44 +21451,27 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are @@ -17582,9 +21482,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -17614,22 +21514,25 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -17637,16 +21540,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith if expr a : '\(a\)' >/dev/null 2>&1 && @@ -17672,7 +21577,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -17694,6 +21599,9 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -17707,6 +21615,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -17718,9 +21632,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -17747,7 +21661,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -17756,7 +21670,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17798,10 +21712,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 ## ----------------------------------- ## @@ -17816,7 +21732,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17847,7 +21763,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -17877,20 +21793,23 @@ $config_commands Report bugs to the package provider." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' test -n "\$AWK" || AWK=awk _ACEOF @@ -17922,15 +21841,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -17938,23 +21857,23 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -17975,7 +21894,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -17989,7 +21908,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -17997,6 +21916,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. + OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS" + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" _ACEOF @@ -18007,7 +21931,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; "jwxyz/Makefile") CONFIG_FILES="$CONFIG_FILES jwxyz/Makefile" ;; @@ -18021,7 +21945,7 @@ do "driver/XScreenSaver.ad") CONFIG_FILES="$CONFIG_FILES driver/XScreenSaver.ad" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -18030,9 +21954,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -18040,7 +21964,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -18064,7 +21988,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then ac_cr=`echo X | tr X '\015'` @@ -18220,13 +22144,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -18335,7 +22259,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -18357,33 +22281,33 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -18400,7 +22324,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -18424,9 +22348,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -18463,6 +22387,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -18482,8 +22411,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -18496,7 +22425,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -18517,6 +22446,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ @@ -18526,9 +22456,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -18544,34 +22474,144 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac ;; + "po-directories":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) + useit=yes + ;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 @@ -18624,8 +22664,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi ############################################################################### @@ -18634,6 +22674,8 @@ fi # ############################################################################### +CONF_STATUS=0 + warn_prefix_1=" Warning:" warn_prefix_2=" Note:" warn_prefix="$warn_prefix_1" @@ -18691,65 +22733,81 @@ if test "$ac_prog_cc_no_pthread" ; then warn2 "support POSIX threads." echo "" warn2 "If you have multiple CPU cores, try CC=$PTHREAD_CC." + CONF_STATUS=1 elif test "$with_pthread_req" = yes -a "$have_pthread" = no ; then warn 'POSIX threads were requested, but were not found.' + CONF_STATUS=1 fi if test "$with_sgi_req" = yes -a "$have_sgi" = no ; then warn 'The SGI saver extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xidle_req" = yes -a "$have_xidle" = no ; then warn 'The XIdle extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_mit_req" = yes -a "$have_mit" = no ; then warn 'The MIT-SCREEN-SAVER extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xshm_req" = yes -a "$have_xshm" = no ; then warn 'The XSHM extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xdbe_req" = yes -a "$have_xdbe" = no ; then warn 'The DOUBLE-BUFFER extension was requested, but was not found.' + CONF_STATUS=1 fi #if test "$with_xcomposite_req" = yes -a "$have_xcomposite" = no ; then # warn 'The XCOMPOSITE extension was requested, but was not found.' +# CONF_STATUS=1 #fi if test "$with_xkb_req" = yes -a "$have_xkb" = no ; then warn 'The X Keyboard extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_sgivc_req" = yes -a "$have_sgivc" = no ; then warn 'The SGI-VIDEO-CONTROL extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_dpms_req" = yes -a "$have_dpms" = no ; then warn 'The DPMS extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xinerama_req" = yes -a "$have_xinerama" = no ; then warn 'The Xinerama extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xf86vmode_req" = yes -a "$have_xf86vmode" = no ; then warn 'The XF86VMODE extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_randr_req" = yes -a "$have_randr" = no ; then warn 'The RANDR extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_proc_interrupts_req" = yes -a "$have_proc_interrupts" = no; then warn "Checking of /proc/interrupts was requested, but it's bogus." + CONF_STATUS=1 fi if test "$pkg_config" = false ; then warnL 'The "pkg-config" program was not found. Without that,' warn2 "detection of the various GTK libraries won't work." + CONF_STATUS=1 else pkgerr=`$pkg_config --list-all 2>&1 >/dev/null` if test "x$pkgerr" != "x" ; then @@ -18758,20 +22816,20 @@ else warn2 "The errors are:" echo '' echo "$pkgerr" | sed 's/^/ > /g' + CONF_STATUS=1 fi fi if test "$gtk_halfassed" != no ; then - warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK can't be used." + warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK" + warn2 "can't be used." + CONF_STATUS=1 fi motif_warn2() { - warn2 'Though the Motif front-end to xscreensaver is still' - warn2 'maintained, it is no longer being updated with new' - warn2 'features: all new development on the xscreensaver-settings' - warn2 'program is happening in the GTK version, and not in the' - warn2 'Motif version. It is recommended that you build against' - warn2 'GTK instead of Motif. See .' + warn2 "The Motif version of \`xscreensaver-settings' is missing many" + warn2 'features. It is strongly recommended that you build the GTK' + warn2 'version instead.' } if test "$have_motif" = no -a "$have_gtk" = no; then @@ -18781,9 +22839,11 @@ if test "$have_motif" = no -a "$have_gtk" = no; then warn2 "\`xscreensaver-settings' program requires one of these." echo '' motif_warn2 + CONF_STATUS=1 else warnL "The GTK libraries do not seem to be available; the" warn2 "\`xscreensaver-settings' program requires them." + CONF_STATUS=1 # echo '' # warn2 'You can use Motif or Lesstif instead of GTK (use the' # warn2 "\`--with-motif' option) but that is NOT recommended." @@ -18793,19 +22853,23 @@ if test "$have_motif" = no -a "$have_gtk" = no; then elif test "$with_motif_req" = yes -a "$have_motif" = no ; then warnL "Use of Motif was requested, but it wasn't found;" warn2 "Gtk will be used instead." + CONF_STATUS=1 elif test "$with_gtk_req" = yes -a "$have_gtk" = no ; then warnL "Use of Gtk was requested, but it wasn't found." + CONF_STATUS=1 fi if test "$ac_cv_libxt" != yes ; then warnL 'The Xt library was not found. It is required.' + CONF_STATUS=1 fi if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then warn "GTK is being used, but the GDK-Pixbuf library and/or" warn2 "headers were not found. That can't be good. Please" warn2 "install the GDK-Pixbuf development kit and re-configure." + CONF_STATUS=1 fi if test "$have_motif" = yes -a "$have_lesstif" = yes ; then @@ -18823,6 +22887,7 @@ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then warn2 "use with XScreenSaver; it is strongly recommended" warn2 "that you upgrade to at least version $preferred_lesstif!" warn2 "See ." + CONF_STATUS=1 fi fi @@ -18840,10 +22905,10 @@ halfassery() { if test "$with_gdk_pixbuf_req" = yes -a "$have_gdk_pixbuf" = no; then warnL 'Use of GDK-Pixbuf was requested, but it was not found.' + CONF_STATUS=1 fi -if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes || \ - test "$have_gdk_pixbuf" = no ; then +if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes ; then if test "$with_gdk_pixbuf_req" = yes ; then true @@ -18865,9 +22930,29 @@ if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes || \ warn2 'configure.' fi +#if test "$have_gdk_pixbuf" = yes -a "$have_gdk_pixbuf_xlib" = no ; then +# +# warnL 'The GDK-Pixbuf-Xlib library was not found.' +# +# if test "$gdk_pixbuf_xlib_halfassed" = yes ; then halfassery ; fi +# if test "$have_png" = yes ; then +# echo '' +# warn2 'The PNG library is being used instead.' +# fi +# +# echo '' +# warn2 'Some of the demos will not use images as much as they could.' +# warn2 'You should consider installing GDK-Pixbuf-Xlib and re-running' +# warn2 'configure.' +# echo '' +# warn2 "Recently, some distros have stopped distributing" +# warn2 "GDK-Pixbuf-Xlib entirely. So good luck with that." +#fi + if test "$have_jpeg" = no ; then if test "$with_jpeg_req" = yes ; then warnL 'Use of libjpeg was requested, but it was not found.' + CONF_STATUS=1 elif test "$with_jpeg_req" = no ; then warnL 'The JPEG library is not being used.' else @@ -18880,6 +22965,7 @@ if test "$have_jpeg" = no ; then warn2 "This means that it won't be possible for the image-manipulating" warn2 "display modes to load files from disk; and it also means that" warn2 "the \`webcollage' program will be much slower." + CONF_STATUS=1 else warn2 "This means the \`webcollage' program will be much slower." fi @@ -18888,6 +22974,7 @@ fi if test "$have_png" = no ; then if test "$with_png_req" = yes ; then warnL 'Use of libpng was requested, but it was not found.' + CONF_STATUS=1 elif test "$with_png_req" = no ; then warnL 'The PNG library is not being used.' else @@ -18896,16 +22983,19 @@ if test "$have_png" = no ; then if test "$png_halfassed" = yes ; then halfassery ; fi warn2 "Many things aren't going to work right." + CONF_STATUS=1 fi if test "$have_xinput" = no ; then warnL 'The XInput2 library was not found. It is required.' if test "$xinput_halfassed" = yes ; then halfassery ; else echo '' ; fi + CONF_STATUS=1 fi if test "$have_xft" = no ; then warnL 'The XFreeType library was not found. It is required.' if test "$xft_halfassed" = yes ; then halfassery ; else echo '' ; fi + CONF_STATUS=1 fi if test "$have_systemd" = no ; then @@ -18913,9 +23003,11 @@ if test "$have_systemd" = no ; then if test "$systemd_too_old" = yes ; then warnL "The systemd library is too old." systemd_warned=yes + CONF_STATUS=1 elif test "$with_systemd_req" = yes ; then warnL "Use of systemd was requested, but it was not found." systemd_warned=yes + CONF_STATUS=1 elif test "$ac_macosx" = yes; then true elif test "$with_systemd_req" = no ; then @@ -18929,6 +23021,7 @@ if test "$have_systemd" = no ; then if test "$systemd_halfassed" = yes ; then halfassery systemd_warned=yes + CONF_STATUS=1 fi if test "$systemd_warned" = yes; then @@ -18942,11 +23035,14 @@ fi if test "$have_gl" = no ; then if test "$with_gl_req" = yes ; then - warnL 'Use of GL was requested, but it was not found.' + warnL 'The OpenGL 3D library is required, but it was not found.' + CONF_STATUS=1 elif test "$with_gl_req" = no ; then noteL 'The OpenGL 3D library is not being used.' + CONF_STATUS=1 else noteL 'The OpenGL 3D library was not found.' + CONF_STATUS=1 fi if test "$gl_halfassed" = yes ; then @@ -18959,9 +23055,7 @@ if test "$have_gl" = no ; then echo '' warn2 'Those demos which use 3D will not be built or installed.' - warn2 'You might want to consider installing OpenGL and' - warn2 're-running configure.' - + warn2 'That is most of them.' fi if test "$have_gl" = yes -a "$have_gle" = no ; then @@ -18974,6 +23068,7 @@ if test "$have_gl" = yes -a "$have_gle" = no ; then noteL 'Use of the GLE (GL Extrusion) library was requested, but' warn2 'it was not found (though the OpenGL library was found, and' warn2 'is being used.)' + CONF_STATUS=1 elif test "$with_gle_req" = no ; then noteL 'The OpenGL Library is being used, but the GLE (GL Extrusion)' warn2 'library is not.' @@ -18995,28 +23090,33 @@ fi if test "$with_readdisplay_req" = yes -a "$have_readdisplay" = no ; then warn 'Use of XReadDisplay was requested, but it was not found.' + CONF_STATUS=1 fi if test "$with_kerberos_req" = yes -a "$have_kerberos" = no ; then warn 'Use of Kerberos was requested, but it was not found.' + CONF_STATUS=1 fi if test "$with_pam_req" = yes -a "$have_pam" = no ; then warn 'Use of PAM was requested, but it was not found.' -elif test "$have_pam" = no ; then + CONF_STATUS=1 +elif test "$have_pam" = no -a "$enable_locking" = yes ; then if test -d /etc/pam.d -o -f /etc/pam.conf ; then warn "Your system seems to have PAM, but PAM is not being used." warn2 "That is probably not going to work out well." - + CONF_STATUS=1 fi fi if test "$with_shadow_req" = yes -a "$have_shadow" = no ; then warn 'Use of shadow passwords was requested, but they were not found.' + CONF_STATUS=1 fi if test "$setcap_hacks_req" = yes -a "$have_libcap" = no ; then warn 'Use of libcap was requested, but it was not found.' + CONF_STATUS=1 fi if test "$ac_macosx" = yes -a "$enable_locking" = yes ; then @@ -19024,6 +23124,17 @@ if test "$ac_macosx" = yes -a "$enable_locking" = yes ; then warn2 "THIS DOES NOT WORK! Don't do this!" fi +if test "$have_jwzgles" = yes ; then + warn "Do not use --with-gles unless you are sure that you know" + warn2 "what you are doing! It is not recommended on normal X11" + warn2 "systems." + + if test "$have_egl" = no; then + warn2 "" + warn2 "Using --with-gles and --with-glx probably won't work." + fi +fi + # You are in a twisty maze of namespaces and syntaxes, all alike. # Expand all of these as the Makefile will probably expand them. # Fuck the skull of Unix. @@ -19080,7 +23191,7 @@ if test \! -z "$rpm_vers" ; then pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` - pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)\.ttf$@\1@p'` + pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi @@ -19109,7 +23220,7 @@ if test \! -z "$deb_vers" ; then pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` - pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)\.ttf$@\1@p'` + pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'` if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi @@ -19161,3 +23272,6 @@ echo " Configuration: ${HACK_CONF_DIR}/$confdir_err" echo " Extra Fonts: ${FONT_DIR}$fontdir_err" echo " App Defaults: ${APPDEFAULTS}/$addir_err" echo "" + +exit $CONF_STATUS + diff --git a/configure.ac b/configure.ac index c3f0b5b..dc2ad2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,18 @@ -# configure.in --- xscreensaver, Copyright © 1997-2021 Jamie Zawinski. +# configure.in --- xscreensaver, Copyright © 1997-2023 Jamie Zawinski. # -# Note: upgrading past 2.69_5 breaks the world. +# Note: upgrading past 2.69_5 breaks the world, mostly the po/ shitshow. AC_PREREQ([2.69]) +# If you accidentally upgraded autoconf, re-install the 2019-08-23 version: +# +# git clone --single-branch https://github.com/macports/macports-ports.git +# cd macports-ports/ +# git checkout 1d802b48a7b00b6c154e971119a2a309550c79c2 +# cd devel/autoconf +# sudo port install +# port installed autoconf + AC_INIT AC_CONFIG_SRCDIR([driver/subprocs.c]) AC_CONFIG_HEADERS([config.h]) @@ -11,6 +20,11 @@ AC_CONFIG_HEADERS([config.h]) echo "current directory: `pwd`" echo "command line was: $0 $@" +if ! test -z "$ac_unrecognized_opts" ; then + echo "" >&2 + exit 2 +fi + ############################################################################### # # Autoheader stuff @@ -18,7 +32,7 @@ echo "command line was: $0 $@" ############################################################################### AH_TOP([ -/* xscreensaver, Copyright © 1991-2021 Jamie Zawinski. +/* xscreensaver, Copyright © 1991-2022 Jamie Zawinski. * Generate this file by running 'configure' rather than editing it by hand. */ ]) @@ -62,9 +76,6 @@ AH_TEMPLATE([HAVE_LIBCAP], AH_TEMPLATE([XPointer], [Stare into the void.]) -AH_TEMPLATE([HAVE_READ_DISPLAY_EXTENSION], - [Define this if you have the SGI XReadDisplay extension.]) - AH_TEMPLATE([HAVE_XINPUT], [Define this if you have the XInput2 extension.]) @@ -126,6 +137,9 @@ AH_TEMPLATE([HAVE_XKB], AH_TEMPLATE([HAVE_LIBSYSTEMD], [Define this if you have libsystemd.]) +AH_TEMPLATE([HAVE_LIBELOGIND], + [Define this if you have libelogind.]) + AH_TEMPLATE([HAVE_PROC_INTERRUPTS], [Define this if you have a Linux-like /proc/interrupts file which can be examined to determine when keyboard activity has @@ -146,27 +160,15 @@ AH_TEMPLATE([HAVE_XMCOMBOBOX], [Define this if you have the XmComboBox Motif 2.0 widget.]) AH_TEMPLATE([HAVE_GTK], - [Define this if you have Gtk]) -AH_TEMPLATE([HAVE_GTK2], [Define this if you have Gtk 2.x.]) -AH_TEMPLATE([HAVE_CRAPPLET], - [Define this if you have Gnome and want to build support for the - xscreensaver control panel in the Gtk 1.x Gnome Control Center.]) - -AH_TEMPLATE([HAVE_CRAPPLET_IMMEDIATE], - [Define this if HAVE_CRAPPLET is defined, and the function - capplet_widget_changes_are_immediate is available.]) - AH_TEMPLATE([HAVE_XML], [Define this if you have the XML library.]) -AH_TEMPLATE([HAVE_OLD_XML_HEADERS], - [Define this if you the XML library headers lack the - gnome-xml/libxml symlink.]) - AH_TEMPLATE([HAVE_GDK_PIXBUF], - [Define this if you have GDK_Pixbuf.]) + [Define this if you have GDK-Pixbuf.]) +AH_TEMPLATE([HAVE_GDK_PIXBUF_XLIB], + [Define this if you have GDK-Pixbuf-Xlib.]) AH_TEMPLATE([HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION], [Define this if you have the gdk_pixbuf_apply_embedded_orientation @@ -221,6 +223,9 @@ AH_TEMPLATE([HAVE_GLE3], [Define this if GL Extrusion is version 3.]) +AH_TEMPLATE([HAVE_FFMPEG], + [Define this if you have the ffmpeg libraries.]) + AH_TEMPLATE([HAVE_RECORD_ANIM], [Define this to enable recording of videos.]) @@ -271,9 +276,6 @@ AH_TEMPLATE([HAVE_ADJUNCT_PASSWD], AH_TEMPLATE([HAVE_HPUX_PASSWD], [Define this for HPUX so-called "Secure Passwords".]) -#AH_TEMPLATE([PASSWD_HELPER_PROGRAM], -# [Define this to use a third-party password helper program.]) - AH_TEMPLATE([HAVE_SYSLOG], [Define this if you have openlog/syslog/closelog.]) @@ -305,7 +307,17 @@ AC_DEFUN([AC_CHECK_GCC_ARG], ac_cv_gcc_accepts_[$1], [rm -rf conftest.$ac_ext touch conftest.$ac_ext - if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ + # + # July 2023: With gcc 10.2.1 We get the "unrecognized" warning with + # "-Wlanguage-extension-token" but no warning is printed with + # "-Wno-language-extension-token"... And then later other unrelated + # warnings will volunteer that "unrecognized command-line option + # ‘-Wno-language-extension-token’ may have been intended to silence + # earlier diagnostics". + # + without_no=`echo $2 | sed s/Wno-/W/` + if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ grep unrecognized >/dev/null ); then ac_cv_gcc_accepts_[$1]=no else @@ -328,22 +340,14 @@ AC_DEFUN([AC_PROG_CC_ANSI], if test -z "$GCC"; then # not using GCC - AC_MSG_CHECKING(how to request ANSI compilation) + AC_MSG_CHECKING(for extra compiler flags) case "$host" in - *-hpux* ) - AC_MSG_RESULT(HPUX: adding -Ae) - CC="$CC -Ae" - ;; *-aix* ) - AC_MSG_RESULT(AIX: adding -qlanglvl=ansi -qhalt=e) + AC_MSG_RESULT(AIX: adding -qhalt=e) CC="$CC -qlanglvl=ansi -qhalt=e" ;; - *-dec-* ) - AC_MSG_RESULT(DEC: adding -std1 -ieee) - CC="$CC -std1" - ;; *) - AC_MSG_RESULT(no idea) + AC_MSG_RESULT(none) ;; esac else @@ -361,26 +365,19 @@ AC_DEFUN([AC_PROG_CC_ANSI], # extensions (such as allowing C++ style "//" comments in C code, and # declarations after statements) were not supported by non-gcc compilers # for many years, so we continued to use "-std=c89" to prevent those - # GNU-isms from sneaking in to the code. Well, these days various - # vendors have sloppily allowed non-ANSI syntax to slip into their - # library header files. GTK and OpenGL have been major offenders in this - # way. So... as of 2021, I guess we are forced to use "-std=gnu89", to - # allow those extensions, and hope that the warnings generated by - # "-pedantic" are heeded. + # GNU-isms from sneaking in to the code. + # + # These days XScreenSaver uses C99, which supports "//" comments and + # declarations after statements. # - AC_CHECK_GCC_ARG(gnu89, -std=gnu89) + AC_CHECK_GCC_ARG(gnu99, -std=gnu99) AC_CHECK_GCC_ARG(pedantic, -pedantic) AC_CHECK_GCC_ARG(Wall, -Wall) AC_CHECK_GCC_ARG(wnested_externs, -Wnested-externs) AC_CHECK_GCC_ARG(wstrict_prototypes, -Wstrict-prototypes) AC_CHECK_GCC_ARG(wmissing_prototypes, -Wmissing-prototypes) - AC_CHECK_GCC_ARG(declaration_after, -Wdeclaration-after-statement) # "string length is greater than ISO C89 compilers required to support" AC_CHECK_GCC_ARG(no_overlength_strings, -Wno-overlength-strings) - # Ignore warnings about using "inline" - AC_CHECK_GCC_ARG(no_language_ext_token, -Wno-language-extension-token) - # Xlib headers use named variadic macros. - AC_CHECK_GCC_ARG(no_variadic_macros, -Wno-variadic-macros) fi ]) @@ -756,7 +753,8 @@ AC_DEFUN([AC_X_RANDOM_PATHS], # 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 + 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 @@ -1051,8 +1049,6 @@ ac_original_cc=$CC AC_PROG_CC AC_PROG_CC_ANSI AC_PROG_CPP -AC_C_CONST -AC_C_INLINE AC_EXEEXT # stuff for Makefiles @@ -1125,6 +1121,9 @@ AC_MSG_RESULT($ac_macosx) # ############################################################################### +# Note: In the decades since I wrote this, PKG_CHECK_MODULES came into +# existence, which could probably simplify the following quite a bit. + AC_PATH_TOOL(pkg_config, pkg-config) if test -z "$pkg_config" ; then @@ -1182,9 +1181,19 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", AC_SUBST(GETTEXT_PACKAGE) ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" -AM_GLIB_GNU_GETTEXT +AM_GNU_GETTEXT([external]) MKINSTALLDIRS="$INSTALL_DIRS" +# The library is there, but neither $INTLLIBS nor $LIBINTL are getting set. +if test -z "$INTLLIBS" ; then INTLLIBS="$LIBINTL" ; fi +if test -z "$INTLLIBS" ; then + AC_CHECK_X_LIB(intl, gettext, [INTLLIBS="-lintl"]) +fi +LIBINTL="$INTLLIBS" +AC_SUBST(INTLLIBS) +AC_SUBST(LIBINTL) +AC_SUBST(CATALOGS) + ############################################################################### # @@ -1436,7 +1445,8 @@ if test "$with_xinerama" = yes; then # if that failed, look in -lXinerama (this is where it is in XFree86 4.1.) if test "$have_xinerama" = no; then AC_CHECK_X_LIB(Xinerama, XineramaQueryScreens, - [have_xinerama=yes; XINERAMA_LIBS="-lXinerama"], + [have_xinerama=yes; + XINERAMA_LIBS="$XINERAMA_LIBS -lXinerama"], [true], -lXext -lX11) fi fi @@ -1493,7 +1503,8 @@ if test "$with_randr" = yes; then # if that failed, look in -lXrandr if test "$have_randr" = no; then AC_CHECK_X_LIB(Xrandr, XRRGetScreenInfo, - [have_randr=yes; SAVER_LIBS="$SAVER_LIBS -lXrandr $xrender_libs"], + [have_randr=yes; + XINERAMA_LIBS="$XINERAMA_LIBS -lXrandr $xrender_libs"], [true], $xrender_libs -lXext -lX11) fi fi @@ -1537,7 +1548,7 @@ have_xinput=no with_xinput_req=unspecified xinput_halfassed=no AC_ARG_WITH(xinput-ext, -[ --with-xinput-ext Include support for the XInput2 extension.], +[ --with-xinput-ext The XInput2 extension is required.], [with_xinput="$withval"; with_xinput_req="$withval"], [with_xinput=yes]) HANDLE_X_PATH_ARG(with_xinput, --with-xinput-ext, XINPUT) @@ -1563,6 +1574,10 @@ if test "$with_xinput" = yes; then AC_DEFINE(HAVE_XINPUT) fi +elif test "$with_xinput" = no; then + echo "error: --without-xinput-ext is not supported." + exit 1 + elif test "$with_xinput" != no; then echo "error: must be yes or no: --with-xinput-ext=$with_xinput" exit 1 @@ -1777,31 +1792,6 @@ elif test "$with_sgivc" != no; then fi -############################################################################### -# -# Check for the SGI XReadDisplay server extension. -# -############################################################################### - -have_readdisplay=no -with_readdisplay_req=unspecified -AC_ARG_WITH(readdisplay, -[ --with-readdisplay Include support for the SGI XReadDisplay extension.], - [with_readdisplay="$withval"; with_readdisplay_req="$withval"], - [with_readdisplay=$ac_irix]) - -HANDLE_X_PATH_ARG(with_readdisplay, --with-readdisplay, XReadDisplay) - -if test "$with_readdisplay" = yes; then - AC_CHECK_X_HEADER(X11/extensions/readdisplay.h, - AC_DEFINE(HAVE_READ_DISPLAY_EXTENSION),, - [#include ]) -elif test "$with_readdisplay" != no; then - echo "error: must be yes or no: --with-readdisplay=$with_readdisplay" - exit 1 -fi - - ############################################################################### # # Check for the XSHM server extension. @@ -2117,7 +2107,8 @@ if test "$with_systemd" = yes; then have_systemd=no systemd_halfassed=yes AC_MSG_RESULT(checking for libsystemd usability...) - AC_CHECK_X_LIB(c, sd_bus_open_system, + # sd_bus_track_count_name was added in some later version of systemd. + AC_CHECK_X_LIB(c, sd_bus_track_count_name, [have_systemd=yes; systemd_halfassed=no],, $ac_systemd_config_libs -lX11 -lXext -lm) fi @@ -2138,6 +2129,87 @@ else fi +############################################################################### +# +# Check for -lelogind, a stripped down subset of systemd. +# +############################################################################### + +have_elogind=no +with_elogind_req=unspecified +elogind_halfassed=no +elogind_too_old=no +AC_ARG_WITH(elogind, +[ --with-elogind Use elogind instead of systemd.], + [with_elogind="$withval"; with_elogind_req="$withval"], + [with_elogind=yes]) + +HANDLE_X_PATH_ARG(with_elogind, --with-elogind, elogind) + +if test "$with_elogind" != yes -a "$with_elogind" != no ; then + echo "error: must be yes or no: --with-elogind=$with_elogind" + exit 1 +fi + +if test "$with_elogind" = yes; then + + pkgs='' + ok="yes" + pkg_check_version libelogind 221 + have_elogind="$ok" + + if test "$have_elogind" = no; then + if $pkg_config --exists libelogind ; then + elogind_too_old=yes + fi + fi + + if test "$have_elogind" = yes; then + AC_CACHE_CHECK([for libelogind includes], ac_cv_elogind_config_cflags, + [ac_cv_elogind_config_cflags=`$pkg_config --cflags $pkgs`]) + AC_CACHE_CHECK([for libelogind libs], ac_cv_elogind_config_libs, + [ac_cv_elogind_config_libs=`$pkg_config --libs $pkgs`]) + fi + + ac_elogind_config_cflags=$ac_cv_elogind_config_cflags + ac_elogind_config_libs=$ac_cv_elogind_config_libs + + if test "$have_elogind" = yes; then + # + # we appear to have libelogind; check for headers/libs to be sure. + # + ac_save_elogind_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_elogind_config_cflags" + + have_elogind=no + AC_CHECK_X_HEADER(elogind/sd-bus.h, [have_elogind=yes]) + + CPPFLAGS="$ac_save_elogind_CPPFLAGS" + fi + + if test "$have_elogind" = yes; then + # we have the headers, now check for the libraries + have_elogind=no + elogind_halfassed=yes + AC_MSG_RESULT(checking for libelogind usability...) + AC_CHECK_X_LIB(c, sd_bus_track_count_name, + [have_elogind=yes; elogind_halfassed=no],, + $ac_elogind_config_libs -lX11 -lXext -lm) + fi + + if test "$have_elogind" = no; then + AC_MSG_RESULT(checking for libelogind usability... no) + fi +fi + +if test "$have_elogind" = yes; then + INCLUDES="$INCLUDES $ac_elogind_config_cflags" + EXES_SYSTEMD='$(EXES_SYSTEMD)' + SYSTEMD_LIBS="$ac_elogind_config_libs" + AC_DEFINE(HAVE_LIBELOGIND) +fi + + ############################################################################### # # The --enable-locking option @@ -2219,7 +2291,7 @@ AC_ARG_WITH(pam,[ Screen Locking Options: --disable-locking Do not allow locking of the display at all. - --with-pam Include support for PAM (Pluggable Auth Modules).], + --with-pam Use Pluggable Authentication Modules.], [with_pam="$withval"; with_pam_req="$withval"],[with_pam=$with_pam_default]) AC_ARG_WITH([pam_service_name], @@ -2227,12 +2299,13 @@ AC_ARG_WITH([pam_service_name], --enable-pam-account Whether PAM should check the result of account modules when authenticating. Only do this if you have "account" modules configured on your system. - --enable-root-passwd Allow the root passwd to unlock, if not using PAM.], + --enable-root-passwd Allow the root password to unlock, if not using PAM.], [pam_service_name="$withval"],[pam_service_name="xscreensaver"]) AC_ARG_ENABLE(pam-check-account-type, [], # This is documented elsewhere because of --enable/--with option sorting. - [enable_pam_check_account_type="$enableval"],[enable_pam_check_account_type=no]) + [enable_pam_check_account_type="$enableval"], + [enable_pam_check_account_type=no]) if test "$enable_pam_check_account_type" = yes ; then AC_DEFINE(PAM_CHECK_ACCOUNT_TYPE) true @@ -2276,12 +2349,12 @@ if test "$enable_locking" = yes -a "$with_pam" = yes; then #include #include ], [pam_handle_t *pamh = 0; - char *s = pam_strerror(pamh, PAM_SUCCESS);], + const char *s = pam_strerror(pamh, PAM_SUCCESS);], [ac_pam_strerror_args=2], [AC_TRY_X_COMPILE([#include #include #include ], - [char *s = + [const char *s = pam_strerror(PAM_SUCCESS);], [ac_pam_strerror_args=1], [ac_pam_strerror_args=0])]) @@ -2624,47 +2697,6 @@ if test "$enable_locking" = yes ; then fi -############################################################################### -# -# Strongly suspect that this hasn't been used in years. Also, the same -# goal is achieved by xscreensaver-auth in XScreenSaver 6. -- jwz, 2021 -# -# Check for external password helper -# On SuSE in 1993, instead of having xscreensaver be a setuid program, -# they fork an external program that takes the password on stdin, and -# returns true if that password is a valid one. Then only that smaller -# program needs to be setuid. -# -# (Note that this external program is not a GUI: the GUI is still -# all in xscreensaver itself; the external program just does auth.) -# -############################################################################### - -#have_passwd_helper=no -#with_passwd_helper_req=unspecified -# -#AC_ARG_WITH(passwd-helper, -#[ --with-passwd-helper Include support for external password verification.], -# [with_passwd_helper="$withval"; with_passwd_helper_req="$withval"],[with_passwd_helper=no]) -## no HANDLE_X_PATH_ARG for this one -# -#if test "$enable_locking" = no ; then -# with_passwd_helper_req=no -# with_passwd_helper=no -#fi -# -#case "$with_passwd_helper" in -# ""|no) : ;; -# /*) -# AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper") -# have_passwd_helper=yes;; -# *) -# echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2 -# exit 1 -#esac - - - # Most of the above shadow mechanisms will have set setuid_auth to yes, # if they were found. But, on some systems, we need setuid even when # using plain old vanilla passwords. @@ -2732,13 +2764,14 @@ gtk_halfassed=no if test "$with_gtk" = yes; then have_gtk=no + pkgs='' ok="yes" - pkg_check_version gtk+-2.0 2.22.0 ; ac_gtk_version_string="$vers" - pkg_check_version gmodule-2.0 2.0.0 - pkg_check_version libxml-2.0 2.4.6 - pkg_check_version gdk-pixbuf-2.0 2.0.0 - pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 + pkg_check_version gtk+-3.0 3.0.0 ; ac_gtk_version_string="$vers" + pkg_check_version gmodule-2.0 2.0.0 + pkg_check_version libxml-2.0 2.4.6 + pkg_check_version gdk-pixbuf-2.0 2.0.0 have_gtk="$ok" + gtk_pkgs="$pkgs" if test "$have_gtk" = no; then if test -n "$ac_gtk_version_string" ; then @@ -2759,7 +2792,7 @@ if test "$with_gtk" = yes; then GTK_DATADIR="" if test "$have_gtk" = yes; then - GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` GTK_DATADIR="$GTK_DATADIR/share" fi @@ -2767,9 +2800,15 @@ if test "$with_gtk" = yes; then INCLUDES="$INCLUDES $ac_gtk_config_cflags" GTK_LIBS="$GTK_LIBS $ac_gtk_config_libs" AC_DEFINE(HAVE_GTK) - AC_DEFINE(HAVE_GTK2) AC_DEFINE(HAVE_XML) fi + + if test "$have_gtk" = yes; then + AC_CACHE_CHECK([for Glib resource compiler], ac_cv_glib_res, + [ac_cv_glib_res=`$pkg_config --variable=glib_compile_resources gio-2.0`]) + GLIB_COMPILE_RESOURCES="$ac_cv_glib_res" + fi + fi @@ -3295,7 +3334,6 @@ AC_ARG_WITH(gl, [ Graphics Options: - --with-gl Build those demos which depend on OpenGL. --with-gles Emulate OpenGL 1.3 in terms of OpenGL ES 1.x.], [with_gl="$withval"; with_gl_req="$withval"],[with_gl=yes]) @@ -3451,6 +3489,13 @@ if test "$with_gl" = yes; then fi +elif test "$with_gl" = no; then + echo "error: --without-opengl is not supported." + # You may be saying "but but but microcontrollers" -- bullshit. + # It is the Twenty-First Century, and in This Modern World, every + # extant microcontroller is more performant than the desktop + # computers on which I developed most of the OpenGL hacks. + exit 1 elif test "$with_gl" != no; then echo "error: must be yes or no: --with-gl=$with_gl" @@ -3714,6 +3759,7 @@ fi ############################################################################### have_gdk_pixbuf=no +have_gdk_pixbuf_xlib=no with_gdk_pixbuf_req=unspecified AC_ARG_WITH(pixbuf, [ --with-pixbuf Include support for the GDK-Pixbuf library, which @@ -3744,11 +3790,10 @@ if test "$with_gdk_pixbuf" = yes; then pkgs='' ok="yes" - - pkg_check_version gdk-pixbuf-2.0 2.0.0 - pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 - pkg_check_version gio-2.0 2.0.0 + pkg_check_version gdk-pixbuf-2.0 2.0.0 + pkg_check_version gio-2.0 2.0.0 have_gdk_pixbuf="$ok" + pixbuf_pkgs="$pkgs" if test "$have_gdk_pixbuf" = yes; then AC_CACHE_CHECK([for gdk-pixbuf includes], ac_cv_gdk_pixbuf_config_cflags, @@ -3767,50 +3812,17 @@ if test "$with_gdk_pixbuf" = yes; then # ac_save_gdk_pixbuf_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_gdk_pixbuf_config_cflags" - have_gdk_pixbuf=no - - # check for header A... AC_CHECK_X_HEADER(gdk-pixbuf/gdk-pixbuf.h, [have_gdk_pixbuf=yes]) - - # if that worked, check for header B... - if test "$have_gdk_pixbuf" = yes; then - have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes - AC_CHECK_X_HEADER(gdk-pixbuf/gdk-pixbuf-xlib.h, - [have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no]) - - # yay, it has a new name in Gtk 2.x... - if test "$have_gdk_pixbuf" = no; then - have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes - AC_CHECK_X_HEADER(gdk-pixbuf-xlib/gdk-pixbuf-xlib.h, - [have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no]) - fi - fi CPPFLAGS="$ac_save_gdk_pixbuf_CPPFLAGS" fi if test "$have_gdk_pixbuf" = yes; then # we have the headers, now check for the libraries have_gdk_pixbuf=no - gdk_pixbuf_halfassed=yes - AC_MSG_RESULT(checking for gdk_pixbuf usability...) - - # library A... AC_CHECK_X_LIB(c, gdk_pixbuf_new_from_file, [have_gdk_pixbuf=yes],, $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm) - # library B... - if test "$have_gdk_pixbuf" = yes; then - have_gdk_pixbuf=no - AC_CHECK_X_LIB(c, gdk_pixbuf_xlib_init, - [have_gdk_pixbuf=yes - gdk_pixbuf_halfassed=no],, - $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm) - fi fi if test "$have_gdk_pixbuf" = yes; then @@ -3829,6 +3841,69 @@ if test "$with_gdk_pixbuf" = yes; then fi +# Now that we have checked for gdk_pixbuf, check for gdk_pixbuf_xlib +# separately, since it has fallen out of fashion in recent years. +# +#have_gdk_pixbuf_xlib=no +#gdk_pixbuf_xlib_halfassed=no +#if test "$with_gdk_pixbuf" = yes -a "$have_gdk_pixbuf" = yes; then +# +# have_gdk_pixbuf_xlib=no +# pkgs="$pixbuf_pkgs" +# ok="yes" +# pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 +# pkg_check_version gdk-pixbuf-2.0 2.0.0 +# have_gdk_pixbuf_xlib="$ok" +# pixbuf_xlib_pkgs="$pkgs" +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# AC_CACHE_CHECK([for gdk-pixbuf-xlib includes], +# ac_cv_gdk_pixbuf_xlib_config_cflags, +# [ac_cv_gdk_pixbuf_xlib_config_cflags=`$pkg_config --cflags $pkgs`]) +# AC_CACHE_CHECK([for gdk-pixbuf-xlib libs], +# ac_cv_gdk_pixbuf_xlib_config_libs, +# [ac_cv_gdk_pixbuf_xlib_config_libs=`$pkg_config --libs $pkgs`]) +# fi +# +# ac_gdk_pixbuf_xlib_config_cflags=$ac_cv_gdk_pixbuf_xlib_config_cflags +# ac_gdk_pixbuf_xlib_config_libs=$ac_cv_gdk_pixbuf_xlib_config_libs +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# # +# # we appear to have pixbuf_xlib; check for headers/libs to be sure. +# # +# ac_save_gdk_pixbuf_xlib_CPPFLAGS="$CPPFLAGS" +# CPPFLAGS="$CPPFLAGS $ac_gdk_pixbuf_xlib_config_cflags" +# have_gdk_pixbuf_xlib=no +# gdk_pixbuf_xlib_halfassed=yes +# AC_CHECK_X_HEADER(gdk-pixbuf-xlib/gdk-pixbuf-xlib.h, +# [have_gdk_pixbuf_xlib=yes +# gdk_pixbuf_xlib_halfassed=no]) +# CPPFLAGS="$ac_save_gdk_pixbuf_xlib_CPPFLAGS" +# fi +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# # we have the headers, now check for the libraries +# have_gdk_pixbuf_xlib=no +# gdk_pixbuf_xlib_halfassed=yes +# +# AC_MSG_RESULT(checking for gdk_pixbuf_xlib usability...) +# AC_CHECK_X_LIB(c, gdk_pixbuf_xlib_init, +# [have_gdk_pixbuf_xlib=yes +# gdk_pixbuf_xlib_halfassed=no],, +# $ac_gdk_pixbuf_xlib_config_libs -lX11 -lXext -lm) +# fi +# +# if test "$have_gdk_pixbuf_xlib" = yes; then +# INCLUDES="$INCLUDES $ac_gdk_pixbuf_xlib_config_cflags" +# PNG_LIBS="$ac_gdk_pixbuf_xlib_config_libs" +# AC_DEFINE(HAVE_GDK_PIXBUF_XLIB) +# else +# AC_MSG_RESULT(checking for gdk_pixbuf_xlib usability... no) +# fi +#fi + + ############################################################################### # # Check for -lXft @@ -3918,6 +3993,144 @@ else fi +############################################################################### +# +# Check for various ffmpeg libraries +# +############################################################################### + +pkgs='' +ok="yes" +pkg_check_version libavutil 54.0.0 +have_avutil="$ok" +pkg_check_version libavcodec 56.0.0 +have_avcodec="$ok" +pkg_check_version libavformat 56.0.0 +have_avformat="$ok" +pkg_check_version libswscale 3.0.0 +have_swscale="$ok" +pkg_check_version libswresample 1.0.0 +have_swresample="$ok" + +# Check includes +if test "$have_avutil" = yes; then + ac_save_avutil_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avutil_config_cflags" + have_avutil=no + AC_CHECK_X_HEADER(libavutil/avutil.h, [have_avutil=yes]) + CPPFLAGS="$ac_save_avutil_CPPFLAGS" +fi + +if test "$have_avcodec" = yes; then + ac_save_avcodec_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avcodec_config_cflags" + have_avcodec=no + AC_CHECK_X_HEADER(libavcodec/avcodec.h, [have_avcodec=yes]) + CPPFLAGS="$ac_save_avcodec_CPPFLAGS" +fi + +if test "$have_avformat" = yes; then + ac_save_avformat_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_avformat_config_cflags" + have_avformat=no + AC_CHECK_X_HEADER(libavformat/avformat.h, [have_avformat=yes]) + CPPFLAGS="$ac_save_avformat_CPPFLAGS" +fi + +if test "$have_swscale" = yes; then + ac_save_swscale_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_swscale_config_cflags" + have_swscale=no + AC_CHECK_X_HEADER(libswscale/swscale.h, [have_swscale=yes]) + CPPFLAGS="$ac_save_swscale_CPPFLAGS" +fi + +if test "$have_swresample" = yes; then + ac_save_swresample_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_swresample_config_cflags" + have_swresample=no + AC_CHECK_X_HEADER(libswresample/swresample.h, [have_swresample=yes]) + CPPFLAGS="$ac_save_swresample_CPPFLAGS" +fi + +# Check libs + +# My CentOS 7.9 build against ffmpeg 4.2.1 requires all this extra crap too. +# Not required on Raspbian 11 or macOS. +extra_ffmpeg_bs="" +if grep -q '7\.' /etc/centos-release 2>/dev/null ; then + extra_ffmpeg_bs="-lfdk-aac -lmp3lame -lspeex -ltheora -ltheoraenc -ltheoradec -lvorbis -lvorbisenc -lx264 -lz -lbz2 -llzma -ldl -pthread" +fi + +if test "$have_avutil" = yes; then + have_avutil=no + AC_MSG_RESULT(checking for libavutil usability...) + AC_CHECK_X_LIB(avutil, avutil_version, + [have_avutil=yes; avutil_halfassed=no],, + `$pkg_config --libs libavutil libswresample` $extra_ffmpeg_bs) +fi + +if test "$have_avcodec" = yes; then + have_avcodec=no + AC_MSG_RESULT(checking for libavcodec usability...) + AC_CHECK_X_LIB(avcodec, avcodec_version, + [have_avcodec=yes; avcodec_halfassed=no],, + `$pkg_config --libs libavcodec libswresample` $PTHREAD_LIBS + -lm $extra_ffmpeg_bs) +fi + +if test "$have_avformat" = yes; then + have_avformat=no + AC_MSG_RESULT(checking for libavformat usability...) + AC_CHECK_X_LIB(avformat, avformat_version, + [have_avformat=yes; avformat_halfassed=no],, + `$pkg_config --libs libavformat libswresample` $PTHREAD_LIBS + -lm $extra_ffmpeg_bs) +fi + +if test "$have_swscale" = yes; then + have_swscale=no + AC_MSG_RESULT(checking for libswscale usability...) + AC_CHECK_X_LIB(swscale, swscale_version, + [have_swscale=yes; swscale_halfassed=no],, + `$pkg_config --libs libswscale` $PTHREAD_LIBS -lm + $extra_ffmpeg_bs) +fi + +if test "$have_swresample" = yes; then + have_swresample=no + AC_MSG_RESULT(checking for libswresample usability...) + AC_CHECK_X_LIB(swresample, swresample_version, + [have_swresample=yes; swresample_halfassed=no],, + `$pkg_config --libs libswresample` $PTHREAD_LIBS -lm + $extra_ffmpeg_bs) +fi + + +have_ffmpeg=no +if test "$have_avformat" = yes -a \ + "$have_avcodec" = yes -a \ + "$have_avutil" = yes -a \ + "$have_swscale" = yes -a \ + "$have_swresample" = yes ; then + have_ffmpeg=yes + AC_CACHE_CHECK([for ffmpeg includes], ac_cv_ffmpeg_config_cflags, + [ac_cv_ffmpeg_config_cflags=`$pkg_config --cflags $pkgs`]) + AC_CACHE_CHECK([for ffmpeg libs], ac_cv_ffmpeg_config_libs, + [ac_cv_ffmpeg_config_libs=`$pkg_config --libs $pkgs`]) + AC_DEFINE(HAVE_FFMPEG) + FFMPEG_OBJS='$(FFMPEG_OBJS)' +fi +ac_ffmpeg_config_cflags=$ac_cv_ffmpeg_config_cflags +ac_ffmpeg_config_libs=$ac_cv_ffmpeg_config_libs +FFMPEG_CFLAGS="$ac_ffmpeg_config_cflags" +FFMPEG_LIBS="$ac_ffmpeg_config_libs" + +if test "$have_ffmpeg" = yes ; then + FFMPEG_LIBS="$FFMPEG_LIBS $extra_ffmpeg_bs" +fi + + ############################################################################### # # Check for pty support: this allows 'phosphor' and 'apple2' @@ -4031,8 +4244,8 @@ elif test "$record_anim" != no; then fi if test "$record_anim" = yes; then - if test "$have_gdk_pixbuf" != yes; then - AC_MSG_ERROR(--with-record-animation requires GDK-Pixbuf) + if test "$have_ffmpeg" != yes; then + AC_MSG_WARN(--with-record-animation requires the ffmpeg libraries) else AC_MSG_RESULT(enabling --with-record-animation) AC_DEFINE(HAVE_RECORD_ANIM) @@ -4089,12 +4302,8 @@ if test "$enable_pam_check_account_type" = yes; then else COMMENT_PAM_CHECK_ACCOUNT="#" fi -#if test "$have_passwd_helper" = yes; then -# PASSWD_SRCS="$PASSWD_SRCS \$(PWHELPER_SRCS)" -# PASSWD_OBJS="$PASSWD_OBJS \$(PWHELPER_OBJS)" -#fi - PASSWD_SRCS="$PASSWD_SRCS \$(PWENT_SRCS)" - PASSWD_OBJS="$PASSWD_OBJS \$(PWENT_OBJS)" +PASSWD_SRCS="$PASSWD_SRCS \$(PWENT_SRCS)" +PASSWD_OBJS="$PASSWD_OBJS \$(PWENT_OBJS)" if test "$enable_locking" = yes; then @@ -4181,7 +4390,7 @@ AC_MSG_CHECKING([for locale directory]) if test -n "$GTK_DATADIR" ; then PO_DATADIR="$GTK_DATADIR" elif test "$have_gtk" = yes; then - PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` + PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` PO_DATADIR="$PO_DATADIR/share" fi @@ -4245,6 +4454,7 @@ AC_SUBST(SETUID_HACKS) AC_SUBST(SETCAP_HACKS) AC_SUBST(INSTALL_DIRS) AC_SUBST(INSTALL_PAM) +AC_SUBST(GLIB_COMPILE_RESOURCES) AC_SUBST(HAVE_PAM_FAIL_DELAY) AC_SUBST(COMMENT_PAM_CHECK_ACCOUNT) AC_SUBST(NEW_LOGIN_COMMAND) @@ -4288,6 +4498,9 @@ AC_SUBST(HACK_CONF_DIR) AC_SUBST(FONT_DIR) AC_SUBST(ANIM_OBJS) AC_SUBST(ANIM_LIBS) +AC_SUBST(FFMPEG_OBJS) +AC_SUBST(FFMPEG_CFLAGS) +AC_SUBST(FFMPEG_LIBS) APPDEFAULTS=$ac_x_app_defaults AC_SUBST(APPDEFAULTS) @@ -4316,6 +4529,8 @@ AC_OUTPUT # ############################################################################### +CONF_STATUS=0 + warn_prefix_1=" Warning:" warn_prefix_2=" Note:" warn_prefix="$warn_prefix_1" @@ -4374,65 +4589,81 @@ if test "$ac_prog_cc_no_pthread" ; then warn2 "support POSIX threads." echo "" warn2 "If you have multiple CPU cores, try CC=$PTHREAD_CC." + CONF_STATUS=1 elif test "$with_pthread_req" = yes -a "$have_pthread" = no ; then warn 'POSIX threads were requested, but were not found.' + CONF_STATUS=1 fi if test "$with_sgi_req" = yes -a "$have_sgi" = no ; then warn 'The SGI saver extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xidle_req" = yes -a "$have_xidle" = no ; then warn 'The XIdle extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_mit_req" = yes -a "$have_mit" = no ; then warn 'The MIT-SCREEN-SAVER extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xshm_req" = yes -a "$have_xshm" = no ; then warn 'The XSHM extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xdbe_req" = yes -a "$have_xdbe" = no ; then warn 'The DOUBLE-BUFFER extension was requested, but was not found.' + CONF_STATUS=1 fi #if test "$with_xcomposite_req" = yes -a "$have_xcomposite" = no ; then # warn 'The XCOMPOSITE extension was requested, but was not found.' +# CONF_STATUS=1 #fi if test "$with_xkb_req" = yes -a "$have_xkb" = no ; then warn 'The X Keyboard extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_sgivc_req" = yes -a "$have_sgivc" = no ; then warn 'The SGI-VIDEO-CONTROL extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_dpms_req" = yes -a "$have_dpms" = no ; then warn 'The DPMS extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xinerama_req" = yes -a "$have_xinerama" = no ; then warn 'The Xinerama extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_xf86vmode_req" = yes -a "$have_xf86vmode" = no ; then warn 'The XF86VMODE extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_randr_req" = yes -a "$have_randr" = no ; then warn 'The RANDR extension was requested, but was not found.' + CONF_STATUS=1 fi if test "$with_proc_interrupts_req" = yes -a "$have_proc_interrupts" = no; then warn "Checking of /proc/interrupts was requested, but it's bogus." + CONF_STATUS=1 fi if test "$pkg_config" = false ; then warnL 'The "pkg-config" program was not found. Without that,' warn2 "detection of the various GTK libraries won't work." + CONF_STATUS=1 else pkgerr=`$pkg_config --list-all 2>&1 >/dev/null` if test "x$pkgerr" != "x" ; then @@ -4441,20 +4672,20 @@ else warn2 "The errors are:" echo '' echo "$pkgerr" | sed 's/^/ > /g' + CONF_STATUS=1 fi fi if test "$gtk_halfassed" != no ; then - warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK can't be used." + warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK" + warn2 "can't be used." + CONF_STATUS=1 fi motif_warn2() { - warn2 'Though the Motif front-end to xscreensaver is still' - warn2 'maintained, it is no longer being updated with new' - warn2 'features: all new development on the xscreensaver-settings' - warn2 'program is happening in the GTK version, and not in the' - warn2 'Motif version. It is recommended that you build against' - warn2 'GTK instead of Motif. See .' + warn2 "The Motif version of \`xscreensaver-settings' is missing many" + warn2 'features. It is strongly recommended that you build the GTK' + warn2 'version instead.' } if test "$have_motif" = no -a "$have_gtk" = no; then @@ -4464,9 +4695,11 @@ if test "$have_motif" = no -a "$have_gtk" = no; then warn2 "\`xscreensaver-settings' program requires one of these." echo '' motif_warn2 + CONF_STATUS=1 else warnL "The GTK libraries do not seem to be available; the" warn2 "\`xscreensaver-settings' program requires them." + CONF_STATUS=1 # echo '' # warn2 'You can use Motif or Lesstif instead of GTK (use the' # warn2 "\`--with-motif' option) but that is NOT recommended." @@ -4476,20 +4709,24 @@ if test "$have_motif" = no -a "$have_gtk" = no; then elif test "$with_motif_req" = yes -a "$have_motif" = no ; then warnL "Use of Motif was requested, but it wasn't found;" warn2 "Gtk will be used instead." + CONF_STATUS=1 elif test "$with_gtk_req" = yes -a "$have_gtk" = no ; then warnL "Use of Gtk was requested, but it wasn't found." + CONF_STATUS=1 fi if test "$ac_cv_libxt" != yes ; then warnL 'The Xt library was not found. It is required.' + CONF_STATUS=1 fi if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then warn "GTK is being used, but the GDK-Pixbuf library and/or" warn2 "headers were not found. That can't be good. Please" warn2 "install the GDK-Pixbuf development kit and re-configure." + CONF_STATUS=1 fi if test "$have_motif" = yes -a "$have_lesstif" = yes ; then @@ -4507,6 +4744,7 @@ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then warn2 "use with XScreenSaver; it is strongly recommended" warn2 "that you upgrade to at least version $preferred_lesstif!" warn2 "See ." + CONF_STATUS=1 fi fi @@ -4525,10 +4763,10 @@ halfassery() { if test "$with_gdk_pixbuf_req" = yes -a "$have_gdk_pixbuf" = no; then warnL 'Use of GDK-Pixbuf was requested, but it was not found.' + CONF_STATUS=1 fi -if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes || \ - test "$have_gdk_pixbuf" = no ; then +if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes ; then if test "$with_gdk_pixbuf_req" = yes ; then true @@ -4551,9 +4789,30 @@ if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes || \ fi +#if test "$have_gdk_pixbuf" = yes -a "$have_gdk_pixbuf_xlib" = no ; then +# +# warnL 'The GDK-Pixbuf-Xlib library was not found.' +# +# if test "$gdk_pixbuf_xlib_halfassed" = yes ; then halfassery ; fi +# if test "$have_png" = yes ; then +# echo '' +# warn2 'The PNG library is being used instead.' +# fi +# +# echo '' +# warn2 'Some of the demos will not use images as much as they could.' +# warn2 'You should consider installing GDK-Pixbuf-Xlib and re-running' +# warn2 'configure.' +# echo '' +# warn2 "Recently, some distros have stopped distributing" +# warn2 "GDK-Pixbuf-Xlib entirely. So good luck with that." +#fi + + if test "$have_jpeg" = no ; then if test "$with_jpeg_req" = yes ; then warnL 'Use of libjpeg was requested, but it was not found.' + CONF_STATUS=1 elif test "$with_jpeg_req" = no ; then warnL 'The JPEG library is not being used.' else @@ -4566,6 +4825,7 @@ if test "$have_jpeg" = no ; then warn2 "This means that it won't be possible for the image-manipulating" warn2 "display modes to load files from disk; and it also means that" warn2 "the \`webcollage' program will be much slower." + CONF_STATUS=1 else warn2 "This means the \`webcollage' program will be much slower." fi @@ -4575,6 +4835,7 @@ fi if test "$have_png" = no ; then if test "$with_png_req" = yes ; then warnL 'Use of libpng was requested, but it was not found.' + CONF_STATUS=1 elif test "$with_png_req" = no ; then warnL 'The PNG library is not being used.' else @@ -4583,18 +4844,21 @@ if test "$have_png" = no ; then if test "$png_halfassed" = yes ; then halfassery ; fi warn2 "Many things aren't going to work right." + CONF_STATUS=1 fi if test "$have_xinput" = no ; then warnL 'The XInput2 library was not found. It is required.' if test "$xinput_halfassed" = yes ; then halfassery ; else echo '' ; fi + CONF_STATUS=1 fi if test "$have_xft" = no ; then warnL 'The XFreeType library was not found. It is required.' if test "$xft_halfassed" = yes ; then halfassery ; else echo '' ; fi + CONF_STATUS=1 fi @@ -4603,9 +4867,11 @@ if test "$have_systemd" = no ; then if test "$systemd_too_old" = yes ; then warnL "The systemd library is too old." systemd_warned=yes + CONF_STATUS=1 elif test "$with_systemd_req" = yes ; then warnL "Use of systemd was requested, but it was not found." systemd_warned=yes + CONF_STATUS=1 elif test "$ac_macosx" = yes; then true elif test "$with_systemd_req" = no ; then @@ -4619,6 +4885,7 @@ if test "$have_systemd" = no ; then if test "$systemd_halfassed" = yes ; then halfassery systemd_warned=yes + CONF_STATUS=1 fi if test "$systemd_warned" = yes; then @@ -4633,11 +4900,14 @@ fi if test "$have_gl" = no ; then if test "$with_gl_req" = yes ; then - warnL 'Use of GL was requested, but it was not found.' + warnL 'The OpenGL 3D library is required, but it was not found.' + CONF_STATUS=1 elif test "$with_gl_req" = no ; then noteL 'The OpenGL 3D library is not being used.' + CONF_STATUS=1 else noteL 'The OpenGL 3D library was not found.' + CONF_STATUS=1 fi if test "$gl_halfassed" = yes ; then @@ -4650,9 +4920,7 @@ if test "$have_gl" = no ; then echo '' warn2 'Those demos which use 3D will not be built or installed.' - warn2 'You might want to consider installing OpenGL and' - warn2 're-running configure.' - + warn2 'That is most of them.' fi if test "$have_gl" = yes -a "$have_gle" = no ; then @@ -4665,6 +4933,7 @@ if test "$have_gl" = yes -a "$have_gle" = no ; then noteL 'Use of the GLE (GL Extrusion) library was requested, but' warn2 'it was not found (though the OpenGL library was found, and' warn2 'is being used.)' + CONF_STATUS=1 elif test "$with_gle_req" = no ; then noteL 'The OpenGL Library is being used, but the GLE (GL Extrusion)' warn2 'library is not.' @@ -4687,28 +4956,33 @@ fi if test "$with_readdisplay_req" = yes -a "$have_readdisplay" = no ; then warn 'Use of XReadDisplay was requested, but it was not found.' + CONF_STATUS=1 fi if test "$with_kerberos_req" = yes -a "$have_kerberos" = no ; then warn 'Use of Kerberos was requested, but it was not found.' + CONF_STATUS=1 fi if test "$with_pam_req" = yes -a "$have_pam" = no ; then warn 'Use of PAM was requested, but it was not found.' -elif test "$have_pam" = no ; then + CONF_STATUS=1 +elif test "$have_pam" = no -a "$enable_locking" = yes ; then if test -d /etc/pam.d -o -f /etc/pam.conf ; then warn "Your system seems to have PAM, but PAM is not being used." warn2 "That is probably not going to work out well." - + CONF_STATUS=1 fi fi if test "$with_shadow_req" = yes -a "$have_shadow" = no ; then warn 'Use of shadow passwords was requested, but they were not found.' + CONF_STATUS=1 fi if test "$setcap_hacks_req" = yes -a "$have_libcap" = no ; then warn 'Use of libcap was requested, but it was not found.' + CONF_STATUS=1 fi if test "$ac_macosx" = yes -a "$enable_locking" = yes ; then @@ -4716,6 +4990,17 @@ if test "$ac_macosx" = yes -a "$enable_locking" = yes ; then warn2 "THIS DOES NOT WORK! Don't do this!" fi +if test "$have_jwzgles" = yes ; then + warn "Do not use --with-gles unless you are sure that you know" + warn2 "what you are doing! It is not recommended on normal X11" + warn2 "systems." + + if test "$have_egl" = no; then + warn2 "" + warn2 "Using --with-gles and --with-glx probably won't work." + fi +fi + # You are in a twisty maze of namespaces and syntaxes, all alike. # Expand all of these as the Makefile will probably expand them. @@ -4774,7 +5059,7 @@ if test \! -z "$rpm_vers" ; then pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` - pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)\.ttf$@\1@p'` + pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi @@ -4804,7 +5089,7 @@ if test \! -z "$deb_vers" ; then pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` - pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)\.ttf$@\1@p'` + pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'` changequote([,]) @@ -4857,3 +5142,5 @@ echo " Configuration: ${HACK_CONF_DIR}/$confdir_err" echo " Extra Fonts: ${FONT_DIR}$fontdir_err" echo " App Defaults: ${APPDEFAULTS}/$addir_err" echo "" + +exit $CONF_STATUS diff --git a/driver/.gdbinit b/driver/.gdbinit deleted file mode 100644 index a585259..0000000 --- a/driver/.gdbinit +++ /dev/null @@ -1,27 +0,0 @@ -# If you're debugging xscreensaver and you are running a virtual root window -# manager, you'd better let the process handle these signals: it remaps the -# virtual root window when they arrive. If you don't do this, your window -# manager will be hosed. -# -# Also, gdb copes badly with breakpoints in functions that are called on the -# other side of a fork(). The Trace/BPT traps cause the spawned process to -# die. -# -#handle 1 pass nostop -#handle 3 pass nostop -#handle 4 pass nostop -#handle 6 pass nostop -#handle 7 pass nostop -#handle 8 pass nostop -#handle 9 pass nostop -#handle 10 pass nostop -#handle 11 pass nostop -#handle 12 pass nostop -#handle 13 pass nostop -#handle 15 pass nostop -#handle 19 pass nostop -set env MallocGuardEdges 1 -set env MallocPreScribble 1 -set env MallocScribble 1 -b exit -set args -debug diff --git a/driver/Makefile.in b/driver/Makefile.in index 0e986a9..4b3c1cb 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -1,9 +1,9 @@ -# driver/Makefile.in --- xscreensaver, Copyright © 1997-2021 Jamie Zawinski. +# driver/Makefile.in --- xscreensaver, Copyright © 1997-2023 Jamie Zawinski. # the `../configure' script generates `driver/Makefile' from this file. @SET_MAKE@ .SUFFIXES: -.SUFFIXES: .c .m .o .desktop .desktop.in +.SUFFIXES: .c .m .o .desktop .desktop.in .service .service.in srcdir = @srcdir@ VPATH = @srcdir@ @@ -29,7 +29,9 @@ mansuffixB = 6 GTK_DATADIR = @GTK_DATADIR@ GTK_APPDIR = $(GTK_DATADIR)/applications GTK_ICONDIR = $(GTK_DATADIR)/pixmaps -GTK_UIDIR = $(GTK_DATADIR)/xscreensaver/ui +GTK_SHAREDIR = $(GTK_DATADIR)/xscreensaver +UPDATE_ICON_CACHE = gtk-update-icon-cache +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ HACKDIR = @HACKDIR@ HACK_CONF_DIR = @HACK_CONF_DIR@ @@ -51,6 +53,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIRS = @INSTALL_DIRS@ +HACKDIR = @HACKDIR@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ @@ -81,8 +84,7 @@ PAM_DIR = $(PAM_ROOT)/pam.d PAM_CONF = $(PAM_ROOT)/pam.conf ICON_SRC = $(UTILS_SRC)/images -LOGO = $(ICON_SRC)/logo-50.xpm -GTK_ICONS = $(ICON_SRC)/screensaver-*.png +LOGO = $(ICON_SRC)/logo-512.png UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils @@ -94,7 +96,7 @@ LIBS_PRE = $(LIBS) $(X_LIBS) $(X_PRE_LIBS) LIBS_POST = $(X_EXTRA_LIBS) XDPMS_LIBS = @XDPMS_LIBS@ -XINERAMA_LIBS = @XINERAMA_LIBS@ $(FIXME) +XINERAMA_LIBS = @XINERAMA_LIBS@ XINPUT_LIBS = -lXi XML_LIBS = @XML_LIBS@ @@ -118,6 +120,7 @@ GFX_OBJS = xscreensaver-gfx.o screens.o windows.o subprocs.o \ $(UTILS_BIN)/font-retry.o \ $(UTILS_BIN)/logo.o \ $(UTILS_BIN)/minixpm.o \ + $(UTILS_BIN)/screenshot.o \ $(UTILS_BIN)/xft.o \ $(UTILS_BIN)/utf8wc.o \ $(UTILS_BIN)/xshm.o \ @@ -134,9 +137,6 @@ KERBEROS_OBJS = passwd-kerberos.o PAM_SRCS = passwd-pam.c PAM_OBJS = passwd-pam.o -PWHELPER_SRCS = passwd-helper.c -PWHELPER_OBJS = passwd-helper.o - PASSWD_SRCS = @PASSWD_SRCS@ PASSWD_OBJS = @PASSWD_OBJS@ @@ -160,7 +160,7 @@ AUTH_OBJS_1 = dialog.o passwd.o setuid.o \ $(UTILS_BIN)/logo.o \ $(UTILS_BIN)/minixpm.o AUTH_LIBS = $(LIBS_PRE) $(XFT_LIBS) $(XINPUT_LIBS) $(XINERAMA_LIBS) \ - @SAVER_LIBS@ -lXt -lX11 -lXext -lXi \ + $(XDPMS_LIBS) @SAVER_LIBS@ -lXt -lX11 -lXext -lXi \ @PASSWD_LIBS@ $(LIBS_POST) $(INTL_LIBS) SYSTEMD_DEFS = @@ -175,16 +175,16 @@ CMD_LIBS = $(LIBS_PRE) $(XINPUT_LIBS) -lX11 -lXext $(LIBS_POST) GTK_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' \ -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' \ - -DDEFAULT_ICONDIR='"$(GTK_UIDIR)"' \ -DLOCALEDIR=\"$(localedir)\" \ -I$(ICON_SRC) GTK_SRCS = demo-Gtk.c demo-Gtk-conf.c -GTK_OBJS = demo-Gtk.o demo-Gtk-conf.o \ - blurb.o exec.o prefs.o prefsw.o dpms.o remote.o \ +GTK_OBJS = demo-Gtk.o demo-Gtk-conf.o demo-Gtk-resources.o \ + blurb.o exec.o prefs.o prefsw.o dpms.o remote.o screens.o \ clientmsg.o atoms.o \ $(UTILS_BIN)/xmu.o \ $(UTILS_BIN)/resources.o \ $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/screenshot.o \ $(UTILS_BIN)/usleep.o GTK_LIBS = $(LIBS_PRE) $(INTL_LIBS) $(XDPMS_LIBS) \ $(XINERAMA_LIBS) $(XML_LIBS) @GTK_LIBS@ \ @@ -217,6 +217,7 @@ UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ SETUID_EXES = xscreensaver-auth DEMO_EXES = @ALL_DEMO_PROGRAMS@ EXES_SYSTEMD = xscreensaver-systemd +DESKS = xscreensaver.desktop xscreensaver.service HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ xscreensaver.h prefs.h remote.h exec.h \ @@ -225,22 +226,25 @@ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ MENA = xscreensaver.man xscreensaver-settings.man \ xscreensaver-command.man MENB = xscreensaver-gfx.man xscreensaver-auth.man \ - xscreensaver-command.man xscreensaver-systemd.man + xscreensaver-systemd.man EXTRAS = README Makefile.in \ XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \ - xscreensaver.ui screensaver-properties.desktop.in \ - .gdbinit + demo.ui prefs.ui gresource.xml xscreensaver.desktop.in \ + xscreensaver-settings.desktop.in xscreensaver.service.in TARFILES = $(DAEMON_SRCS) $(GFX_SRCS) $(AUTH_SRCS) $(SYSTEMD_SRCS) \ $(CMD_SRCS) $(GTK_SRCS) $(MOTIF_SRCS) $(PWENT_SRCS) \ - $(PWHELPER_SRCS) $(KERBEROS_SRCS) $(PAM_SRCS) \ + $(KERBEROS_SRCS) $(PAM_SRCS) \ $(HDRS) $(MENA) $(MENB) $(TEST_SRCS) $(EXTRAS) -default: $(EXES) $(UTIL_EXES) $(SETUID_EXES) -all: $(EXES) $(UTIL_EXES) $(SETUID_EXES) $(DEMO_EXES) -tests: $(TEST_EXES) +# Using $(MAKE) directly means the shell executes things even with "make -n" +MAKE2 = $(MAKE) +MAKE2CC = $(MAKE2) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" +default:: $(EXES) $(UTIL_EXES) $(SETUID_EXES) $(DESKS) +all:: default $(DEMO_EXES) +tests:: $(TEST_EXES) ############################################################################## # @@ -254,7 +258,7 @@ uninstall: uninstall-program uninstall-ad uninstall-man uninstall-xml \ uninstall-gnome install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + $(MAKE2) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install install-program:: $(EXES) @if [ ! -d $(install_prefix)$(bindir) ]; then \ @@ -389,8 +393,8 @@ install-man:: echo ln -sf $$F1 $$D/$$F2 ; \ ln -sf $$F1 $$D/$$F2 -# These used to be in driver/ and installed into $(bindir) -# Now they are in hacks/ and are installed into ${libexecdir}/xscreensaver/ +# These used to be in driver/ and installed into /usr/bin/ +# Now they are in hacks/ and are installed into /usr/libexec/xscreensaver/ OLD_EXES = xscreensaver-getimage xscreensaver-getimage-file \ xscreensaver-getimage-video xscreensaver-text \ xscreensaver-systemd @@ -511,23 +515,45 @@ install-pam: xscreensaver.pam $$e "" ;\ fi -# screensaver-properties.desktop + +# xscreensaver.desktop +# xscreensaver-settings.desktop # into /usr/share/applications/ -install-gnome:: screensaver-properties.desktop +install-gnome:: xscreensaver.desktop xscreensaver-settings.desktop @if [ "$(GTK_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ fi ;\ - name2=xscreensaver-properties.desktop ;\ - echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ - $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GTK_APPDIR)/$$name2 ;\ + old=xscreensaver-properties.desktop ;\ + if [ -f "$(install_prefix)$(GTK_APPDIR)/$$old" ]; then \ + echo rm -f "$(install_prefix)$(GTK_APPDIR)/$$old" ;\ + rm -f "$(install_prefix)$(GTK_APPDIR)/$$old" ;\ + fi ;\ + for name in xscreensaver.desktop xscreensaver-settings.desktop ; do\ + echo $(INSTALL_DATA) $$name $(install_prefix)$(GTK_APPDIR)/$$name;\ + $(INSTALL_DATA) $$name $(install_prefix)$(GTK_APPDIR)/$$name;\ + echo chmod a+x $(install_prefix)$(GTK_APPDIR)/$$name ;\ + chmod a+x $(install_prefix)$(GTK_APPDIR)/$$name ;\ + done ;\ fi - -# xscreensaver.xpm +# xscreensaver.service +# into /usr/share/xscreensaver/ +# But maybe it should instead be installed as: +# $(prefix)/share/dbus-1/system-services/org.jwz.xscreensaver.service +# Or would that make it be enabled by default? +# +install-gnome:: xscreensaver.service + @if [ ! -d "$(install_prefix)$(GTK_SHAREDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_SHAREDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_SHAREDIR)" ;\ + fi ;\ + name=xscreensaver.service ;\ + echo $(INSTALL_DATA) $$name $(install_prefix)$(GTK_SHAREDIR)/$$name ;\ + $(INSTALL_DATA) $$name $(install_prefix)$(GTK_SHAREDIR)/$$name + +# xscreensaver.png # into /usr/share/pixmaps/ install-gnome:: $(LOGO) @if [ "$(GTK_DATADIR)" != "" ]; then \ @@ -535,70 +561,47 @@ install-gnome:: $(LOGO) echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ fi ;\ - target=xscreensaver.xpm ;\ + target=xscreensaver.png ;\ echo $(INSTALL_DATA) $(LOGO) \ $(install_prefix)$(GTK_ICONDIR)/$$target ;\ $(INSTALL_DATA) $(LOGO) \ $(install_prefix)$(GTK_ICONDIR)/$$target ;\ fi -# ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/ui/ -install-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ - fi ;\ - for target in $(GTK_ICONS) ; do \ - dest=`echo $$target | sed 's@^.*/@@'` ;\ - echo $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_UIDIR)/$$dest ;\ - $(INSTALL_DATA) $$target \ - $(install_prefix)$(GTK_UIDIR)/$$dest ;\ - done ;\ - fi - -# xscreensaver.ui -# into /usr/share/xscreensaver/ui/ -install-gnome:: xscreensaver.ui - @if [ "$(GTK_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)" ;\ - fi ;\ - target=xscreensaver.ui ;\ - echo $(INSTALL_DATA) $(srcdir)/$$target \ - $(install_prefix)$(GTK_UIDIR)/$$target ;\ - if $(INSTALL_DATA) $(srcdir)/$$target \ - $(install_prefix)$(GTK_UIDIR)/$$target ;\ - then true ;\ - else \ - e=echo ; \ - $$e "" ;\ - $$e " ####################################################################";\ - $$e " Warning: unable to install $$target into" ;\ - $$e " $(install_prefix)$(GTK_UIDIR)/." ;\ - $$e " Without this file, xscreensaver-settings will not" ;\ - $$e " be able to run properly." ;\ - $$e " ####################################################################";\ - $$e "" ;\ - exit 1 ; \ - fi ; \ - fi - +install-gnome:: uninstall-old-gnome-icons +install-gnome:: update-icon-caches + +update-icon-caches:: + @for f in /usr/share/icons/index.theme \ + /usr/share/icons/*/index.theme \ + /usr/share/pixmaps/index.theme \ + /usr/share/pixmaps/*/index.theme \ + ; do \ + if [ -f $$f ]; then \ + f=`dirname $$f` ;\ + echo $(UPDATE_ICON_CACHE) --force --quiet $$f ;\ + $(UPDATE_ICON_CACHE) --force --quiet $$f ;\ + fi ;\ + done -# screensaver-properties.desktop +# xscreensaver.desktop +# xscreensaver-settings.desktop # into /usr/share/applications/ uninstall-gnome:: @if [ "$(GTK_DATADIR)" != "" ]; then \ - f=xscreensaver-properties.desktop ;\ - echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ - rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ - fi + old=xscreensaver-properties.desktop ;\ + if [ -f "$old" ]; then \ + echo rm -f $(install_prefix)$(GTK_APPDIR)/$$old ;\ + rm -f $(install_prefix)$(GTK_APPDIR)/$$old ;\ + fi ;\ + for f in xscreensaver.desktop xscreensaver-settings.desktop; do \ + echo rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + rm -f $(install_prefix)$(GTK_APPDIR)/$$f ;\ + done ;\ + fi -# xscreensaver.xpm -# into /usr/share/pixmaps/ +# xscreensaver.xpm (pre-2022) +# from /usr/share/pixmaps/ uninstall-gnome:: @if [ "$(GTK_ICONDIR)" != "" ]; then \ target=xscreensaver.xpm ;\ @@ -606,31 +609,31 @@ uninstall-gnome:: rm -f $(install_prefix)$(GTK_ICONDIR)/$$target ;\ fi -# ../utils/images/screensaver-*.png -# into /usr/share/xscreensaver/ui/ -uninstall-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ - for target in $(GTK_ICONS) ; do \ - dest=`echo $$target | sed 's@^.*/@@'` ;\ - echo rm -f $(install_prefix)$(GTK_UIDIR)/$$dest ;\ - rm -f $(install_prefix)$(GTK_UIDIR)/$$dest ;\ - done ;\ - fi - -# xscreensaver.ui -# into /usr/share/xscreensaver/ui/ +# /usr/share/xscreensaver/ui/*.png and *.ui no longer used as of 2022, 6.05. uninstall-gnome:: - @if [ "$(GTK_DATADIR)" != "" ]; then \ - for target in xscreensaver.ui xscreensaver-demo.ui ; do \ - echo rm -f $(install_prefix)$(GTK_UIDIR)/$$target ;\ - rm -f $(install_prefix)$(GTK_UIDIR)/$$target ;\ - done ;\ - rmdir "$(GTK_UIDIR)" ;\ - rmdir "$(GTK_DATADIR)/xscreensaver" ;\ - exit 0 ;\ + @if [ "$(GTK_ICONDIR)" != "" ]; then \ + echo rm -rf $(install_prefix)$(GTK_SHAREDIR)/ui ;\ + rm -rf $(install_prefix)$(GTK_SHAREDIR)/ui ;\ fi -# /usr/share/xscreensaver/glade/ no longer used +# What is all this crap with the wrong logo? +# /usr/share/icons/nuoveXT2/16x16/apps/xscreensaver.png through +# /usr/share/icons/gnome-colors-common/32x32/apps/xscreensaver.png +uninstall-gnome:: uninstall-old-gnome-icons +uninstall-old-gnome-icons:: + @for f in \ + "$(install_prefix)$(GTK_DATADIR)/icons"/*/*/apps/xscreensaver.png \ + "$(install_prefix)$(GTK_DATADIR)/icons"/*/*/apps/xscreensaver.svg \ + "$(install_prefix)$(GTK_ICONDIR)/xscreensaver.xpm" \ + "$(install_prefix)$(GTK_ICONDIR)/xscreensaver.svg" ;\ + do \ + if [ -f "$$f" ]; then \ + echo rm -f "$$f" ;\ + rm -f "$$f" ;\ + fi ;\ + done + +# /usr/share/xscreensaver/glade/ no longer used as of 2022. uninstall-gnome:: -rm -rf $(GTK_DATADIR)/xscreensaver/glade @@ -667,7 +670,6 @@ distclean: clean TAGS *~ "#"* *.rej *.orig \ Makefile \ XScreenSaver.ad \ - screensaver-properties.desktop \ xscreensaver.pam # Adds all current dependencies to Makefile @@ -687,7 +689,7 @@ distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \ $(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) -- \ $(SAVER_SRCS_1) $(SYSTEMD_SRCS) $(MOTIF_SRCS) $(GTK_SRCS) \ - $(PWENT_SRCS) $(PWHELPER_SRCS) $(KERBEROS_SRCS) $(PAM_SRCS) \ + $(PWENT_SRCS) $(KERBEROS_SRCS) $(PAM_SRCS) \ $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS) \ $(TEST_SRCS) 2>/dev/null | \ sort -d | \ @@ -735,7 +737,7 @@ tags: find $(srcdir) -name '*.[chly]' -print | xargs etags -a list_tarfiles: - @$(MAKE) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >/dev/null + @$(MAKE2) XScreenSaver_ad.h XScreenSaver_Xm_ad.h 2>&1 >/dev/null @find $(TARFILES) -type f -print | sort check_men: @@ -773,7 +775,7 @@ $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c $(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c $(UTILS_BIN)/hsv.o: $(UTILS_SRC)/hsv.c $(UTILS_BIN)/colors.o: $(UTILS_SRC)/colors.c -$(UTILS_BIN)/grabscreen.o: $(UTILS_SRC)/grabscreen.c +$(UTILS_BIN)/grabclient.o: $(UTILS_SRC)/grabclient.c $(UTILS_BIN)/utf8wc.o: $(UTILS_SRC)/utf8wc.c $(UTILS_BIN)/xftwrap.o: $(UTILS_SRC)/xftwrap.c $(UTILS_BIN)/font-retry.o: $(UTILS_SRC)/font-retry.c @@ -792,7 +794,7 @@ UTIL_OBJS = $(UTILS_BIN)/overlay.o \ $(UTILS_BIN)/colorbars.o \ $(UTILS_BIN)/hsv.o \ $(UTILS_BIN)/colors.o \ - $(UTILS_BIN)/grabscreen.o \ + $(UTILS_BIN)/grabclient.o \ $(UTILS_BIN)/xft.o \ $(UTILS_BIN)/xftwrap.o \ $(UTILS_BIN)/utf8wc.o \ @@ -801,8 +803,7 @@ UTIL_OBJS = $(UTILS_BIN)/overlay.o \ $(UTILS_BIN)/aligned_malloc.o $(UTIL_OBJS): - cd $(UTILS_BIN) ; \ - $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + $(MAKE2CC) -C $(UTILS_BIN) $(@F) ############################################################################## @@ -862,6 +863,14 @@ demo-Gtk.o: demo-Gtk.c demo-Gtk-conf.o: demo-Gtk-conf.c $(CC) -c $(CC_ALL) $(GTK_DEFS) $< +GCRARGS = --sourcedir=$(srcdir) --sourcedir=$(ICON_SRC) --generate-source +demo-Gtk-resources.c: gresource.xml demo.ui prefs.ui + $(GLIB_COMPILE_RESOURCES) $(srcdir)/gresource.xml --target=$@ $(GCRARGS) + +GTK_WARNINGS = -Wno-long-long -Wno-c99-extensions -Wno-pedantic +demo-Gtk-resources.o: demo-Gtk-resources.c + $(CC) -c $(CC_ALL) $(GTK_DEFS) $(GTK_WARNINGS) $< + xscreensaver-settings-Gtk: $(GTK_OBJS) $(CC) $(LDFLAGS) -o $@ $(GTK_OBJS) $(GTK_LIBS) @@ -912,13 +921,8 @@ XScreenSaver_Xm_ad.h:: mv $$TMP $$OUT ; \ fi - -# Replace this with @INTLTOOL_DESKTOP_RULE@ once -# https://bugs.launchpad.net/intltool/+bug/1749904 is fixed. -.desktop.in.desktop: $(INTLTOOL_MERGE) $(top_srcdir)/po/*.po - $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) \ - $(INTLTOOL_V_MERGE_OPTIONS) -d -u \ - -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +@INTLTOOL_DESKTOP_RULE@ +@INTLTOOL_SERVICE_RULE@ ############################################################################## @@ -992,6 +996,7 @@ xdpyinfo: xdpyinfo.o # # DO NOT DELETE: updated by make distdepend +demo-Gtk-conf.o: $(srcdir)/blurb.h demo-Gtk-conf.o: ../config.h demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h demo-Gtk-conf.o: $(UTILS_SRC)/xscreensaver-intl.h @@ -1001,28 +1006,17 @@ demo-Gtk.o: $(srcdir)/blurb.h demo-Gtk.o: ../config.h demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h demo-Gtk.o: $(srcdir)/remote.h +demo-Gtk.o: $(srcdir)/screens.h demo-Gtk.o: $(srcdir)/types.h demo-Gtk.o: $(UTILS_SRC)/resources.h +demo-Gtk.o: $(UTILS_SRC)/screenshot.h demo-Gtk.o: $(UTILS_SRC)/usleep.h demo-Gtk.o: $(UTILS_SRC)/version.h demo-Gtk.o: $(UTILS_SRC)/visual.h demo-Gtk.o: $(UTILS_SRC)/xmu.h demo-Gtk.o: $(UTILS_SRC)/xscreensaver-intl.h -demo-Xm.o: XScreenSaver_Xm_ad.h -demo-Xm.o: XScreenSaver_ad.h -demo-Xm.o: $(srcdir)/atoms.h -demo-Xm.o: $(srcdir)/blurb.h demo-Xm.o: ../config.h -demo-Xm.o: $(srcdir)/remote.h -demo-Xm.o: $(srcdir)/types.h -demo-Xm.o: $(UTILS_SRC)/resources.h -demo-Xm.o: $(UTILS_SRC)/version.h -demo-Xm.o: $(UTILS_SRC)/visual.h -demo-Xm.o: $(UTILS_SRC)/xmu.h demo-Xm-widgets.o: ../config.h -passwd-helper.o: $(srcdir)/auth.h -passwd-helper.o: $(srcdir)/blurb.h -passwd-helper.o: ../config.h passwd-kerberos.o: $(srcdir)/auth.h passwd-kerberos.o: $(srcdir)/blurb.h passwd-kerberos.o: ../config.h @@ -1063,7 +1057,6 @@ test-xdpms.o: $(srcdir)/blurb.h test-xdpms.o: ../config.h test-xinerama.o: $(srcdir)/blurb.h test-xinerama.o: ../config.h -test-xinput.o: $(srcdir)/blurb.h test-xinput.o: ../config.h test-xinput.o: $(srcdir)/xinput.h test-xkb.o: $(srcdir)/blurb.h diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in index bfc6414..d3e89f5 100644 --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -4,8 +4,8 @@ ! a screen saver and locker for the X window system ! by Jamie Zawinski ! -! version 6.00 -! 01-Apr-2021 +! version 6.09 +! 07-Jun-2024 ! ! See "man xscreensaver" for more info. The latest version is always ! available at https://www.jwz.org/xscreensaver/ @@ -58,7 +58,7 @@ *ignoreUninstalledPrograms: False *authWarningSlack: 20 -*textMode: file +*textMode: url *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune @@ -98,7 +98,7 @@ ! non-Gnome systems: ! @NOGNOME@*loadURL: x-www-browser '%s' || firefox '%s' || chromium-browser '%s' -@NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ +@NOGNOME@*manualCommand: lxterminal -T '%s manual' \ @NOGNOME@ -e /bin/sh -c 'man "%s" ; read foo' @@ -324,248 +324,260 @@ XScreenSaver.bourneShell: /bin/sh !============================================================================= *programs: \ - maze -root \n\ -@GL_KLUDGE@ GL: superquadrics -root \n\ - attraction -root \n\ - blitspin -root \n\ - greynetic -root \n\ - helix -root \n\ - hopalong -root \n\ - imsmap -root \n\ -- noseguy -root \n\ -- pyro -root \n\ - qix -root \n\ -- rocks -root \n\ - rorschach -root \n\ - decayscreen -root \n\ - flame -root \n\ - halo -root \n\ - slidescreen -root \n\ - pedal -root \n\ - bouboule -root \n\ -- braid -root \n\ - coral -root \n\ - deco -root \n\ - drift -root \n\ -- fadeplot -root \n\ - galaxy -root \n\ - goop -root \n\ - grav -root \n\ - ifs -root \n\ -@GL_KLUDGE@ GL: jigsaw -root \n\ - julia -root \n\ -- kaleidescope -root \n\ -@GL_KLUDGE@ GL: moebius -root \n\ - moire -root \n\ -@GL_KLUDGE@ GL: morph3d -root \n\ - mountain -root \n\ - munch -root \n\ - penrose -root \n\ -@GL_KLUDGE@ GL: pipes -root \n\ - rd-bomb -root \n\ -@GL_KLUDGE@ GL: rubik -root \n\ -- sierpinski -root \n\ - slip -root \n\ -@GL_KLUDGE@ GL: sproingies -root \n\ - starfish -root \n\ - strange -root \n\ - swirl -root \n\ - triangle -root \n\ - xjack -root \n\ - xlyap -root \n\ -@GL_KLUDGE@ GL: atlantis -root \n\ - bsod -root \n\ -@GL_KLUDGE@ GL: bubble3d -root \n\ -@GL_KLUDGE@ GL: cage -root \n\ -- crystal -root \n\ - cynosure -root \n\ - discrete -root \n\ - distort -root \n\ - epicycle -root \n\ - flow -root \n\ -@GL_KLUDGE@ GL: glplanet -root \n\ - interference -root \n\ - kumppa -root \n\ -@GL_KLUDGE@ GL: lament -root \n\ - moire2 -root \n\ -@GL_KLUDGE@ GL: sonar -root \n\ -@GL_KLUDGE@ GL: stairs -root \n\ - truchet -root \n\ -- vidwhacker -root \n\ - blaster -root \n\ - bumps -root \n\ - ccurve -root \n\ - compass -root \n\ - deluxe -root \n\ -- demon -root \n\ -@GLE_KLUDGE@ GL: extrusion -root \n\ -- loop -root \n\ - penetrate -root \n\ - petri -root \n\ - phosphor -root \n\ -@GL_KLUDGE@ GL: pulsar -root \n\ - ripples -root \n\ - shadebobs -root \n\ -@GL_KLUDGE@ GL: sierpinski3d -root \n\ - spotlight -root \n\ - squiral -root \n\ - wander -root \n\ -- webcollage -root \n\ - xflame -root \n\ - xmatrix -root \n\ -@GL_KLUDGE@ GL: gflux -root \n\ -- nerverot -root \n\ - xrayswarm -root \n\ - xspirograph -root \n\ -@GL_KLUDGE@ GL: circuit -root \n\ -@GL_KLUDGE@ GL: dangerball -root \n\ -- GL: dnalogo -root \n\ -@GL_KLUDGE@ GL: engine -root \n\ -@GL_KLUDGE@ GL: flipscreen3d -root \n\ -@GL_KLUDGE@ GL: gltext -root \n\ -@GL_KLUDGE@ GL: menger -root \n\ -@GL_KLUDGE@ GL: molecule -root \n\ - rotzoomer -root \n\ - scooter -root \n\ - speedmine -root \n\ -@GL_KLUDGE@ GL: starwars -root \n\ -@GL_KLUDGE@ GL: stonerview -root \n\ - vermiculate -root \n\ - whirlwindwarp -root \n\ - zoom -root \n\ - anemone -root \n\ - apollonian -root \n\ -@GL_KLUDGE@ GL: boxed -root \n\ -@GL_KLUDGE@ GL: cubenetic -root \n\ -@GL_KLUDGE@ GL: endgame -root \n\ - euler2d -root \n\ - fluidballs -root \n\ -@GL_KLUDGE@ GL: flurry -root \n\ -- GL: glblur -root \n\ -@GL_KLUDGE@ GL: glsnake -root \n\ - halftone -root \n\ -@GL_KLUDGE@ GL: juggler3d -root \n\ -@GL_KLUDGE@ GL: lavalite -root \n\ -- polyominoes -root \n\ -@GL_KLUDGE@ GL: queens -root \n\ -- GL: sballs -root \n\ -@GL_KLUDGE@ GL: spheremonics -root \n\ -- thornbird -root \n\ - twang -root \n\ -- GL: antspotlight -root \n\ - apple2 -root \n\ -@GL_KLUDGE@ GL: atunnel -root \n\ - barcode -root \n\ -@GL_KLUDGE@ GL: blinkbox -root \n\ -@GL_KLUDGE@ GL: blocktube -root \n\ -@GL_KLUDGE@ GL: bouncingcow -root \n\ - cloudlife -root \n\ -@GL_KLUDGE@ GL: cubestorm -root \n\ - eruption -root \n\ -@GL_KLUDGE@ GL: flipflop -root \n\ -@GL_KLUDGE@ GL: flyingtoasters -root \n\ - fontglide -root \n\ -@GL_KLUDGE@ GL: gleidescope -root \n\ -@GL_KLUDGE@ GL: glknots -root \n\ -@GL_KLUDGE@ GL: glmatrix -root \n\ -- GL: glslideshow -root \n\ -@GL_KLUDGE@ GL: hypertorus -root \n\ -- GL: jigglypuff -root \n\ - metaballs -root \n\ -@GL_KLUDGE@ GL: mirrorblob -root \n\ - piecewise -root \n\ -@GL_KLUDGE@ GL: polytopes -root \n\ - pong -root \n\ - popsquares -root \n\ -@GL_KLUDGE@ GL: surfaces -root \n\ - xanalogtv -root \n\ - abstractile -root \n\ - anemotaxis -root \n\ -- GL: antinspect -root \n\ - fireworkx -root \n\ - fuzzyflakes -root \n\ - interaggregate -root \n\ - intermomentary -root \n\ - memscroller -root \n\ -@GL_KLUDGE@ GL: noof -root \n\ - pacman -root \n\ -@GL_KLUDGE@ GL: pinion -root \n\ -@GL_KLUDGE@ GL: polyhedra -root \n\ -- GL: providence -root \n\ - substrate -root \n\ - wormhole -root \n\ -- GL: antmaze -root \n\ -@GL_KLUDGE@ GL: boing -root \n\ - boxfit -root \n\ -@GL_KLUDGE@ GL: carousel -root \n\ - celtic -root \n\ -@GL_KLUDGE@ GL: crackberg -root \n\ -@GL_KLUDGE@ GL: cube21 -root \n\ - fiberlamp -root \n\ -@GL_KLUDGE@ GL: fliptext -root \n\ -@GL_KLUDGE@ GL: glhanoi -root \n\ -@GL_KLUDGE@ GL: tangram -root \n\ -@GL_KLUDGE@ GL: timetunnel -root \n\ -@GL_KLUDGE@ GL: glschool -root \n\ -@GL_KLUDGE@ GL: topblock -root \n\ -@GL_KLUDGE@ GL: cubicgrid -root \n\ - cwaves -root \n\ -@GL_KLUDGE@ GL: gears -root \n\ -@GL_KLUDGE@ GL: glcells -root \n\ -@GL_KLUDGE@ GL: lockward -root \n\ - m6502 -root \n\ -@GL_KLUDGE@ GL: moebiusgears -root \n\ -@GL_KLUDGE@ GL: voronoi -root \n\ -@GL_KLUDGE@ GL: hypnowheel -root \n\ -@GL_KLUDGE@ GL: klein -root \n\ -- lcdscrub -root \n\ -@GL_KLUDGE@ GL: photopile -root \n\ -@GL_KLUDGE@ GL: skytentacles -root \n\ -@GL_KLUDGE@ GL: rubikblocks -root \n\ -@GL_KLUDGE@ GL: companioncube -root \n\ -@GL_KLUDGE@ GL: hilbert -root \n\ -@GL_KLUDGE@ GL: tronbit -root \n\ -@GL_KLUDGE@ GL: geodesic -root \n\ - hexadrop -root \n\ -@GL_KLUDGE@ GL: kaleidocycle -root \n\ -@GL_KLUDGE@ GL: quasicrystal -root \n\ -@GL_KLUDGE@ GL: unknownpleasures -root \n\ - binaryring -root \n\ -@GL_KLUDGE@ GL: cityflow -root \n\ -@GL_KLUDGE@ GL: geodesicgears -root \n\ -@GL_KLUDGE@ GL: projectiveplane -root \n\ -@GL_KLUDGE@ GL: romanboy -root \n\ - tessellimage -root \n\ -@GL_KLUDGE@ GL: winduprobot -root \n\ -@GL_KLUDGE@ GL: splitflap -root \n\ -@GL_KLUDGE@ GL: cubestack -root \n\ -@GL_KLUDGE@ GL: cubetwist -root \n\ -@GL_KLUDGE@ GL: discoball -root \n\ -@GL_KLUDGE@ GL: dymaxionmap -root \n\ -@GL_KLUDGE@ GL: energystream -root \n\ -@GL_KLUDGE@ GL: hexstrut -root \n\ -@GL_KLUDGE@ GL: hydrostat -root \n\ -@GL_KLUDGE@ GL: raverhoop -root \n\ -@GL_KLUDGE@ GL: splodesic -root \n\ -@GL_KLUDGE@ GL: unicrud -root \n\ -@GL_KLUDGE@ GL: esper -root \n\ -@GL_KLUDGE@ GL: vigilance -root \n\ -@GL_KLUDGE@ GL: crumbler -root \n\ - filmleader -root \n\ - glitchpeg -root \n\ -@GL_KLUDGE@ GL: handsy -root \n\ -@GL_KLUDGE@ GL: maze3d -root \n\ -@GL_KLUDGE@ GL: peepers -root \n\ -@GL_KLUDGE@ GL: razzledazzle -root \n\ - vfeedback -root \n\ -@GL_KLUDGE@ GL: deepstars -root \n\ -@GL_KLUDGE@ GL: gravitywell -root \n\ -@GL_KLUDGE@ GL: beats -root \n\ -@GL_KLUDGE@ GL: covid19 -root \n\ -@GL_KLUDGE@ GL: etruscanvenus -root \n\ -@GL_KLUDGE@ GL: gibson -root \n\ -@GL_KLUDGE@ GL: headroom -root \n\ -@GL_KLUDGE@ GL: sphereeversion -root \n + maze --root \n\ +@GL_KLUDGE@ GL: superquadrics --root \n\ + attraction --root \n\ + blitspin --root \n\ + greynetic --root \n\ + helix --root \n\ + hopalong --root \n\ + imsmap --root \n\ +- noseguy --root \n\ +- pyro --root \n\ + qix --root \n\ +- rocks --root \n\ + rorschach --root \n\ + decayscreen --root \n\ + flame --root \n\ + halo --root \n\ + slidescreen --root \n\ + pedal --root \n\ + bouboule --root \n\ +- braid --root \n\ + coral --root \n\ + deco --root \n\ + drift --root \n\ +- fadeplot --root \n\ + galaxy --root \n\ + goop --root \n\ + grav --root \n\ + ifs --root \n\ +@GL_KLUDGE@ GL: jigsaw --root \n\ + julia --root \n\ +- kaleidescope --root \n\ +@GL_KLUDGE@ GL: moebius --root \n\ + moire --root \n\ +@GL_KLUDGE@ GL: morph3d --root \n\ + mountain --root \n\ + munch --root \n\ + penrose --root \n\ +@GL_KLUDGE@ GL: pipes --root \n\ + rdbomb --root \n\ +@GL_KLUDGE@ GL: rubik --root \n\ +- sierpinski --root \n\ + slip --root \n\ +@GL_KLUDGE@ GL: sproingies --root \n\ + starfish --root \n\ + strange --root \n\ + swirl --root \n\ + triangle --root \n\ + xjack --root \n\ + xlyap --root \n\ +@GL_KLUDGE@ GL: atlantis --root \n\ + bsod --root \n\ +@GL_KLUDGE@ GL: bubble3d --root \n\ +@GL_KLUDGE@ GL: cage --root \n\ +- crystal --root \n\ + cynosure --root \n\ + discrete --root \n\ + distort --root \n\ + epicycle --root \n\ + flow --root \n\ +@GL_KLUDGE@ GL: glplanet --root \n\ + interference --root \n\ + kumppa --root \n\ +@GL_KLUDGE@ GL: lament --root \n\ + moire2 --root \n\ +@GL_KLUDGE@ GL: sonar --root \n\ +@GL_KLUDGE@ GL: stairs --root \n\ + truchet --root \n\ +- vidwhacker --root \n\ +- webcollage --root \n\ + blaster --root \n\ + bumps --root \n\ + ccurve --root \n\ + compass --root \n\ + deluxe --root \n\ +- demon --root \n\ +@GLE_KLUDGE@ GL: extrusion --root \n\ +- loop --root \n\ + penetrate --root \n\ + petri --root \n\ + phosphor --root \n\ +@GL_KLUDGE@ GL: pulsar --root \n\ + ripples --root \n\ + shadebobs --root \n\ +@GL_KLUDGE@ GL: sierpinski3d --root \n\ + spotlight --root \n\ + squiral --root \n\ + wander --root \n\ + xflame --root \n\ + xmatrix --root \n\ +@GL_KLUDGE@ GL: gflux --root \n\ +- nerverot --root \n\ + xrayswarm --root \n\ + xspirograph --root \n\ +@GL_KLUDGE@ GL: circuit --root \n\ +@GL_KLUDGE@ GL: dangerball --root \n\ +- GL: dnalogo --root \n\ +@GL_KLUDGE@ GL: engine --root \n\ +@GL_KLUDGE@ GL: flipscreen3d --root \n\ +@GL_KLUDGE@ GL: gltext --root \n\ +@GL_KLUDGE@ GL: menger --root \n\ +@GL_KLUDGE@ GL: molecule --root \n\ + rotzoomer --root \n\ + scooter --root \n\ + speedmine --root \n\ +@GL_KLUDGE@ GL: starwars --root \n\ +@GL_KLUDGE@ GL: stonerview --root \n\ + vermiculate --root \n\ + whirlwindwarp --root \n\ + zoom --root \n\ + anemone --root \n\ + apollonian --root \n\ +@GL_KLUDGE@ GL: boxed --root \n\ +@GL_KLUDGE@ GL: cubenetic --root \n\ +@GL_KLUDGE@ GL: endgame --root \n\ + euler2d --root \n\ + fluidballs --root \n\ +@GL_KLUDGE@ GL: flurry --root \n\ +- GL: glblur --root \n\ +@GL_KLUDGE@ GL: glsnake --root \n\ + halftone --root \n\ +@GL_KLUDGE@ GL: juggler3d --root \n\ +@GL_KLUDGE@ GL: lavalite --root \n\ +- polyominoes --root \n\ +@GL_KLUDGE@ GL: queens --root \n\ +- GL: sballs --root \n\ +@GL_KLUDGE@ GL: spheremonics --root \n\ + twang --root \n\ +- GL: antspotlight --root \n\ + apple2 --root \n\ +@GL_KLUDGE@ GL: atunnel --root \n\ + barcode --root \n\ +@GL_KLUDGE@ GL: blinkbox --root \n\ +@GL_KLUDGE@ GL: blocktube --root \n\ +@GL_KLUDGE@ GL: bouncingcow --root \n\ + cloudlife --root \n\ +@GL_KLUDGE@ GL: cubestorm --root \n\ + eruption --root \n\ +@GL_KLUDGE@ GL: flipflop --root \n\ +@GL_KLUDGE@ GL: flyingtoasters --root \n\ + fontglide --root \n\ +@GL_KLUDGE@ GL: gleidescope --root \n\ +@GL_KLUDGE@ GL: glknots --root \n\ +@GL_KLUDGE@ GL: glmatrix --root \n\ +- GL: glslideshow --root \n\ +@GL_KLUDGE@ GL: hypertorus --root \n\ +- GL: jigglypuff --root \n\ + metaballs --root \n\ +@GL_KLUDGE@ GL: mirrorblob --root \n\ + piecewise --root \n\ +@GL_KLUDGE@ GL: polytopes --root \n\ + pong --root \n\ + popsquares --root \n\ +@GL_KLUDGE@ GL: surfaces --root \n\ + xanalogtv --root \n\ + abstractile --root \n\ + anemotaxis --root \n\ +- GL: antinspect --root \n\ + fireworkx --root \n\ + fuzzyflakes --root \n\ + interaggregate --root \n\ + intermomentary --root \n\ + memscroller --root \n\ +@GL_KLUDGE@ GL: noof --root \n\ + pacman --root \n\ +@GL_KLUDGE@ GL: pinion --root \n\ +@GL_KLUDGE@ GL: polyhedra --root \n\ +- GL: providence --root \n\ + substrate --root \n\ + wormhole --root \n\ +- GL: antmaze --root \n\ +@GL_KLUDGE@ GL: boing --root \n\ + boxfit --root \n\ +@GL_KLUDGE@ GL: carousel --root \n\ + celtic --root \n\ +@GL_KLUDGE@ GL: crackberg --root \n\ +@GL_KLUDGE@ GL: cube21 --root \n\ + fiberlamp --root \n\ +@GL_KLUDGE@ GL: fliptext --root \n\ +@GL_KLUDGE@ GL: glhanoi --root \n\ +@GL_KLUDGE@ GL: tangram --root \n\ +@GL_KLUDGE@ GL: timetunnel --root \n\ +@GL_KLUDGE@ GL: glschool --root \n\ +@GL_KLUDGE@ GL: topblock --root \n\ +@GL_KLUDGE@ GL: cubicgrid --root \n\ + cwaves --root \n\ +@GL_KLUDGE@ GL: gears --root \n\ +@GL_KLUDGE@ GL: glcells --root \n\ +@GL_KLUDGE@ GL: lockward --root \n\ + m6502 --root \n\ +@GL_KLUDGE@ GL: moebiusgears --root \n\ +@GL_KLUDGE@ GL: voronoi --root \n\ +@GL_KLUDGE@ GL: hypnowheel --root \n\ +@GL_KLUDGE@ GL: klein --root \n\ +- lcdscrub --root \n\ +@GL_KLUDGE@ GL: photopile --root \n\ +@GL_KLUDGE@ GL: skytentacles --root \n\ +@GL_KLUDGE@ GL: rubikblocks --root \n\ +@GL_KLUDGE@ GL: companioncube --root \n\ +@GL_KLUDGE@ GL: hilbert --root \n\ +@GL_KLUDGE@ GL: tronbit --root \n\ +@GL_KLUDGE@ GL: geodesic --root \n\ + hexadrop --root \n\ +@GL_KLUDGE@ GL: kaleidocycle --root \n\ +@GL_KLUDGE@ GL: quasicrystal --root \n\ +@GL_KLUDGE@ GL: unknownpleasures --root \n\ + binaryring --root \n\ +@GL_KLUDGE@ GL: cityflow --root \n\ +@GL_KLUDGE@ GL: geodesicgears --root \n\ +@GL_KLUDGE@ GL: projectiveplane --root \n\ +@GL_KLUDGE@ GL: romanboy --root \n\ + tessellimage --root \n\ +@GL_KLUDGE@ GL: winduprobot --root \n\ +@GL_KLUDGE@ GL: splitflap --root \n\ +@GL_KLUDGE@ GL: cubestack --root \n\ +@GL_KLUDGE@ GL: cubetwist --root \n\ +@GL_KLUDGE@ GL: discoball --root \n\ +@GL_KLUDGE@ GL: dymaxionmap --root \n\ +@GL_KLUDGE@ GL: energystream --root \n\ +@GL_KLUDGE@ GL: hexstrut --root \n\ +@GL_KLUDGE@ GL: hydrostat --root \n\ +@GL_KLUDGE@ GL: raverhoop --root \n\ +@GL_KLUDGE@ GL: splodesic --root \n\ +@GL_KLUDGE@ GL: unicrud --root \n\ +@GL_KLUDGE@ GL: esper --root \n\ +@GL_KLUDGE@ GL: vigilance --root \n\ +@GL_KLUDGE@ GL: crumbler --root \n\ + filmleader --root \n\ + glitchpeg --root \n\ +@GL_KLUDGE@ GL: handsy --root \n\ +@GL_KLUDGE@ GL: maze3d --root \n\ +@GL_KLUDGE@ GL: peepers --root \n\ +@GL_KLUDGE@ GL: razzledazzle --root \n\ + vfeedback --root \n\ +@GL_KLUDGE@ GL: deepstars --root \n\ +@GL_KLUDGE@ GL: gravitywell --root \n\ +@GL_KLUDGE@ GL: beats --root \n\ +@GL_KLUDGE@ GL: covid19 --root \n\ +@GL_KLUDGE@ GL: etruscanvenus --root \n\ +@GL_KLUDGE@ GL: gibson --root \n\ +@GL_KLUDGE@ GL: headroom --root \n\ +@GL_KLUDGE@ GL: sphereeversion --root \n\ + binaryhorizon --root \n\ + marbling --root \n\ +@GL_KLUDGE@ GL: chompytower --root \n\ +@GL_KLUDGE@ GL: hextrail --root \n\ +@GL_KLUDGE@ GL: mapscroller --root \n\ +@GL_KLUDGE@ GL: nakagin --root \n\ +@GL_KLUDGE@ GL: squirtorus --root \n\ +@GL_KLUDGE@ GL: cubocteversion --root \n\ + droste --root \n\ +@GL_KLUDGE@ GL: papercube --root \n\ +@GL_KLUDGE@ GL: skulloop --root \n\ +@GL_KLUDGE@ GL: highvoltage --root \n\ +@GL_KLUDGE@ GL: kallisti --root \n @@ -580,6 +592,7 @@ XScreenSaver.bourneShell: /bin/sh *hacks.antmaze.name: Ant Maze *hacks.antspotlight.name: Ant Spotlight *hacks.apple2.name: Apple ][ +*hacks.binaryhorizon.name: Binary Horizon *hacks.binaryring.name: Binary Ring *hacks.blinkbox.name: Blink Box *hacks.blitspin.name: Blit Spin @@ -589,6 +602,7 @@ XScreenSaver.bourneShell: /bin/sh *hacks.bsod.name: BSOD *hacks.bubble3d.name: Bubble 3D *hacks.ccurve.name: C Curve +*hacks.chompytower.name: Chompy Tower *hacks.cityflow.name: City Flow *hacks.cloudlife.name: Cloud Life *hacks.companioncube.name: Companion Cube @@ -598,6 +612,7 @@ XScreenSaver.bourneShell: /bin/sh *hacks.cubestorm.name: Cube Storm *hacks.cubetwist.name: Cube Twist *hacks.cubicgrid.name: Cubic Grid +*hacks.cubocteversion.name: Cuboctahedron Eversion *hacks.cwaves.name: C Waves *hacks.dangerball.name: Danger Ball *hacks.decayscreen.name: Decay Screen @@ -634,6 +649,8 @@ XScreenSaver.bourneShell: /bin/sh *hacks.gltext.name: GL Text *hacks.gravitywell.name: Gravity Well *hacks.hexstrut.name: Hex Strut +*hacks.hextrail.name: Hex Trail +*hacks.highvoltage.name: High Voltage *hacks.ifs.name: IFS *hacks.imsmap.name: IMS Map *hacks.jigglypuff.name: Jiggly Puff @@ -641,6 +658,7 @@ XScreenSaver.bourneShell: /bin/sh *hacks.lcdscrub.name: LCD Scrub *hacks.lmorph.name: LMorph *hacks.m6502.name: m6502 +*hacks.mapscroller.name: Map Scroller *hacks.maze3d.name: Maze 3D *hacks.memscroller.name: Mem Scroller *hacks.metaballs.name: Meta Balls @@ -653,14 +671,14 @@ XScreenSaver.bourneShell: /bin/sh *hacks.nerverot.name: Nerve Rot *hacks.noseguy.name: Nose Guy *hacks.pacman.name: Pac-Man +*hacks.papercube.name: Paper Cube *hacks.photopile.name: Photo Pile *hacks.popsquares.name: Pop Squares *hacks.projectiveplane.name:Projective Plane *hacks.quasicrystal.name: Quasi-Crystal *hacks.raverhoop.name: Raver Hoop *hacks.razzledazzle.name: Razzle Dazzle -*hacks.rd-bomb.name: RD-Bomb -*hacks.rd-bomb.name: RD-Bomb +*hacks.rdbomb.name: RD-Bomb *hacks.romanboy.name: Roman Boy *hacks.rotzoomer.name: Rot Zoomer *hacks.rubikblocks.name: Rubik Blocks diff --git a/driver/XScreenSaver_Xm_ad.h b/driver/XScreenSaver_Xm_ad.h new file mode 100644 index 0000000..371e0a2 --- /dev/null +++ b/driver/XScreenSaver_Xm_ad.h @@ -0,0 +1,108 @@ +"*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", +"*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", diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h new file mode 100644 index 0000000..c469a3e --- /dev/null +++ b/driver/XScreenSaver_ad.h @@ -0,0 +1,551 @@ +"#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.", +"*mode: random", +"*timeout: 0:10:00", +"*cycle: 0:10:00", +"*lockTimeout: 0:00:00", +"*passwdTimeout: 0:00:30", +"*dpmsEnabled: False", +"*dpmsQuickoffEnabled: False", +"*dpmsStandby: 2:00:00", +"*dpmsSuspend: 2:00:00", +"*dpmsOff: 4:00:00", +"*grabDesktopImages: True", +"*grabVideoFrames: False", +"*chooseRandomImages: True", +"*imageDirectory: /Library/Desktop Pictures/", +"*nice: 10", +"*memoryLimit: 0", +"*lock: False", +"*verbose: False", +"*fade: True", +"*unfade: True", +"*fadeSeconds: 0:00:03", +"*fadeTicks: 20", +"*splash: True", +"*splashDuration: 0:00:05", +"*visualID: default", +"*installColormap: True", +"*ignoreUninstalledPrograms: False", +"*authWarningSlack: 20", +"*textMode: url", +"*textLiteral: XScreenSaver", +"*textFile: ", +"*textProgram: fortune", +"*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss", +"*demoCommand: xscreensaver-settings", +"*helpURL: https://www.jwz.org/xscreensaver/man.html", +"*loadURL: x-www-browser '%s' || firefox '%s' || chromium-browser '%s'", +"*manualCommand: lxterminal -T '%s manual' \ + -e /bin/sh -c 'man \"%s\" ; read foo'", +"*dateFormat: %I:%M %p, %a %b %e", +"*newLoginCommand: no-such-login-manager", +"XScreenSaver.pointerHysteresis: 10", +"XScreenSaver.bourneShell: /bin/sh", +"*dialogTheme: default", +"*themeNames: Default, Borderless, Dark Gray, Borderless Black, \ + Green Black, White, Blue, Aqua Black, Wine", +"*Dialog.headingFont: sans-serif bold 16", +"*Dialog.bodyFont: sans-serif 14", +"*Dialog.errorFont: sans-serif bold 14", +"*Dialog.labelFont: sans-serif bold 14", +"*Dialog.unameFont: sans-serif 12", +"*Dialog.buttonFont: sans-serif bold 14", +"*Dialog.dateFont: sans-serif 9", +"*passwd.uname: True", +"*passwd.asterisks: True", +"*default.Dialog.foreground: #000000", +"*default.Dialog.background: #E6E6E6", +"*default.Dialog.button.foreground: #000000", +"*default.Dialog.button.background: #F5F5F5", +"*default.Dialog.logo.background: #BBBBBB", +"*default.Dialog.text.foreground: #000000", +"*default.Dialog.error.foreground: #FF0000", +"*default.Dialog.text.background: #FFFFFF", +"*default.Dialog.topShadowColor: #FFFFFF", +"*default.Dialog.bottomShadowColor: #CECECE", +"*default.Dialog.shadowWidth: 2", +"*default.Dialog.logo.width: 210", +"*default.Dialog.logo.height: 210", +"*default.Dialog.thermometer.foreground: #4464AC", +"*default.Dialog.thermometer.background: #FFFFFF", +"*default.Dialog.thermometer.width: 8", +"*default.Dialog.borderColor: #CECECE", +"*default.Dialog.borderWidth: 0", +"*default.Dialog.internalPadding: 24", +"*borderless.Dialog.topShadowColor: #E6E6E6", +"*borderless.Dialog.button.background: #FFFFFF", +"*borderless.Dialog.bottomShadowColor: #E6E6E6", +"*borderless.Dialog.logo.background: #E6E6E6", +"*borderless.Dialog.borderColor: #888888", +"*borderless.Dialog.thermometer.width: 6", +"*borderless.Dialog.borderWidth: 1", +"*darkgray.Dialog.foreground: #CCCCCC", +"*darkgray.Dialog.background: #333333", +"*darkgray.Dialog.topShadowColor: #444444", +"*darkgray.Dialog.bottomShadowColor: #111111", +"*darkgray.Dialog.borderColor: #111111", +"*darkgray.Dialog.text.foreground: #DDDDDD", +"*darkgray.Dialog.text.background: #666666", +"*darkgray.Dialog.button.foreground: #CCCCCC", +"*darkgray.Dialog.button.background: #666666", +"*darkgray.Dialog.logo.background: #444444", +"*darkgray.Dialog.thermometer.foreground: #4464AC", +"*darkgray.Dialog.thermometer.background: #666666", +"*darkgray.Dialog.borderWidth: 0", +"*borderlessblack.Dialog.foreground: #CCCCCC", +"*borderlessblack.Dialog.background: #000000", +"*borderlessblack.Dialog.topShadowColor: #000000", +"*borderlessblack.Dialog.bottomShadowColor: #000000", +"*borderlessblack.Dialog.text.foreground: #CCCCCC", +"*borderlessblack.Dialog.text.background: #000000", +"*borderlessblack.Dialog.button.foreground: #CCCCCC", +"*borderlessblack.Dialog.button.background: #333333", +"*borderlessblack.Dialog.logo.background: #000000", +"*borderlessblack.Dialog.thermometer.foreground: #CCCCCC", +"*borderlessblack.Dialog.thermometer.background: #333333", +"*borderlessblack.Dialog.thermometer.width: 3", +"*borderlessblack.Dialog.borderColor: #333333", +"*borderlessblack.Dialog.borderWidth: 1", +"*greenblack.Dialog.foreground: #00FF00", +"*greenblack.Dialog.background: #000000", +"*greenblack.Dialog.topShadowColor: #000000", +"*greenblack.Dialog.bottomShadowColor: #000000", +"*greenblack.Dialog.shadowWidth: 1", +"*greenblack.Dialog.text.foreground: #00FF00", +"*greenblack.Dialog.text.background: #006600", +"*greenblack.Dialog.button.foreground: #00FF00", +"*greenblack.Dialog.button.background: #006600", +"*greenblack.Dialog.logo.background: #000000", +"*greenblack.Dialog.thermometer.foreground: #00CC00", +"*greenblack.Dialog.thermometer.background: #006600", +"*greenblack.Dialog.borderColor: #006600", +"*greenblack.Dialog.borderWidth: 1", +"*white.Dialog.foreground: #000000", +"*white.Dialog.background: #FFFFFF", +"*white.Dialog.topShadowColor: #CCCCCC", +"*white.Dialog.bottomShadowColor: #CCCCCC", +"*white.Dialog.shadowWidth: 1", +"*white.Dialog.borderColor: #CCCCCC", +"*white.Dialog.text.foreground: #000000", +"*white.Dialog.text.background: #FFFFFF", +"*white.Dialog.button.foreground: #000000", +"*white.Dialog.button.background: #FFFFFF", +"*white.Dialog.logo.background: #FFFFFF", +"*white.Dialog.borderWidth: 0", +"*blue.Dialog.foreground: #000000", +"*blue.Dialog.background: #BBCCDD", +"*blue.Dialog.topShadowColor: #CCDDEE", +"*blue.Dialog.bottomShadowColor: #AABBCC", +"*blue.Dialog.borderColor: #AABBCC", +"*blue.Dialog.text.foreground: #000000", +"*blue.Dialog.text.background: #DDEEFF", +"*blue.Dialog.button.foreground: #000000", +"*blue.Dialog.button.background: #DDEEFF", +"*blue.Dialog.logo.background: #BBCCDD", +"*blue.Dialog.thermometer.foreground: #5566AA", +"*blue.Dialog.thermometer.background: #BBCCDD", +"*blue.Dialog.borderWidth: 0", +"*aquablack.Dialog.foreground: #00EFEF", +"*aquablack.Dialog.background: #000000", +"*aquablack.Dialog.topShadowColor: #000000", +"*aquablack.Dialog.bottomShadowColor: #000000", +"*aquablack.Dialog.shadowWidth: 2", +"*aquablack.Dialog.button.foreground: #000000", +"*aquablack.Dialog.button.background: #2244EE", +"*aquablack.Dialog.logo.background: #000000", +"*aquablack.Dialog.text.foreground: #2244EE", +"*aquablack.Dialog.text.background: #EEEEEE", +"*aquablack.Dialog.thermometer.foreground: #2244EE", +"*aquablack.Dialog.thermometer.background: #000088", +"*aquablack.Dialog.borderColor: #000066", +"*aquablack.Dialog.borderWidth: 1", +"*aquablack.Dialog.internalPadding: 36", +"*wine.Dialog.foreground: #AD8FA6", +"*wine.Dialog.background: #2C041E", +"*wine.Dialog.topShadowColor: #2C041E", +"*wine.Dialog.bottomShadowColor: #2C041E", +"*wine.Dialog.text.foreground: #706B70", +"*wine.Dialog.text.background: #F9F9F8", +"*wine.Dialog.button.foreground: #5F585B", +"*wine.Dialog.logo.background: #2C041E", +"*wine.Dialog.thermometer.foreground: #AD8FA6", +"*wine.Dialog.thermometer.background: #4D2946", +"*wine.Dialog.borderColor: #4D2946", +"*wine.Dialog.thermometer.width: 6", +"*wine.Dialog.borderWidth: 1", +"*errorFont: sans-serif bold 18", +"*errorColor: #FF0000", +"*programs: \ + maze --root \\n\ + GL: superquadrics --root \\n\ + attraction --root \\n\ + blitspin --root \\n\ + greynetic --root \\n\ + helix --root \\n\ + hopalong --root \\n\ + imsmap --root \\n\ +- noseguy --root \\n\ +- pyro --root \\n\ + qix --root \\n\ +- rocks --root \\n\ + rorschach --root \\n\ + decayscreen --root \\n\ + flame --root \\n\ + halo --root \\n\ + slidescreen --root \\n\ + pedal --root \\n\ + bouboule --root \\n\ +- braid --root \\n\ + coral --root \\n\ + deco --root \\n\ + drift --root \\n\ +- fadeplot --root \\n\ + galaxy --root \\n\ + goop --root \\n\ + grav --root \\n\ + ifs --root \\n\ + GL: jigsaw --root \\n\ + julia --root \\n\ +- kaleidescope --root \\n\ + GL: moebius --root \\n\ + moire --root \\n\ + GL: morph3d --root \\n\ + mountain --root \\n\ + munch --root \\n\ + penrose --root \\n\ + GL: pipes --root \\n\ + rdbomb --root \\n\ + GL: rubik --root \\n\ +- sierpinski --root \\n\ + slip --root \\n\ + GL: sproingies --root \\n\ + starfish --root \\n\ + strange --root \\n\ + swirl --root \\n\ + triangle --root \\n\ + xjack --root \\n\ + xlyap --root \\n\ + GL: atlantis --root \\n\ + bsod --root \\n\ + GL: bubble3d --root \\n\ + GL: cage --root \\n\ +- crystal --root \\n\ + cynosure --root \\n\ + discrete --root \\n\ + distort --root \\n\ + epicycle --root \\n\ + flow --root \\n\ + GL: glplanet --root \\n\ + interference --root \\n\ + kumppa --root \\n\ + GL: lament --root \\n\ + moire2 --root \\n\ + GL: sonar --root \\n\ + GL: stairs --root \\n\ + truchet --root \\n\ +- vidwhacker --root \\n\ +- webcollage --root \\n\ + blaster --root \\n\ + bumps --root \\n\ + ccurve --root \\n\ + compass --root \\n\ + deluxe --root \\n\ +- demon --root \\n\ +- GL: extrusion --root \\n\ +- loop --root \\n\ + penetrate --root \\n\ + petri --root \\n\ + phosphor --root \\n\ + GL: pulsar --root \\n\ + ripples --root \\n\ + shadebobs --root \\n\ + GL: sierpinski3d --root \\n\ + spotlight --root \\n\ + squiral --root \\n\ + wander --root \\n\ + xflame --root \\n\ + xmatrix --root \\n\ + GL: gflux --root \\n\ +- nerverot --root \\n\ + xrayswarm --root \\n\ + xspirograph --root \\n\ + GL: circuit --root \\n\ + GL: dangerball --root \\n\ +- GL: dnalogo --root \\n\ + GL: engine --root \\n\ + GL: flipscreen3d --root \\n\ + GL: gltext --root \\n\ + GL: menger --root \\n\ + GL: molecule --root \\n\ + rotzoomer --root \\n\ + scooter --root \\n\ + speedmine --root \\n\ + GL: starwars --root \\n\ + GL: stonerview --root \\n\ + vermiculate --root \\n\ + whirlwindwarp --root \\n\ + zoom --root \\n\ + anemone --root \\n\ + apollonian --root \\n\ + GL: boxed --root \\n\ + GL: cubenetic --root \\n\ + GL: endgame --root \\n\ + euler2d --root \\n\ + fluidballs --root \\n\ + GL: flurry --root \\n\ +- GL: glblur --root \\n\ + GL: glsnake --root \\n\ + halftone --root \\n\ + GL: juggler3d --root \\n\ + GL: lavalite --root \\n\ +- polyominoes --root \\n\ + GL: queens --root \\n\ +- GL: sballs --root \\n\ + GL: spheremonics --root \\n\ + twang --root \\n\ +- GL: antspotlight --root \\n\ + apple2 --root \\n\ + GL: atunnel --root \\n\ + barcode --root \\n\ + GL: blinkbox --root \\n\ + GL: blocktube --root \\n\ + GL: bouncingcow --root \\n\ + cloudlife --root \\n\ + GL: cubestorm --root \\n\ + eruption --root \\n\ + GL: flipflop --root \\n\ + GL: flyingtoasters --root \\n\ + fontglide --root \\n\ + GL: gleidescope --root \\n\ + GL: glknots --root \\n\ + GL: glmatrix --root \\n\ +- GL: glslideshow --root \\n\ + GL: hypertorus --root \\n\ +- GL: jigglypuff --root \\n\ + metaballs --root \\n\ + GL: mirrorblob --root \\n\ + piecewise --root \\n\ + GL: polytopes --root \\n\ + pong --root \\n\ + popsquares --root \\n\ + GL: surfaces --root \\n\ + xanalogtv --root \\n\ + abstractile --root \\n\ + anemotaxis --root \\n\ +- GL: antinspect --root \\n\ + fireworkx --root \\n\ + fuzzyflakes --root \\n\ + interaggregate --root \\n\ + intermomentary --root \\n\ + memscroller --root \\n\ + GL: noof --root \\n\ + pacman --root \\n\ + GL: pinion --root \\n\ + GL: polyhedra --root \\n\ +- GL: providence --root \\n\ + substrate --root \\n\ + wormhole --root \\n\ +- GL: antmaze --root \\n\ + GL: boing --root \\n\ + boxfit --root \\n\ + GL: carousel --root \\n\ + celtic --root \\n\ + GL: crackberg --root \\n\ + GL: cube21 --root \\n\ + fiberlamp --root \\n\ + GL: fliptext --root \\n\ + GL: glhanoi --root \\n\ + GL: tangram --root \\n\ + GL: timetunnel --root \\n\ + GL: glschool --root \\n\ + GL: topblock --root \\n\ + GL: cubicgrid --root \\n\ + cwaves --root \\n\ + GL: gears --root \\n\ + GL: glcells --root \\n\ + GL: lockward --root \\n\ + m6502 --root \\n\ + GL: moebiusgears --root \\n\ + GL: voronoi --root \\n\ + GL: hypnowheel --root \\n\ + GL: klein --root \\n\ +- lcdscrub --root \\n\ + GL: photopile --root \\n\ + GL: skytentacles --root \\n\ + GL: rubikblocks --root \\n\ + GL: companioncube --root \\n\ + GL: hilbert --root \\n\ + GL: tronbit --root \\n\ + GL: geodesic --root \\n\ + hexadrop --root \\n\ + GL: kaleidocycle --root \\n\ + GL: quasicrystal --root \\n\ + GL: unknownpleasures --root \\n\ + binaryring --root \\n\ + GL: cityflow --root \\n\ + GL: geodesicgears --root \\n\ + GL: projectiveplane --root \\n\ + GL: romanboy --root \\n\ + tessellimage --root \\n\ + GL: winduprobot --root \\n\ + GL: splitflap --root \\n\ + GL: cubestack --root \\n\ + GL: cubetwist --root \\n\ + GL: discoball --root \\n\ + GL: dymaxionmap --root \\n\ + GL: energystream --root \\n\ + GL: hexstrut --root \\n\ + GL: hydrostat --root \\n\ + GL: raverhoop --root \\n\ + GL: splodesic --root \\n\ + GL: unicrud --root \\n\ + GL: esper --root \\n\ + GL: vigilance --root \\n\ + GL: crumbler --root \\n\ + filmleader --root \\n\ + glitchpeg --root \\n\ + GL: handsy --root \\n\ + GL: maze3d --root \\n\ + GL: peepers --root \\n\ + GL: razzledazzle --root \\n\ + vfeedback --root \\n\ + GL: deepstars --root \\n\ + GL: gravitywell --root \\n\ + GL: beats --root \\n\ + GL: covid19 --root \\n\ + GL: etruscanvenus --root \\n\ + GL: gibson --root \\n\ + GL: headroom --root \\n\ + GL: sphereeversion --root \\n\ + binaryhorizon --root \\n\ + marbling --root \\n\ + GL: chompytower --root \\n\ + GL: hextrail --root \\n\ + GL: mapscroller --root \\n\ + GL: nakagin --root \\n\ + GL: squirtorus --root \\n\ + GL: cubocteversion --root \\n\ + droste --root \\n\ + GL: papercube --root \\n\ + GL: skulloop --root \\n\ + GL: highvoltage --root \\n\ + GL: kallisti --root \\n", +"*hacks.antinspect.name: Ant Inspect", +"*hacks.antmaze.name: Ant Maze", +"*hacks.antspotlight.name: Ant Spotlight", +"*hacks.apple2.name: Apple ][", +"*hacks.binaryhorizon.name: Binary Horizon", +"*hacks.binaryring.name: Binary Ring", +"*hacks.blinkbox.name: Blink Box", +"*hacks.blitspin.name: Blit Spin", +"*hacks.blocktube.name: Block Tube", +"*hacks.bouncingcow.name: Bouncing Cow", +"*hacks.boxfit.name: Box Fit", +"*hacks.bsod.name: BSOD", +"*hacks.bubble3d.name: Bubble 3D", +"*hacks.ccurve.name: C Curve", +"*hacks.chompytower.name: Chompy Tower", +"*hacks.cityflow.name: City Flow", +"*hacks.cloudlife.name: Cloud Life", +"*hacks.companioncube.name: Companion Cube", +"*hacks.covid19.name: COVID19", +"*hacks.cube21.name: Cube 21", +"*hacks.cubestack.name: Cube Stack", +"*hacks.cubestorm.name: Cube Storm", +"*hacks.cubetwist.name: Cube Twist", +"*hacks.cubicgrid.name: Cubic Grid", +"*hacks.cubocteversion.name: Cuboctahedron Eversion", +"*hacks.cwaves.name: C Waves", +"*hacks.dangerball.name: Danger Ball", +"*hacks.decayscreen.name: Decay Screen", +"*hacks.deepstars.name: Deep Stars", +"*hacks.dnalogo.name: DNA Logo", +"*hacks.dymaxionmap.name: Dymaxion Map", +"*hacks.energystream.name: Energy Stream", +"*hacks.etruscanvenus.name: Etruscan Venus", +"*hacks.euler2d.name: Euler 2D", +"*hacks.fadeplot.name: Fade Plot", +"*hacks.fiberlamp.name: Fiber Lamp", +"*hacks.filmleader.name: Film Leader", +"*hacks.flipflop.name: Flip Flop", +"*hacks.flipscreen3d.name: Flip Screen 3D", +"*hacks.fliptext.name: Flip Text", +"*hacks.fluidballs.name: Fluid Balls", +"*hacks.flyingtoasters.name: Flying Toasters", +"*hacks.fontglide.name: Font Glide", +"*hacks.fuzzyflakes.name: Fuzzy Flakes", +"*hacks.geodesicgears.name: Geodesic Gears", +"*hacks.gflux.name: GFlux", +"*hacks.glblur.name: GL Blur", +"*hacks.glcells.name: GL Cells", +"*hacks.gleidescope.name: Gleidescope", +"*hacks.glforestfire.name: GL Forest Fire", +"*hacks.glhanoi.name: GL Hanoi", +"*hacks.glitchpeg.name: GlitchPEG", +"*hacks.glknots.name: GL Knots", +"*hacks.glmatrix.name: GL Matrix", +"*hacks.glplanet.name: GL Planet", +"*hacks.glschool.name: GL School", +"*hacks.glslideshow.name: GL Slideshow", +"*hacks.glsnake.name: GL Snake", +"*hacks.gltext.name: GL Text", +"*hacks.gravitywell.name: Gravity Well", +"*hacks.hexstrut.name: Hex Strut", +"*hacks.hextrail.name: Hex Trail", +"*hacks.highvoltage.name: High Voltage", +"*hacks.ifs.name: IFS", +"*hacks.imsmap.name: IMS Map", +"*hacks.jigglypuff.name: Jiggly Puff", +"*hacks.juggler3d.name: Juggler 3D", +"*hacks.lcdscrub.name: LCD Scrub", +"*hacks.lmorph.name: LMorph", +"*hacks.m6502.name: m6502", +"*hacks.mapscroller.name: Map Scroller", +"*hacks.maze3d.name: Maze 3D", +"*hacks.memscroller.name: Mem Scroller", +"*hacks.metaballs.name: Meta Balls", +"*hacks.mirrorblob.name: Mirror Blob", +"*hacks.moebius.name: Möbius", +"*hacks.moebiusgears.name: Möbius Gears", +"*hacks.moire.name: Moiré", +"*hacks.moire2.name: Moiré 2", +"*hacks.morph3d.name: Morph 3D", +"*hacks.nerverot.name: Nerve Rot", +"*hacks.noseguy.name: Nose Guy", +"*hacks.pacman.name: Pac-Man", +"*hacks.papercube.name: Paper Cube", +"*hacks.photopile.name: Photo Pile", +"*hacks.popsquares.name: Pop Squares", +"*hacks.projectiveplane.name:Projective Plane", +"*hacks.quasicrystal.name: Quasi-Crystal", +"*hacks.raverhoop.name: Raver Hoop", +"*hacks.razzledazzle.name: Razzle Dazzle", +"*hacks.rdbomb.name: RD-Bomb", +"*hacks.romanboy.name: Roman Boy", +"*hacks.rotzoomer.name: Rot Zoomer", +"*hacks.rubikblocks.name: Rubik Blocks", +"*hacks.sballs.name: SBalls", +"*hacks.shadebobs.name: Shade Bobs", +"*hacks.sierpinski3d.name: Sierpinski 3D", +"*hacks.skytentacles.name: Sky Tentacles", +"*hacks.slidescreen.name: Slide Screen", +"*hacks.speedmine.name: Speed Mine", +"*hacks.sphereeversion.name: Sphere Eversion", +"*hacks.splitflap.name: Split-Flap", +"*hacks.starwars.name: Star Wars", +"*hacks.stonerview.name: Stoner View", +"*hacks.t3d.name: T3D", +"*hacks.testx11.name: Test X11", +"*hacks.timetunnel.name: Time Tunnel", +"*hacks.topblock.name: Top Block", +"*hacks.tronbit.name: Tron Bit", +"*hacks.unknownpleasures.name:Unknown Pleasures", +"*hacks.vfeedback.name: VFeedback", +"*hacks.vidwhacker.name: Vid Whacker", +"*hacks.webcollage.name: Web Collage", +"*hacks.whirlwindwarp.name: Whirlwind Warp", +"*hacks.winduprobot.name: Windup Robot", +"*hacks.xanalogtv.name: XAnalogTV", +"*hacks.xrayswarm.name: XRaySwarm", diff --git a/driver/atoms.c b/driver/atoms.c index e8b6add..fc34707 100644 --- a/driver/atoms.c +++ b/driver/atoms.c @@ -1,4 +1,4 @@ -/* xscreensaver-command, Copyright © 1991-2021 Jamie Zawinski +/* xscreensaver-command, Copyright © 1991-2023 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,9 +25,10 @@ Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO, XA_EXIT, XA_BLANK, XA_LOCK, XA_ACTIVATE, XA_SUSPEND, XA_NEXT, XA_PREV, - XA_DEACTIVATE, XA_CYCLE, XA_RESTART, XA_PREFS, + XA_DEACTIVATE, XA_CYCLE, XA_RESTART, XA_NET_WM_PID, XA_NET_WM_STATE, XA_NET_WM_STATE_ABOVE, XA_NET_WM_STATE_FULLSCREEN, XA_NET_WM_BYPASS_COMPOSITOR, + XA_NET_WM_STATE_STAYS_ON_TOP, XA_KDE_NET_WM_WINDOW_TYPE_OVERRIDE, XA_NET_WM_WINDOW_TYPE, XA_NET_WM_WINDOW_TYPE_SPLASH, XA_NET_WM_WINDOW_TYPE_DIALOG, XA_NET_WM_WINDOW_TYPE_NOTIFICATION, XA_NET_WM_WINDOW_TYPE_NORMAL; @@ -52,7 +53,6 @@ init_xscreensaver_atoms (Display *dpy) XA_SELECT = A("SELECT"); XA_EXIT = A("EXIT"); XA_DEMO = A("DEMO"); - XA_PREFS = A("PREFS"); XA_LOCK = A("LOCK"); XA_BLANK = A("BLANK"); @@ -66,5 +66,8 @@ init_xscreensaver_atoms (Display *dpy) XA_NET_WM_WINDOW_TYPE_DIALOG = A("_NET_WM_WINDOW_TYPE_DIALOG"); XA_NET_WM_WINDOW_TYPE_NOTIFICATION = A("_NET_WM_WINDOW_TYPE_NOTIFICATION"); XA_NET_WM_WINDOW_TYPE_NORMAL = A("_NET_WM_WINDOW_TYPE_NORMAL"); + XA_NET_WM_STATE_STAYS_ON_TOP = A("_NET_WM_STATE_STAYS_ON_TOP"); + XA_KDE_NET_WM_WINDOW_TYPE_OVERRIDE = A("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"); + # undef A } diff --git a/driver/atoms.h b/driver/atoms.h index b5a7b7c..3f65d81 100644 --- a/driver/atoms.h +++ b/driver/atoms.h @@ -1,4 +1,4 @@ -/* xscreensaver-command, Copyright © 1991-2021 Jamie Zawinski +/* xscreensaver-command, Copyright © 1991-2023 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -15,9 +15,10 @@ extern Atom XA_SCREENSAVER, XA_SCREENSAVER_VERSION, XA_SCREENSAVER_RESPONSE, XA_SCREENSAVER_ID, XA_SCREENSAVER_STATUS, XA_SELECT, XA_DEMO, XA_EXIT, XA_BLANK, XA_LOCK, XA_ACTIVATE, XA_SUSPEND, XA_NEXT, XA_PREV, - XA_DEACTIVATE, XA_CYCLE, XA_RESTART, XA_PREFS, + XA_DEACTIVATE, XA_CYCLE, XA_RESTART, XA_NET_WM_PID, XA_NET_WM_STATE, XA_NET_WM_STATE_ABOVE, XA_NET_WM_STATE_FULLSCREEN, XA_NET_WM_BYPASS_COMPOSITOR, + XA_NET_WM_STATE_STAYS_ON_TOP, XA_KDE_NET_WM_WINDOW_TYPE_OVERRIDE, XA_NET_WM_WINDOW_TYPE, XA_NET_WM_WINDOW_TYPE_SPLASH, XA_NET_WM_WINDOW_TYPE_DIALOG, XA_NET_WM_WINDOW_TYPE_NOTIFICATION, XA_NET_WM_WINDOW_TYPE_NORMAL; diff --git a/driver/atomswm.c b/driver/atomswm.c index 887dc2c..1ddf47a 100644 --- a/driver/atomswm.c +++ b/driver/atomswm.c @@ -43,6 +43,7 @@ xscreensaver_set_wm_atoms (Display *dpy, Window window, int width, int height, # endif Atom va[10]; long vl[10]; + int i; class_hints.res_name = "xscreensaver"; /* not progname */ class_hints.res_class = "XScreenSaver"; size_hints.flags = PMinSize | PMaxSize; @@ -73,22 +74,27 @@ xscreensaver_set_wm_atoms (Display *dpy, Window window, int width, int height, grubby paws off of our windows. */ - vl[0] = 1; /* _NET_WM_BYPASS_COMPOSITOR = 1 */ + i = 0; + vl[i++] = 1; /* _NET_WM_BYPASS_COMPOSITOR = 1 */ XChangeProperty (dpy, window, XA_NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL, 32, - PropModeReplace, (unsigned char *) vl, 1); + PropModeReplace, (unsigned char *) vl, i); /* _NET_WM_STATE = [ _NET_WM_STATE_ABOVE, _NET_WM_STATE_FULLSCREEN ] */ - va[0] = XA_NET_WM_STATE_ABOVE; - va[1] = XA_NET_WM_STATE_FULLSCREEN; + i = 0; + va[i++] = XA_NET_WM_STATE_ABOVE; + va[i++] = XA_NET_WM_STATE_FULLSCREEN; + va[i++] = XA_NET_WM_STATE_STAYS_ON_TOP; /* Does this do anything? */ XChangeProperty (dpy, window, XA_NET_WM_STATE, XA_ATOM, 32, - PropModeReplace, (unsigned char *) va, 2); + PropModeReplace, (unsigned char *) va, i); /* As there is no _NET_WM_WINDOW_TYPE_SCREENSAVER, which property is most likely to effectively communicate "on top always" to the WM? _NET_WM_WINDOW_TYPE = NORMAL, SPLASH, DIALOG or NOTIFICATION? */ - va[0] = XA_NET_WM_WINDOW_TYPE_NOTIFICATION; + i = 0; + va[i++] = XA_NET_WM_WINDOW_TYPE_NOTIFICATION; + va[i++] = XA_KDE_NET_WM_WINDOW_TYPE_OVERRIDE; /* Does this do anything? */ XChangeProperty (dpy, window, XA_NET_WM_WINDOW_TYPE, XA_ATOM, 32, - PropModeReplace, (unsigned char *) va, 1); + PropModeReplace, (unsigned char *) va, i); if (for_window) /* This is the error dialog for a saver window */ { diff --git a/driver/auth.h b/driver/auth.h index 40594ea..80a49ba 100644 --- a/driver/auth.h +++ b/driver/auth.h @@ -1,5 +1,5 @@ /* auth.h --- Providing authentication mechanisms. - * Copyright © 1993-2021 Jamie Zawinski + * Copyright © 1993-2022 Jamie Zawinski * (c) 2007, Quest Software, Inc. All rights reserved. * This file is part of XScreenSaver. * @@ -85,7 +85,7 @@ extern Bool xscreensaver_auth_conv (void *closure, const auth_message *msg, auth_response **resp); extern void xscreensaver_auth_finished (void *closure, Bool authenticated_p); -extern void xscreensaver_splash (void *root_widget); +extern void xscreensaver_splash (void *root_widget, Bool disable_settings_p); #endif /* __XSCREENSAVER_AUTH_H__ */ diff --git a/driver/blurb.c b/driver/blurb.c index d732a9b..ddb8b18 100644 --- a/driver/blurb.c +++ b/driver/blurb.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright © 1991-2021 Jamie Zawinski +/* xscreensaver, Copyright © 1991-2022 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -17,20 +17,29 @@ #include #include +#include const char *progname = ""; int verbose_p = 0; +/* #define BLURB_CENTISECONDS */ + const char * blurb (void) { static char buf[255] = { 0 }; struct tm tm; - time_t now; + struct timeval now; int i; - now = time ((time_t *) 0); - localtime_r (&now, &tm); +# ifdef GETTIMEOFDAY_TWO_ARGS + struct timezone tzp; + gettimeofday (&now, &tzp); +# else + gettimeofday (&now); +# endif + + localtime_r (&now.tv_sec, &tm); i = strlen (progname); if (i > 40) i = 40; memcpy (buf, progname, i); @@ -44,6 +53,16 @@ blurb (void) buf[i++] = ':'; buf[i++] = '0' + (tm.tm_sec >= 10 ? tm.tm_sec/10 : 0); buf[i++] = '0' + (tm.tm_sec % 10); + +# ifdef BLURB_CENTISECONDS + { + int c = now.tv_usec / 10000; + buf[i++] = '.'; + buf[i++] = '0' + (c >= 10 ? c/10 : 0); + buf[i++] = '0' + (c % 10); + } +# endif + buf[i] = 0; return buf; } diff --git a/driver/clientmsg.c b/driver/clientmsg.c index f3d9d71..475d72b 100644 --- a/driver/clientmsg.c +++ b/driver/clientmsg.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright © 1991-2021 Jamie Zawinski +/* xscreensaver, Copyright © 1991-2023 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -36,59 +36,68 @@ error_handler (Display *dpy, XErrorEvent *error) Window find_screensaver_window (Display *dpy, char **version) { - int i; - Window root = RootWindowOfScreen (DefaultScreenOfDisplay (dpy)); - Window root2, parent, *kids; - unsigned int nkids; - XErrorHandler old_handler; + int nscreens = ScreenCount (dpy); + int screen; Window ret = 0; + XErrorHandler old_handler; XSync (dpy, False); old_handler = XSetErrorHandler (error_handler); if (version) *version = 0; - if (! XQueryTree (dpy, root, &root2, &parent, &kids, &nkids)) - abort (); - if (root != root2) - abort (); - if (parent) - abort (); - if (! (kids && nkids)) - goto DONE; - for (i = 0; i < nkids; i++) + for (screen = 0; screen < nscreens; screen++) { - Atom type; - int format; - unsigned long nitems, bytesafter; - unsigned char *v = 0; - int status; - - /* We're walking the list of root-level windows and trying to find - the one that has a particular property on it. We need to trap - BadWindows errors while doing this, because it's possible that - some random window might get deleted in the meantime. (That - window won't have been the one we're looking for.) - */ - status = XGetWindowProperty (dpy, kids[i], - XA_SCREENSAVER_VERSION, - 0, 200, False, XA_STRING, - &type, &format, &nitems, &bytesafter, - &v); - if (status == Success && type != None) - { - ret = kids[i]; - if (version) - *version = (char *) v; - else - XFree (v); - goto DONE; - } - if (v) XFree (v); + Window root = RootWindow (dpy, screen); + Window root2, parent, *kids; + unsigned int nkids; + int i = 0; + + if (! XQueryTree (dpy, root, &root2, &parent, &kids, &nkids)) + abort (); + if (root != root2) + abort (); + if (parent) + abort (); + if (! (kids && nkids)) + goto DONE; + for (i = 0; i < nkids; i++) + { + Atom type; + int format; + unsigned long nitems, bytesafter; + unsigned char *v = 0; + int status; + + /* We're walking the list of root-level windows and trying to find + the one that has a particular property on it. We need to trap + BadWindows errors while doing this, because it's possible that + some random window might get deleted in the meantime. (That + window won't have been the one we're looking for.) + */ + status = XGetWindowProperty (dpy, kids[i], + XA_SCREENSAVER_VERSION, + 0, 200, False, XA_STRING, + &type, &format, &nitems, &bytesafter, + &v); + if (status == Success && type != None) + { + ret = kids[i]; + if (version) + *version = (char *) v; + else + XFree (v); + goto DONE; + } + if (v) XFree (v); + + DONE: + if (ret) break; + } + if (kids) XFree (kids); + if (ret) break; } - DONE: - if (kids) XFree (kids); XSetErrorHandler (old_handler); return ret; } @@ -104,8 +113,15 @@ clientmessage_response (Display *dpy, XEvent *xev, Bool ok, const char *msg) { Atom cmd = xev->xclient.data.l[0]; char *name = XGetAtomName (dpy, cmd); - fprintf (stderr, "%s: ClientMessage %s: %s\n", blurb(), - (name ? name : "???"), msg); + pid_t caller = (cmd == XA_DEACTIVATE + ? (pid_t) xev->xclient.data.l[1] + : 0); + if (caller) + fprintf (stderr, "%s: ClientMessage %s: %s (from pid %lu)\n", blurb(), + (name ? name : "???"), msg, (unsigned long) caller); + else + fprintf (stderr, "%s: ClientMessage %s: %s\n", blurb(), + (name ? name : "???"), msg); } L = strlen (msg); diff --git a/driver/compile_axp.com b/driver/compile_axp.com deleted file mode 100644 index d6ed0e8..0000000 --- a/driver/compile_axp.com +++ /dev/null @@ -1,15 +0,0 @@ -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) DEMO.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) DIALOGS-XM.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) LOCK.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) PASSWD.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) STDERR.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,NO_SETUID)/INCL=([],[-],[-.UTILS]) SUBPROCS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) TIMERS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) WINDOWS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) XSCREENSAVER-COMMAND.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,NO_SETUID)/INCL=([],[-],[-.UTILS]) XSCREENSAVER.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) XSET.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-GETPWNAM.C -$!!! CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) GETPWUID.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-HPWD.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-VALIDATE.C diff --git a/driver/compile_decc.com b/driver/compile_decc.com deleted file mode 100644 index d6ed0e8..0000000 --- a/driver/compile_decc.com +++ /dev/null @@ -1,15 +0,0 @@ -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) DEMO.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) DIALOGS-XM.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) LOCK.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) PASSWD.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) STDERR.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,NO_SETUID)/INCL=([],[-],[-.UTILS]) SUBPROCS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) TIMERS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) WINDOWS.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) XSCREENSAVER-COMMAND.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,NO_SETUID)/INCL=([],[-],[-.UTILS]) XSCREENSAVER.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) XSET.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-GETPWNAM.C -$!!! CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) GETPWUID.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-HPWD.C -$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H)/INCL=([],[-],[-.UTILS]) VMS-VALIDATE.C diff --git a/driver/demo-Gtk-conf.c b/driver/demo-Gtk-conf.c index 6d04215..86acea2 100644 --- a/driver/demo-Gtk-conf.c +++ b/driver/demo-Gtk-conf.c @@ -1,5 +1,5 @@ /* demo-Gtk-conf.c --- implements the dynamic configuration dialogs. - * xscreensaver, Copyright (c) 2001-2020 Jamie Zawinski + * xscreensaver, Copyright © 2001-2022 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -14,7 +14,7 @@ # include "config.h" #endif -#if defined(HAVE_GTK) && defined(HAVE_XML) /* whole file */ +#ifdef HAVE_GTK /* whole file */ #include @@ -28,36 +28,7 @@ #include #include -/* - * Both of these workarounds can be removed when support for ancient - * libxml versions is dropped. versions 1.8.11 and 2.3.4 provide the - * correct fixes. - */ - -/* - * Older libxml polluted the global headerspace, while libxml2 fixed - * this. To support both old and recent libxmls, we have this - * workaround. - */ -#ifdef HAVE_OLD_XML_HEADERS -# include -#else /* ! HAVE_OLD_XML_HEADERS */ -# include -#endif /* HAVE_OLD_XML_HEADERS */ - -/* - * handle non-native spelling mistakes in earlier versions and provide - * the source-compat fix for this that may not be in older versions. - */ -#ifndef xmlChildrenNode -# if LIBXML_VERSION >= 20000 -# define xmlChildrenNode children -# define xmlRootNode children -# else -# define xmlChildrenNode childs -# define xmlRootNode root -# endif /* LIBXML_VERSION */ -#endif /* xmlChildrenNode */ +#include #if (__GNUC__ >= 4) /* Ignore useless warnings generated by gtk.h */ # undef inline @@ -66,6 +37,7 @@ # pragma GCC diagnostic ignored "-Wlong-long" # pragma GCC diagnostic ignored "-Wvariadic-macros" # pragma GCC diagnostic ignored "-Wpedantic" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif #include @@ -74,6 +46,7 @@ # pragma GCC diagnostic pop #endif +#include "blurb.h" #include "demo-Gtk-conf.h" /* Deal with deprecation of direct access to struct fields on the way to GTK3 @@ -92,12 +65,7 @@ #endif -extern const char *blurb (void); - - -const char *hack_configuration_path = HACK_CONFIGURATION_PATH; - -static gboolean debug_p = FALSE; +static gboolean debug_p = FALSE; /* Copied from s->debug_p in parent */ #define MIN_SLIDER_WIDTH 150 @@ -120,6 +88,11 @@ typedef enum { } parameter_type; +typedef enum { + NONE, INVERT, RATIO +} convert_t; + + typedef struct { parameter_type type; @@ -140,8 +113,9 @@ typedef struct { float value; /* default value */ gboolean integer_p; /* whether the range is integral, or real */ xmlChar *arg; /* command-line option to set (substitute "%") */ - gboolean invert_p; /* whether to flip the value and pretend the - range goes from hi-low instead of low-hi. */ + convert_t convert; /* invert: whether to flip the value and pretend the + range goes from hi-low instead of low-hi. + ratio: position 1.0 at the center. */ /* boolean, select-option */ @@ -161,7 +135,9 @@ typedef struct { static parameter *make_select_option (const char *file, xmlNodePtr); static void make_parameter_widget (const char *filename, - parameter *, GtkWidget *); + parameter *, GtkWidget *, + void (*changed_cb) (GtkWidget *, gpointer), + gpointer changed_data); static void browse_button_cb (GtkButton *button, gpointer user_data); @@ -221,7 +197,14 @@ describe_parameter (FILE *out, parameter *p) if (p->high) fprintf (out, " high=\"%.2f\"", p->high); if (p->value) fprintf (out, " default=\"%.2f\"", p->value); if (p->arg) fprintf (out, " arg=\"%s\"", p->arg); - if (p->invert_p) fprintf (out, " convert=\"invert\""); + + switch (p->convert) { + case NONE: break; + case INVERT: fprintf (out, " convert=\"invert\""); break; + case RATIO: fprintf (out, " convert=\"ratio\""); break; + default: abort(); break; + } + if (p->arg_set) fprintf (out, " arg-set=\"%s\"", p->arg_set); if (p->arg_unset) fprintf (out, " arg-unset=\"%s\"", p->arg_unset); fprintf (out, ">\n"); @@ -366,7 +349,11 @@ make_parameter (const char *filename, xmlNodePtr node) p->value = xml_get_float (node, (xmlChar *) "default", &floatp); p->integer_p = !floatp; convert = (char *) xmlGetProp (node, (xmlChar *) "convert"); - p->invert_p = (convert && !strcmp (convert, "invert")); + + if (convert && !strcmp (convert, "invert")) p->convert = INVERT; + else if (convert && !strcmp (convert, "ratio")) p->convert = RATIO; + else p->convert = NONE; + p->arg = xmlGetProp (node, (xmlChar *) "arg"); p->arg_set = xmlGetProp (node, (xmlChar *) "arg-set"); p->arg_unset = xmlGetProp (node, (xmlChar *) "arg-unset"); @@ -461,7 +448,7 @@ sanity_check_parameter (const char *filename, const xmlChar *node_name, gboolean high; gboolean value; gboolean arg; - gboolean invert_p; + gboolean convert; gboolean arg_set; gboolean arg_unset; } allowed, require; @@ -511,7 +498,7 @@ sanity_check_parameter (const char *filename, const xmlChar *node_name, /* require.high = TRUE; -- may be 0 */ allowed.value = TRUE; /* require.value = TRUE; -- may be 0 */ - allowed.invert_p = TRUE; + allowed.convert = TRUE; break; case SPINBUTTON: allowed.id = TRUE; @@ -525,7 +512,7 @@ sanity_check_parameter (const char *filename, const xmlChar *node_name, /* require.high = TRUE; -- may be 0 */ allowed.value = TRUE; /* require.value = TRUE; -- may be 0 */ - allowed.invert_p = TRUE; + allowed.convert = FALSE; break; case BOOLEAN: allowed.id = TRUE; @@ -571,9 +558,15 @@ sanity_check_parameter (const char *filename, const xmlChar *node_name, CHECK (high, "high"); CHECK (value, "default"); CHECK (arg, "arg"); - CHECK (invert_p, "convert"); + CHECK (convert, "convert"); CHECK (arg_set, "arg-set"); CHECK (arg_unset, "arg-unset"); + + if (p->convert == RATIO) + { + if (p->low <= 0) WARN ("low must be > 0"); + if (p->high <= 1) WARN ("high must be > 1"); + } # undef CHECK # undef WARN @@ -587,16 +580,13 @@ sanity_check_menu_options (const char *filename, const xmlChar *node_name, parameter *p) { GList *opts; - int noptions = 0; int nulls = 0; char *prefix = 0; -/* fprintf (stderr, "\n## %s\n", p->id);*/ for (opts = p->options; opts; opts = opts->next) { parameter *s = (parameter *) opts->data; if (!s->arg_set) nulls++; - noptions++; if (s->arg_set) { @@ -605,10 +595,12 @@ sanity_check_menu_options (const char *filename, const xmlChar *node_name, if (spc) *spc = 0; if (prefix) { +# if 0 if (strcmp (a, prefix)) fprintf (stderr, "%s: %s: both \"%s\" and \"%s\" used in -