diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-08 04:05:08 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-08 04:05:08 +0000 |
| commit | 1ec76aa4265cb7a7d45ef624b5ebf77ea6beedd3 (patch) | |
| tree | 88dee383ecf046e96e352a9c4c523e04a1349b94 | |
| parent | 237de9534ee2163b82cacdf2110a782e965bb85c (diff) | |
| download | ATCD-1ec76aa4265cb7a7d45ef624b5ebf77ea6beedd3.tar.gz | |
ChangeLogTag: Wed Mar 8 03:32:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | m4/ace.m4 | 52 |
2 files changed, 59 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 13e996a882d..8bb54564fac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Wed Mar 8 03:32:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * m4/ace.m4: + + Changed ACE_ENABLE_XT_REACTOR to AC_REQUIRE() ACE_PATH_XT + instead of AC_PATH_XTRA. + + Changed ACE_PATH_FL to AC_REQUIRE() ACE_PATH_X11. + + Add ACE_PATH_XT autoconf macro that sets ACE_XT_CPPFLAGS, + ACE_XT_LDFLAGS, and ACE_XT_LIBS. + + Add ACE_PATH_X11 autoconf macro that sets ACE_X11_CPPFLAGS, + ACE_X11_LDFLAGS, and ACE_X11_LIBS. + Tue Mar 7 18:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * examples/DLL/Newsweek.cpp: diff --git a/m4/ace.m4 b/m4/ace.m4 index ac36f4f5915..62fcc87e9a7 100644 --- a/m4/ace.m4 +++ b/m4/ace.m4 @@ -1221,10 +1221,51 @@ AC_DEFUN([ACE_PATH_TK], ]) +# ACE_PATH_XT +#--------------------------------------------------------------------------- +# Find Xt libraries, flags, etc. +AC_DEFUN([ACE_PATH_XT], +[AC_REQUIRE([ACE_PATH_X11]) + +if test "$no_x" != yes; then + ACE_XT_CPPFLAGS="" + ACE_XT_LDFLAGS="" + ACE_XT_LIBS="-lXt" + + AC_SUBST(ACE_XT_CPPFLAGS) + AC_SUBST(ACE_XT_LDFLAGS) + AC_SUBST(ACE_XT_LIBS) +fi +AM_CONDITIONAL([BUILD_ATHENA], true) +AM_CONDITIONAL([BUILD_MOTIF], false) +]) + + +# ACE_PATH_X11 +#--------------------------------------------------------------------------- +# Find X11 libraries, flags, etc. +AC_DEFUN([ACE_PATH_X11], +[AC_REQUIRE([AC_PATH_XTRA]) + +if test "$no_x" != yes; then + ACE_X11_CPPFLAGS="${X_CFLAGS}" + ACE_X11_LDFLAGS="${X_LIBS}" + ACE_X11_LIBS="${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}" + + AC_SUBST(ACE_X11_CPPFLAGS) + AC_SUBST(ACE_X11_LDFLAGS) + AC_SUBST(ACE_X11_LIBS) +fi + +AM_CONDITIONAL([BUILD_X11], [test X$no_x != Xyes]) +]) + + # ACE_ENABLE_FL_REACTOR #--------------------------------------------------------------------------- AC_DEFUN([ACE_ENABLE_FL_REACTOR], [AC_REQUIRE([ACE_PATH_FL]) +AC_REQUIRE([ACE_PATH_X11]) AC_ARG_ENABLE([fl-reactor], AS_HELP_STRING([--enable-fl-reactor], [build support for the FlReactor [[no]]]), @@ -1320,27 +1361,24 @@ AM_CONDITIONAL([BUILD_TAO_TKRESOURCE], # ACE_ENABLE_XT_REACTOR #--------------------------------------------------------------------------- AC_DEFUN([ACE_ENABLE_XT_REACTOR], -[AC_ARG_ENABLE([xt-reactor], +[AC_REQUIRE([ACE_PATH_XT]) +AC_ARG_ENABLE([xt-reactor], AS_HELP_STRING([--enable-xt-reactor], [build support for the XtReactor [[no]]]), [case "${enableval}" in yes) - AC_PATH_XTRA dnl Here, if X isn't found or the user sets "--without-x" on the command dnl line, then "no_x" is set to "yes." AS_IF([test "$no_x" != yes], - [ - ACE_XLIBS="-lX11 -lXt" + [ ace_user_enable_xt_reactor=yes ],[ - ACE_XLIBS="" ace_user_enable_xt_reactor=no AC_MSG_WARN([X was not found or it was disabled.]) AC_MSG_WARN([ACE_XtReactor will not be enabled.]) ]) ;; no) - ACE_XLIBS="" ace_user_enable_xt_reactor=no ;; *) @@ -1348,10 +1386,8 @@ dnl line, then "no_x" is set to "yes." ;; esac], [ - ACE_XLIBS="" ace_user_enable_xt_reactor=no ]) -AM_CONDITIONAL([BUILD_X11], [test X$ace_user_enable_xt_reactor = Xyes]) AM_CONDITIONAL([BUILD_XT], [test X$ace_user_enable_xt_reactor = Xyes]) AM_CONDITIONAL([BUILD_ACE_XTREACTOR], [test X$ace_user_enable_xt_reactor = Xyes]) |