comparison configure.in @ 219:262b8bb4a523 r20-4b8

Import from CVS: tag r20-4b8
author cvs
date Mon, 13 Aug 2007 10:09:35 +0200
parents d44af0c54775
children 2c611d1463a6
comparison
equal deleted inserted replaced
218:c9f226976f56 219:262b8bb4a523
1699 dnl Feed s&m crud to src/Makefile 1699 dnl Feed s&m crud to src/Makefile
1700 1700
1701 if test "$unexec" = "unexaix.o"; then 1701 if test "$unexec" = "unexaix.o"; then
1702 dnl AIX needs various hacks to make static linking work. 1702 dnl AIX needs various hacks to make static linking work.
1703 dnl This can go away if we ever figure out how to get dynamic linking on AIX. 1703 dnl This can go away if we ever figure out how to get dynamic linking on AIX.
1704 if test "$dynamic" = "no"; then
1704 start_flags="-Wl,-bnso,-bnodelcsect" 1705 start_flags="-Wl,-bnso,-bnodelcsect"
1705 test "$GCC" = "yes" && start_flags="-B/bin/ ${start_flags}" 1706 test "$GCC" = "yes" && start_flags="-B/bin/ ${start_flags}"
1706 for f in "/lib/syscalls.exp" "$srcdir/src/m/ibmrs6000.inp"; do 1707 for f in "/lib/syscalls.exp" "$srcdir/src/m/ibmrs6000.inp"; do
1707 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; fi 1708 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; fi
1708 done 1709 done
1709 for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do 1710 for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do
1710 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi 1711 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi
1711 done 1712 done
1713 dnl elif
1714 dnl Put any AIX/gcc/dynamic flags here - xlc needs none added
1715 fi
1712 elif test -n "$ld_text_start_addr"; then 1716 elif test -n "$ld_text_start_addr"; then
1713 start_flags="-T $ld_text_start_addr -e __start" 1717 start_flags="-T $ld_text_start_addr -e __start"
1714 fi 1718 fi
1715 AC_SUBST(start_flags) 1719 AC_SUBST(start_flags)
1716 1720
2378 XE_PREPEND(-lMagick, libs_x) 2382 XE_PREPEND(-lMagick, libs_x)
2379 fi 2383 fi
2380 2384
2381 dnl Autodetect -lXaw 2385 dnl Autodetect -lXaw
2382 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no) 2386 AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no)
2383 if test "$have_xaw" = "yes"; then 2387 dnl if test "$have_xaw" = "yes"; then
2384 AC_CHECK_HEADER(X11/Xaw/Reports.h, [ 2388 dnl AC_CHECK_HEADER(X11/Xaw/Reports.h, [
2385 XE_APPEND(pkg-src/tree-x, MAKE_SUBDIR) 2389 dnl XE_APPEND(pkg-src/tree-x, MAKE_SUBDIR)
2386 XE_APPEND(pkg-src/tree-x, INSTALL_ARCH_DEP_SUBDIR)]) 2390 dnl XE_APPEND(pkg-src/tree-x, INSTALL_ARCH_DEP_SUBDIR)])
2387 fi 2391 dnl fi
2388 2392
2389 dnl autodetect Motif - but only add to libs_x later (if necessary) 2393 dnl autodetect Motif - but only add to libs_x later (if necessary)
2390 AC_CHECK_HEADER(Xm/Xm.h, 2394 AC_CHECK_HEADER(Xm/Xm.h,
2391 [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)], 2395 [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)],
2392 have_motif=no) 2396 have_motif=no)
2425 XE_APPEND(lwlib-Xm.o, lwlib_objs) 2429 XE_APPEND(lwlib-Xm.o, lwlib_objs)
2426 need_motif=yes ;; 2430 need_motif=yes ;;
2427 esac 2431 esac
2428 2432
2429 test "$with_menubars" = "lucid" && XE_APPEND(xlwmenu.o, lwlib_objs) 2433 test "$with_menubars" = "lucid" && XE_APPEND(xlwmenu.o, lwlib_objs)
2434 test "$with_menubars" = "motif" && XE_APPEND(xlwmenu.o, lwlib_objs)
2430 test "$with_scrollbars" = "lucid" && XE_APPEND(xlwscrollbar.o, lwlib_objs) 2435 test "$with_scrollbars" = "lucid" && XE_APPEND(xlwscrollbar.o, lwlib_objs)
2431 case "$all_widgets" in *lucid* ) 2436 case "$all_widgets" in *lucid* )
2432 AC_DEFINE(NEED_LUCID) 2437 AC_DEFINE(NEED_LUCID)
2433 XE_APPEND(lwlib-Xlw.o, lwlib_objs) ;; 2438 XE_APPEND(lwlib-Xlw.o, lwlib_objs) ;;
2434 esac 2439 esac
3335 3340
3336 test "$with_cde" = yes && echo " Compiling in support for CDE." 3341 test "$with_cde" = yes && echo " Compiling in support for CDE."
3337 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." 3342 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
3338 test "$with_offix" = yes && echo " Compiling in support for OffiX." 3343 test "$with_offix" = yes && echo " Compiling in support for OffiX."
3339 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." 3344 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
3340 test "$with_session" != no && echo " Compiling in support for proper session-management." 3345 test "$with_session" = yes && echo " Compiling in support for proper session-management."
3341 case "$with_menubars" in 3346 case "$with_menubars" in
3342 lucid ) echo " Using Lucid menubars." ;; 3347 lucid ) echo " Using Lucid menubars." ;;
3343 motif ) echo " Using Motif menubars." 3348 motif ) echo " Using Motif menubars."
3344 echo " *WARNING* The Motif menubar implementation is currently buggy." 3349 echo " *WARNING* The Motif menubar implementation is currently buggy."
3345 echo " We recommend using the Lucid menubar instead." 3350 echo " We recommend using the Lucid menubar instead."