comparison configure @ 108532:393e918b64f9

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 13 May 2010 05:57:58 +0000
parents f3d57f9fdf9f
children 7ed2fb419f40
comparison
equal deleted inserted replaced
108531:4ab372e65d32 108532:393e918b64f9
26311 26311
26312 ### Specify what sort of things we'll be editing into Makefile and config.h. 26312 ### Specify what sort of things we'll be editing into Makefile and config.h.
26313 ### Use configuration here uncanonicalized to avoid exceeding size limits. 26313 ### Use configuration here uncanonicalized to avoid exceeding size limits.
26314 26314
26315 26315
26316 26316 ## Unused?
26317 26317
26318 26318
26319 26319
26320 26320
26321 26321
26322 26322
26323 26323
26324 26324
26325 26325
26326 26326
26327 26327
26328 26328
26329 26329
26330 26330
26331 26331
26332 26332
26333 26333
26334 26334
26335 26335
26336 26336
26337
26338 ## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
26339 ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
26340 ## end of LIBX_BASE, but nothing ever set it.
26337 26341
26338 26342
26339 26343
26340 26344
26341 ## Used in lwlib/Makefile.in. 26345 ## Used in lwlib/Makefile.in.
26369 _ACEOF 26373 _ACEOF
26370 26374
26371 26375
26372 cat >>confdefs.h <<_ACEOF 26376 cat >>confdefs.h <<_ACEOF
26373 #define config_opsysfile "${opsysfile}" 26377 #define config_opsysfile "${opsysfile}"
26374 _ACEOF
26375
26376
26377 cat >>confdefs.h <<_ACEOF
26378 #define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE}
26379 _ACEOF
26380
26381
26382 cat >>confdefs.h <<_ACEOF
26383 #define C_SWITCH_X_SITE ${C_SWITCH_X_SITE}
26384 _ACEOF 26378 _ACEOF
26385 26379
26386 26380
26387 XMENU_OBJ= 26381 XMENU_OBJ=
26388 XOBJ= 26382 XOBJ=
26478 OLDXMENU= 26472 OLDXMENU=
26479 LIBXMENU="-lXMenu" 26473 LIBXMENU="-lXMenu"
26480 LIBX_OTHER= 26474 LIBX_OTHER=
26481 fi 26475 fi
26482 26476
26483 if test "$HAVE_GTK" = "yes"; then 26477 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
26484 OLDXMENU= 26478 OLDXMENU=
26485 LIBXMENU= 26479 LIBXMENU=
26486 fi 26480 fi
26487 26481
26488 26482