>>>> "Georg" == Georg Nikodym
<georgn(a)home.com> writes:
I'm applying the following anal modification of Georg's patch:
Index: configure.in
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/configure.in,v
retrieving revision 1.111.2.46
diff -u -r1.111.2.46 configure.in
--- configure.in 1999/10/21 14:00:27 1.111.2.46
+++ configure.in 1999/10/22 03:41:50
@@ -2896,7 +2896,7 @@
esac
case "$with_dialogs" in "" | "yes" | "lucid" )
if test "$have_motif" = "yes"; then
with_dialogs="motif"
- elif test "$have_xaw3d" = "yes"; then
with_dialogs="athena3d"
+ elif test "$have_xaw3d" = "yes"; then
with_dialogs="athena3d"
elif test "$have_xaw" = "yes"; then
with_dialogs="athena"
else with_dialogs=no
fi ;;
@@ -2906,7 +2906,7 @@
esac
case "$with_widgets" in "" | "yes" | "lucid")
if test "$have_motif" = "yes"; then
with_widgets="motif"
- elif test "$have_xaw3d" = "yes"; then
with_widgets="athena3d"
+ elif test "$have_xaw3d" = "yes"; then
with_widgets="athena3d"
elif test "$have_xaw" = "yes"; then
with_widgets="athena"
else with_widgets=no
fi ;;
@@ -2922,7 +2922,8 @@
if test "$have_xaw3d"; then
XE_PREPEND(-lXaw3d, libs_x)
else
- XE_PREPEND(-lXaw, libs_x) ;;
+ XE_PREPEND(-lXaw, libs_x)
+ fi ;;
*athena* )
AC_DEFINE(LWLIB_USES_ATHENA)
AC_DEFINE(NEED_ATHENA)
The handling of libXaw is still suspicious after this - handling this
properly is really hard.
Martin
Georg> The cvs tree (as of now) has syntax errors in configure.
Georg> Patch follows:
Georg> Index: configure.in
Georg> ===================================================================
Georg> RCS file: /usr/CVSroot/XEmacs/xemacs/configure.in,v
Georg> retrieving revision 1.111.2.46
Georg> diff -c -r1.111.2.46 configure.in
Georg> *** configure.in 1999/10/21 14:00:27 1.111.2.46
Georg> --- configure.in 1999/10/22 00:29:01
Georg> ***************
Georg> *** 2922,2928 ****
Georg> if test "$have_xaw3d"; then
Georg> XE_PREPEND(-lXaw3d, libs_x)
Georg> else
Georg> ! XE_PREPEND(-lXaw, libs_x) ;;
Georg> *athena* )
Georg> AC_DEFINE(LWLIB_USES_ATHENA)
Georg> AC_DEFINE(NEED_ATHENA)
Georg> --- 2922,2928 ----
Georg> if test "$have_xaw3d"; then
Georg> XE_PREPEND(-lXaw3d, libs_x)
Georg> else
Georg> ! XE_PREPEND(-lXaw, libs_x) ; fi ;;
Georg> *athena* )
Georg> AC_DEFINE(LWLIB_USES_ATHENA)
Georg> AC_DEFINE(NEED_ATHENA)