on fedora, co-existence of lesstif and openmotif possible cause of the different path so headers and libraries.
see attachment
Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 10641) +++ src/Makefile.am (working copy) @@ -10,6 +10,7 @@ AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS) $(GLee_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) +AM_LDFLAGS = $(MOTIF_LDFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d Index: configure.ac =================================================================== --- configure.ac (revision 10641) +++ configure.ac (working copy) @@ -342,15 +342,41 @@ ]) # Look for Motif -AS_IF([test "$enable_motif" != "no"],[ - AC_CHECK_HEADER(Xm/Xm.h, , AS_IF([test "$enable_motif" = "yes"], - [AC_MSG_ERROR([Motif headers not found])])) - AC_CHECK_LIB(Xm, XmCreateErrorDialog, [ - AC_SUBST([MOTIF_LIBS], [-lXm]) - AC_DEFINE([WZ_HAVE_MOTIF], 1, [Enable use of Motif when available]) - AM_CONDITIONAL([MOTIF_AVAILABLE], true) - ], AS_IF([test "$enable_motif" = "yes"], - [AC_MSG_ERROR([Motif library not found])])) +AS_IF([test "$enable_motif" != "no"], +[ + wz_motif_save_LIBS="$LIBS" + wz_motif_save_CFLAGS="$CFLAGS" + wz_motif_save_CPPFLAGS="$CPPFLAGS" + wz_motif_save_LDFLAGS="$LDFLAGS" + if test -f "/usr/include/openmotif/Xm/Xm.h"; then + CPPFLAGS="$CPPFLAGS -I/usr/include/openmotif" + AC_SUBST([MOTIF_CPPFLAGS], ['-I/usr/include/openmotif']) + fi + AC_CHECK_HEADER(Xm/Xm.h, , AS_IF([test "$enable_motif" = "yes"], + [AC_MSG_ERROR([Motif headers not found])])) + + if test "$host_cpu" = "x86"; then + if test -f "/usr/lib/openmotif/libXm.so.4"; then + LDFLAGS="$LDFLAGS -L/usr/lib/openmotif" + AC_SUBST([MOTIF_LDFLAGS], ['-L/usr/lib/openmotif']) + fi + elif test "$host_cpu" = "x86_64"; then + if test -f "/usr/lib64/openmotif/libXm.so.4"; then + LDFLAGS="$LDFLAGS -L/usr/lib64/openmotif" + AC_SUBST([MOTIF_LDFLAGS], ['-L/usr/lib64/openmotif']) + fi + fi + + AC_CHECK_LIB(Xm, XmCreateErrorDialog, [ + AC_SUBST([MOTIF_LIBS], [-lXm]) + AC_DEFINE([WZ_HAVE_MOTIF], 1, [Enable use of Motif when available]) + AM_CONDITIONAL([MOTIF_AVAILABLE], true) + ], AS_IF([test "$enable_motif" = "yes"], + [AC_MSG_ERROR([Motif library not found])])) + LIBS="$wz_motif_save_LIBS" + CFLAGS="$wz_motif_save_CFLAGS" + CPPFLAGS="$wz_motif_save_CPPFLAGS" + LDFLAGS="$wz_motif_save_LDFLAGS" ]) AM_CONDITIONAL([MOTIF_AVAILABLE], test -n "$MOTIF_LIBS") Index: lib/framework/Makefile.am =================================================================== --- lib/framework/Makefile.am (revision 10641) +++ lib/framework/Makefile.am (working copy) @@ -4,8 +4,9 @@ %.lex.c:: %.l $(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $< -AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS) +AM_CPPFLAGS = -DYY_NO_INPUT $(MOTIF_CPPFLAGS) $(SDL_CFLAGS) $(WZ_CPPFLAGS) AM_CFLAGS = $(WZ_CFLAGS) +AM_LDFLAGS = $(MOTIF_LDFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d BUILT_SOURCES = \
_______________________________________________ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
