summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/xdvik/m4/xdvi-find-xpm.m4')
-rw-r--r--Build/source/texk/xdvik/m4/xdvi-find-xpm.m4293
1 files changed, 144 insertions, 149 deletions
diff --git a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
index 0d22282782d..fce20f51464 100644
--- a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
@@ -1,59 +1,131 @@
-dnl ### for 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
+# Autoconf macros for xdvik.
+# Copyright (C) 2001 - 2009 Marcin Dalecki <xdvi-core@lists.sourceforge.net>
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# XDVI_FIND_XPM
+# -------------
+# Put Xpm include directory in xpm_includes,
+# put Xpm library directory in xpm_libraries,
+# define x_xpm_libs,
+# and add appropriate flags to X_CFLAGS and X_LIBS.
AC_DEFUN([XDVI_FIND_XPM],
-[
-AC_REQUIRE([AC_PATH_XTRA])
+[AC_REQUIRE([AC_PATH_XTRA])
xpm_includes=
xpm_libraries=
AC_ARG_WITH([xpm],
-[ --without-xpm Do not use the Xpm library (will disable the toolbar)])
+ AS_HELP_STRING([--without-xpm],
+ [Do not use the Xpm library (will disable the toolbar)]))[]dnl
+AC_ARG_WITH([xpm-includes],
+ AS_HELP_STRING([--with-xpm-include=DIR],
+ [Specify the location of Xpm include files]),
+ [xpm_includes="$withval"])
+AC_ARG_WITH([xpm-libraries],
+ AS_HELP_STRING([--with-xpm-libdir=DIR],
+ [Specify the location of Xpm libraries]),
+ [xpm_libraries="$withval"])
dnl Treat --without-xpm like
dnl --without-xpm-includes --without-xpm-libraries.
-if test "$with_xpm" = "no"
+if test "x$with_xpm" = xno; then
+ xpm_includes=no
+ xpm_libraries=no
+fi
+AC_MSG_CHECKING([for Xpm])
+#
+# Check the headers.
+#
+if test "x$xpm_includes" = x; then
+ _XDVI_FIND_XPM_INCLUDES
+fi
+if test "x$xpm_includes" != x; then
+ if test "x$xpm_includes" = xdefault; then
+ AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.])
+ elif test -f "$xpm_includes/X11/xpm.h"; then
+ AC_DEFINE([HAVE_X11_XPM_H], 1)
+ elif test -f "$xpm_includes/xpm.h"; then
+ AC_DEFINE([HAVE_XPM_H], 1,
+ [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).])
+ fi
+fi
+#
+# Check the libraries.
+#
+if test "x$xpm_libraries" = x; then
+ _XDVI_FIND_XPM_LIBRARIES
+fi
+#
+# Add Xpm definitions to X flags
+#
+if test "x$xpm_includes" != "xdefault" && test "$xpm_includes" != "" \
+ && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no"
then
-xpm_includes=no
-xpm_libraries=no
+ X_CFLAGS="-I$xpm_includes $X_CFLAGS"
fi
-AC_ARG_WITH([xpm-includes],
-[ --with-xpm-include=DIR
- Specify the location of Xpm include files],
-[xpm_includes="$withval"])
-AC_ARG_WITH([xpm-libraries],
-[ --with-xpm-libdir=DIR
- Specify the location of Xpm libraries],
-[xpm_libraries="$withval"])
-AC_MSG_CHECKING(for Xpm)
#
+if test "x$xpm_libraries" != "xdefault" && 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
#
-# Search the include files. XPM can either be in <X11/xpm.h> (as in X11R6),
-# which is dealt with by AC_CHECK_HEADERS(X11/xpm.h), or in <xpm.h> if installed locally;
-# this is what this test is for.
+# Now check the results of headers and libraries and set USE_XPM to 0
+# if one of them hadn't been found.
#
-if test "$xpm_includes" = ""; then
-AC_CACHE_VAL(xdvi_cv_xpm_includes,
-[
-xdvi_xpm_save_LIBS="$LIBS"
-xdvi_xpm_save_CFLAGS="$CFLAGS"
-xdvi_xpm_save_CPPFLAGS="$CPPFLAGS"
-xdvi_xpm_save_LDFLAGS="$LDFLAGS"
+AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library])
+x_xpm_libs="-lXpm"
+#
+xpm_libraries_result=$xpm_libraries
+if test "x$xpm_libraries_result" = xdefault ; then
+ xpm_libraries_result="in default path"
+elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then
+ xpm_libraries_result="(none)"
+ AC_DEFINE([USE_XPM], 0)
+ x_xpm_libs=""
+fi
+AC_SUBST([x_xpm_libs])
+#
+xpm_includes_result=$xpm_includes
+if test "x$xpm_includes_result" = "xdefault"; then
+ xpm_includes_result="in default path"
+elif test "$xpm_includes_result" = no || test "x$xpm_includes_result" = "x"; then
+ AC_DEFINE([USE_XPM], 0)
+ xpm_includes_result="(none)"
+fi
+#
+AC_MSG_RESULT([libraries $xpm_libraries_result, headers $xpm_includes_result])
+]) # XDVI_FIND_XPM
+
+# _XDVI_FIND_XPM_INCLUDES
+# -----------------------
+# Search the Xpm include files.
+# They can either be in <X11/xpm.h> (as in X11R6), which is dealt with
+# by AC_CHECK_HEADERS([X11/xpm.h]),
+# or in <xpm.h> if installed locally; this is what this test is for.
+m4_define([_XDVI_FIND_XPM_INCLUDES],
+[AC_CACHE_VAL([xdvi_cv_xpm_includes],
+[xdvi_xpm_save_LIBS=$LIBS
+xdvi_xpm_save_CFLAGS=$CFLAGS
+xdvi_xpm_save_CPPFLAGS=$CPPFLAGS
+xdvi_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 <X11/xpm.h>
-],[int a;],
-[
-# X11/xpm.h is in the standard search path.
-xdvi_cv_xpm_includes="default"
-],
-[
-# X11/xpm.h is not in the standard search path.
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/xpm.h>]],
+ [[int a;]])],
+ [# X11/xpm.h is in the standard search path.
+ xdvi_cv_xpm_includes=default],
+ [# X11/xpm.h is not in the standard search path.
+ xdvi_cv_xpm_includes=no
# Locate it and put its directory in `xpm_includes'
#
# /usr/include/Motif* are used on HP-UX (Motif).
@@ -71,71 +143,48 @@ for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
"${prefix}"/include/* /usr/include/* /usr/local/include/*
do
if test -f "$dir/X11/xpm.h"; then
- xdvi_cv_xpm_includes="$dir"
+ xdvi_cv_xpm_includes=$dir
break
elif test -f "$dir/xpm.h"; then
- xdvi_cv_xpm_includes="$dir"
+ xdvi_cv_xpm_includes=$dir
break
fi
-done
-])
-#
-LIBS="$xdvi_xpm_save_LIBS"
-CFLAGS="$xdvi_xpm_save_CFLAGS"
-CPPFLAGS="$xdvi_xpm_save_CPPFLAGS"
-LDFLAGS="$xdvi_xpm_save_LDFLAGS"
-])
-xpm_includes="$xdvi_cv_xpm_includes"
-fi
-
-dnl Second arg of AC_CACHE_VAL shouldn't contain any AC_DEFINE's,
-dnl moved them out. Peter Breitenlohner <peb@mppmu.mpg.de>
-dnl
-if test "x$xpm_includes" != x; then
- if test "x$xpm_includes" = xdefault; then
- AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.])
- elif test -f "$xpm_includes/X11/xpm.h"; then
- AC_DEFINE([HAVE_X11_XPM_H], 1)
- elif test -f "$xpm_includes/xpm.h"; then
- AC_DEFINE([HAVE_XPM_H], 1,
- [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).])
- fi
-fi
-
+done])
#
+LIBS=$xdvi_xpm_save_LIBS
+CFLAGS=$xdvi_xpm_save_CFLAGS
+CPPFLAGS=$xdvi_xpm_save_CPPFLAGS
+LDFLAGS=$xdvi_xpm_save_LDFLAGS])
#
-# Now for the libraries.
-#
-if test "$xpm_libraries" = ""; then
-AC_CACHE_VAL(xdvi_cv_xpm_libraries,
-[
-xdvi_xpm_save_LIBS="$LIBS"
-xdvi_xpm_save_CFLAGS="$CFLAGS"
-xdvi_xpm_save_CPPFLAGS="$CPPFLAGS"
-xdvi_xpm_save_LDFLAGS="$LDFLAGS"
+xpm_includes=$xdvi_cv_xpm_includes
+]) # _XDVI_FIND_XPM_INCLUDES
+
+# _XDVI_FIND_XPM_LIBRARIES
+# ------------------------
+# Search the Xpm library.
+m4_define([_XDVI_FIND_XPM_LIBRARIES],
+[AC_CACHE_VAL([xdvi_cv_xpm_libraries],
+[xdvi_xpm_save_LIBS=$LIBS
+xdvi_xpm_save_CFLAGS=$CFLAGS
+xdvi_xpm_save_CPPFLAGS=$CPPFLAGS
+xdvi_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"
-xdvi_cv_xpm_libraries=
-#
#
# We use XtToolkitInitialize() here since it takes no arguments
# and thus also works with a C++ compiler.
-AC_TRY_LINK([
-#include <X11/Intrinsic.h>
-#include <X11/xpm.h>
-],[XtToolkitInitialize();],
-[
-# libxpm.a is in the standard search path.
-xdvi_cv_xpm_libraries="default"
-],
-[
-# libXpm.a is not in the standard search path.
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h>
+#include <X11/xpm.h>]],
+ [[XtToolkitInitialize();]])],
+ [# libxpm.a is in the standard search path.
+ xdvi_cv_xpm_libraries=default],
+ [# libXpm.a is not in the standard search path.
+ xdvi_cv_xpm_libraries=no
# 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).
@@ -150,68 +199,14 @@ for dir in "$x_libraries" "${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
- xdvi_cv_xpm_libraries="$dir"
+ xdvi_cv_xpm_libraries=$dir
break
fi
-done
-])
-#
-LIBS="$xdvi_xpm_save_LIBS"
-CFLAGS="$xdvi_xpm_save_CFLAGS"
-CPPFLAGS="$xdvi_xpm_save_CPPFLAGS"
-LDFLAGS="$xdvi_xpm_save_LDFLAGS"
-])
+done])
#
-xpm_libraries="$xdvi_cv_xpm_libraries"
-fi
+LIBS=$xdvi_xpm_save_LIBS
+CFLAGS=$xdvi_xpm_save_CFLAGS
+CPPFLAGS=$xdvi_xpm_save_CPPFLAGS
+LDFLAGS=$xdvi_xpm_save_LDFLAGS])
#
-# Add Xpm definitions to X flags
-#
-if test "x$xpm_includes" != "xdefault" && test "$xpm_includes" != "" \
- && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no"
-then
- X_CFLAGS="-I$xpm_includes $X_CFLAGS"
-fi
-
-if test "x$xpm_libraries" != "xdefault" && 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
-
-#
-#
-x_xpm_libs="-lXpm"
-#
-# Now check the results of headers and libraries and set USE_XPM to 0
-# if one of them hadn't been found.
-#
-AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library])
-xpm_libraries_result="$xpm_libraries"
-xpm_includes_result="$xpm_includes"
-if test "x$xpm_libraries_result" = "xdefault" ; then
- xpm_libraries_result="in default path"
-elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then
- xpm_libraries_result="(none)"
- AC_DEFINE([USE_XPM], 0)
- x_xpm_libs=""
-fi
-
-if test "x$xpm_includes_result" = "xdefault"; then
- xpm_includes_result="in default path"
-elif test "$xpm_includes_result" = no || test "x$xpm_includes_result" = "x"; then
- AC_DEFINE(USE_XPM, 0)
- xpm_includes_result="(none)"
-fi
-
-AC_SUBST(x_xpm_libs)
-AC_MSG_RESULT(
- [libraries $xpm_libraries_result, headers $xpm_includes_result])
-])dnl
-
-
-
+xpm_libraries="$xdvi_cv_xpm_libraries"]) # _XDVI_FIND_XPM_LIBRARIES