From 2fd580449827a16ed9b101d4ab1e4614cb1d1d21 Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Wed, 10 Apr 2002 12:50:03 +0000 Subject: [PATCH] Houhou --- alliance/src/motif.m4 | 196 ++++++++++++++++++++++++++++++++++++++++++ alliance/src/xpm.m4 | 186 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 382 insertions(+) create mode 100644 alliance/src/motif.m4 create mode 100644 alliance/src/xpm.m4 diff --git a/alliance/src/motif.m4 b/alliance/src/motif.m4 new file mode 100644 index 00000000..54a10e67 --- /dev/null +++ b/alliance/src/motif.m4 @@ -0,0 +1,196 @@ +dnl +dnl +dnl AC_FIND_MOTIF : find OSF/Motif or LessTif, and provide variables +dnl to easily use them in a Makefile. +dnl +dnl Adapted from a macro by Andreas Zeller. +dnl +dnl The variables provided are : +dnl LINK_MOTIF (e.g. -L/usr/lesstif/lib -lXm) +dnl INCLUDE_MOTIF (e.g. -I/usr/lesstif/lib) +dnl MOTIF_LIBRARIES (e.g. /usr/lesstif/lib) +dnl MOTIF_INCLUDES (e.g. /usr/lesstif/include) +dnl +dnl The LINK_MOTIF and INCLUDE_MOTIF variables should be fit to put on +dnl your application's link line in your Makefile. +dnl +dnl Oleo CVS $Id: motif.m4,v 1.1 2002/04/10 12:50:03 ludo Exp $ +dnl +AC_DEFUN(AC_FIND_MOTIF, +[ + +AC_REQUIRE([AC_PATH_XTRA]) + +MOTIF_INCLUDES= +MOTIF_LIBRARIES= + +dnl AC_ARG_WITH(motif, +dnl [ --without-motif do not use Motif widgets]) +dnl Treat --without-motif like +dnl --without-motif-includes --without-motif-libraries. +dnl if test "$with_motif" = "no" +dnl then +dnl MOTIF_INCLUDES=none +dnl MOTIF_LIBRARIES=none +dnl fi + +AC_ARG_WITH(motif-includes, +[ --with-motif-includes=DIR Motif include files are in DIR], +MOTIF_INCLUDES="$withval") + +AC_ARG_WITH(motif-libraries, +[ --with-motif-libraries=DIR Motif libraries are in DIR], +MOTIF_LIBRARIES="$withval") + +AC_MSG_CHECKING(for Motif) + +# +# +# Search the include files. +# +if test "$MOTIF_INCLUDES" = ""; then +AC_CACHE_VAL(ac_cv_motif_includes, +[ +ac_motif_save_LIBS="$LIBS" +ac_motif_save_CFLAGS="$CFLAGS" +ac_motif_save_CPPFLAGS="$CPPFLAGS" +ac_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +ac_cv_motif_includes="none" +AC_TRY_COMPILE([#include ],[int a;], +[ +# Xm/Xm.h is in the standard search path. +ac_cv_motif_includes= +], +[ +# Xm/Xm.h is not in the standard search path. +# Locate it and put its directory in `MOTIF_INCLUDES' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/*; do +if test -f "$dir/Xm/Xm.h"; then +ac_cv_motif_includes="$dir" +break +fi +done +]) +# +LIBS="$ac_motif_save_LIBS" +CFLAGS="$ac_motif_save_CFLAGS" +CPPFLAGS="$ac_motif_save_CPPFLAGS" +LDFLAGS="$ac_motif_save_LDFLAGS" +]) +MOTIF_INCLUDES="$ac_cv_motif_includes" +fi +# +# +# Now for the libraries. +# +if test "$MOTIF_LIBRARIES" = ""; then +AC_CACHE_VAL(ac_cv_motif_libraries, +[ +ac_motif_save_LIBS="$LIBS" +ac_motif_save_CFLAGS="$CFLAGS" +ac_motif_save_CPPFLAGS="$CPPFLAGS" +ac_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +ac_cv_motif_libraries="none" +AC_TRY_LINK([#include ],[XtToolkitInitialize();], +[ +# libXm.a is in the standard search path. +ac_cv_motif_libraries= +], +[ +# libXm.a is not in the standard search path. +# Locate it and put its directory in `MOTIF_LIBRARIES' +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/lesstif is used on Linux (Lesstif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/lesstif*/lib /usr/lib/Lesstif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do +if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then +ac_cv_motif_libraries="$dir" +break +fi +done +]) +# +LIBS="$ac_motif_save_LIBS" +CFLAGS="$ac_motif_save_CFLAGS" +CPPFLAGS="$ac_motif_save_CPPFLAGS" +LDFLAGS="$ac_motif_save_LDFLAGS" +]) +# +MOTIF_LIBRARIES="$ac_cv_motif_libraries" +fi +# +# Provide an easier way to link +# +if test "$MOTIF_INCLUDES" = "none" -o "$MOTIF_LIBRARIES" = "none"; then + with_motif="no" +else + with_motif="yes" +fi + +if test "$with_motif" != "no"; then + if test "$MOTIF_LIBRARIES" = ""; then + LINK_MOTIF="-lXm" + MOTIF_LIBS="-lXm" + else + LINK_MOTIF="-L$MOTIF_LIBRARIES -lXm" + MOTIF_LIBS="-L$MOTIF_LIBRARIES -lXm" + fi + if test "$MOTIF_INCLUDES" != ""; then + INCLUDE_MOTIF="-I$MOTIF_INCLUDES" + MOTIF_CFLAGS="-I$MOTIF_INCLUDES" + fi + AC_DEFINE(HAVE_MOTIF) +else + with_motif="no" +fi +# +AC_SUBST(LINK_MOTIF) +AC_SUBST(INCLUDE_MOTIF) +# +# +# +motif_libraries_result="$MOTIF_LIBRARIES" +motif_includes_result="$MOTIF_INCLUDES" +test "$motif_libraries_result" = "" && motif_libraries_result="in default path" +test "$motif_includes_result" = "" && motif_includes_result="in default path" +test "$motif_libraries_result" = "none" && motif_libraries_result="(none)" +test "$motif_includes_result" = "none" && motif_includes_result="(none)" +AC_MSG_RESULT( + [libraries $motif_libraries_result, headers $motif_includes_result]) +])dnl + diff --git a/alliance/src/xpm.m4 b/alliance/src/xpm.m4 new file mode 100644 index 00000000..e0d74e8e --- /dev/null +++ b/alliance/src/xpm.m4 @@ -0,0 +1,186 @@ +dnl AC_FIND_XPM +dnl --------------- +dnl +dnl Find Xpm libraries and headers. +dnl Put Xpm include directory in xpm_includes, +dnl put Xpm library directory in xpm_libraries, +dnl and add appropriate flags to X_CFLAGS and X_LIBS. +dnl +dnl +AC_DEFUN(AC_FIND_XPM, +[ +AC_REQUIRE([AC_PATH_XTRA]) +xpm_includes= +xpm_libraries= +AC_ARG_WITH(xpm, +[ --without-xpm do not use the Xpm library]) +dnl Treat --without-xpm like +dnl --without-xpm-includes --without-xpm-libraries. +if test "$with_xpm" = "no" +then +xpm_includes=no +xpm_libraries=no +fi +AC_ARG_WITH(xpm-includes, +[ --with-xpm-includes=DIR Xpm include files are in DIR], +xpm_includes="$withval") +AC_ARG_WITH(xpm-libraries, +[ --with-xpm-libraries=DIR + Xpm libraries are in DIR], +xpm_libraries="$withval") +AC_MSG_CHECKING(for Xpm) +# +# +# Search the include files. Note that XPM can come in (as +# in X11R6) or in if installed locally. +# +if test "$xpm_includes" = ""; then +AC_CACHE_VAL(ice_cv_xpm_includes, +[ +ice_xpm_save_LIBS="$LIBS" +ice_xpm_save_CFLAGS="$CFLAGS" +ice_xpm_save_CPPFLAGS="$CPPFLAGS" +ice_xpm_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +AC_TRY_COMPILE([ +#include +],[int a;], +[ +# X11/xpm.h is in the standard search path. +ice_cv_xpm_includes= +], +[ +# X11/xpm.h is not in the standard search path. +# Locate it and put its directory in `xpm_includes' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Xaw). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xaw). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + /usr/*/include/X11R6 /usr/*/include/X11R5 /usr/*/include/X11R4 \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/*; do +if test -f "$dir/X11/xpm.h" || test -f "$dir/xpm.h"; then +ice_cv_xpm_includes="$dir" +break +fi +done +if test "$ice_cv_xpm_includes" = "/usr/include"; then +ice_cv_xpm_includes= +fi +]) +# +LIBS="$ice_xpm_save_LIBS" +CFLAGS="$ice_xpm_save_CFLAGS" +CPPFLAGS="$ice_xpm_save_CPPFLAGS" +LDFLAGS="$ice_xpm_save_LDFLAGS" +]) +xpm_includes="$ice_cv_xpm_includes" +fi +# +# +# Now for the libraries. +# +if test "$xpm_libraries" = ""; then +AC_CACHE_VAL(ice_cv_xpm_libraries, +[ +ice_xpm_save_LIBS="$LIBS" +ice_xpm_save_CFLAGS="$CFLAGS" +ice_xpm_save_CPPFLAGS="$CPPFLAGS" +ice_xpm_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +AC_TRY_LINK([ +#include +#include +],[XtToolkitInitialize();], +[ +# libxpm.a is in the standard search path. +ice_cv_xpm_libraries= +], +[ +# libXpm.a is not in the standard search path. +# Locate it and put its directory in `xpm_libraries' +# +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Xpm). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xpm). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/*/lib/X11R6 /usr/*/lib/X11R5 /usr/*/lib/X11R4 /usr/*/lib/X11 \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do +if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then +ice_cv_xpm_libraries="$dir" +break +fi +done +]) +# +LIBS="$ice_xpm_save_LIBS" +CFLAGS="$ice_xpm_save_CFLAGS" +CPPFLAGS="$ice_xpm_save_CPPFLAGS" +LDFLAGS="$ice_xpm_save_LDFLAGS" +]) +# +xpm_libraries="$ice_cv_xpm_libraries" +fi +# +# Add Xpm definitions to X flags +# +if test "$xpm_includes" != "" && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no" +then +X_CFLAGS="$xpm_includes $X_CFLAGS" +fi +if test "$xpm_libraries" != "" && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no" +then +case "$X_LIBS" in + *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; + *-R*) X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";; + *) X_LIBS="-L$xpm_libraries $X_LIBS";; +esac +fi +# +# +xpm_libraries_result="$xpm_libraries" +xpm_includes_result="$xpm_includes" + +if test "$xpm_libraries_result" != "no" && test "$xpm_includes_result" != "no" +then AC_DEFINE(HAVE_XPM) +fi + +test "$xpm_libraries_result" = "" && + xpm_libraries_result="in default path" +test "$xpm_includes_result" = "" && + xpm_includes_result="in default path" +test "$xpm_libraries_result" = "no" && + xpm_libraries_result="(none)" +test "$xpm_includes_result" = "no" && + xpm_includes_result="(none)" +AC_MSG_RESULT( + [libraries $xpm_libraries_result, headers $xpm_includes_result]) +])dnl