mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-23 04:46:55 +03:00
* Make.common.in, acconfig.h, configure.in, mc-aclocal.m4,
doc-gnome/Makefile.in, doc-gnome/C/Makefile.in: removed stuff related to XView, libXPM, libXext and Tk
This commit is contained in:
Pavel Roskin
parent
a7e8f34f9e
commit
47d37ed4df
@ -1,3 +1,9 @@
|
|||||||
|
2000-08-21 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* Make.common.in, acconfig.h, configure.in, mc-aclocal.m4,
|
||||||
|
doc-gnome/Makefile.in, doc-gnome/C/Makefile.in: removed stuff
|
||||||
|
related to XView, libXPM, libXext and Tk
|
||||||
|
|
||||||
2000-08-18 Pavel Roskin <proski@gnu.org>
|
2000-08-18 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
* Makefile.in, lib/Makefile.in: adjusted lists of distributed
|
* Makefile.in, lib/Makefile.in: adjusted lists of distributed
|
||||||
|
|||||||
@ -76,11 +76,9 @@ docdir = $(rootdir)/doc
|
|||||||
mcsrclibdir = $(rootdir)/lib
|
mcsrclibdir = $(rootdir)/lib
|
||||||
slangdir = $(rootdir)/slang
|
slangdir = $(rootdir)/slang
|
||||||
vfsdir = $(rootdir)/vfs
|
vfsdir = $(rootdir)/vfs
|
||||||
xvdir = $(rootdir)/xv
|
|
||||||
tkdir = $(rootdir)/tk
|
|
||||||
gnomedir = $(rootdir)/gnome
|
gnomedir = $(rootdir)/gnome
|
||||||
|
|
||||||
hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir) -I$(xvdir) -I$(xvdir)/support/xview_private -I$(tkdir)
|
hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir)
|
||||||
|
|
||||||
# Rules
|
# Rules
|
||||||
first_rule: all
|
first_rule: all
|
||||||
|
|||||||
@ -139,9 +139,6 @@
|
|||||||
/* Defined if you have the file command */
|
/* Defined if you have the file command */
|
||||||
#undef HAVE_FILECMD
|
#undef HAVE_FILECMD
|
||||||
|
|
||||||
/* Defined if you have libXpm, <X11/xpm.h>, libXext, <X11/extensions/shape.h> */
|
|
||||||
#undef HAVE_XPM_SHAPE
|
|
||||||
|
|
||||||
/* Defined if you have shadow passwords on Linux */
|
/* Defined if you have shadow passwords on Linux */
|
||||||
#undef LINUX_SHADOW
|
#undef LINUX_SHADOW
|
||||||
|
|
||||||
@ -218,10 +215,6 @@
|
|||||||
# define HAVE_CRYPT
|
# define HAVE_CRYPT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_XVIEW
|
|
||||||
# include <xvmain.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET)
|
#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET)
|
||||||
# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
|
# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
|
||||||
# define SLANG_POSIX_SIGNALS
|
# define SLANG_POSIX_SIGNALS
|
||||||
|
|||||||
23
configure.in
23
configure.in
@ -1161,22 +1161,6 @@ dnl
|
|||||||
AC_SUBST(SEDCMD)
|
AC_SUBST(SEDCMD)
|
||||||
AC_SUBST(SEDCMD2)
|
AC_SUBST(SEDCMD2)
|
||||||
|
|
||||||
if test x$no_xview = xyes; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
AC_LIB_XPM
|
|
||||||
if test x$ac_cv_has_xpm = xyes; then
|
|
||||||
XPM_LIB=-lXpm
|
|
||||||
AC_SUBST(XPM_LIB)
|
|
||||||
AC_X_SHAPE_EXTENSION
|
|
||||||
if test x$ac_cv_has_shape = xyes; then
|
|
||||||
AC_DEFINE(HAVE_XPM_SHAPE)
|
|
||||||
XEXT_LIB=-lXext
|
|
||||||
AC_SUBST(XEXT_LIB)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl This code should be moved to the ac_WITH_SLANG
|
dnl This code should be moved to the ac_WITH_SLANG
|
||||||
@ -1313,8 +1297,5 @@ Configuration:
|
|||||||
With subshell support: ${subshell}
|
With subshell support: ${subshell}
|
||||||
X11 versions: ${xvers}
|
X11 versions: ${xvers}
|
||||||
Internal editor: ${EDIT_msg}
|
Internal editor: ${EDIT_msg}
|
||||||
Install path: ${prefix}/bin, ${prefix}/lib/mc"
|
Install path: ${prefix}/bin, ${prefix}/lib/mc
|
||||||
if test -n "$xv_bindir"; then
|
"
|
||||||
echo " XView version install path: ${xv_bindir}"
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
|
|||||||
@ -153,8 +153,6 @@ VERSION = @VERSION@
|
|||||||
WRITEDEP = @WRITEDEP@
|
WRITEDEP = @WRITEDEP@
|
||||||
X11_WWW = @X11_WWW@
|
X11_WWW = @X11_WWW@
|
||||||
XCURSES = @XCURSES@
|
XCURSES = @XCURSES@
|
||||||
XEXT_LIB = @XEXT_LIB@
|
|
||||||
XPM_LIB = @XPM_LIB@
|
|
||||||
ZVT_LIBS = @ZVT_LIBS@
|
ZVT_LIBS = @ZVT_LIBS@
|
||||||
builddir = @builddir@
|
builddir = @builddir@
|
||||||
dep = @dep@
|
dep = @dep@
|
||||||
|
|||||||
@ -94,7 +94,6 @@ GT_NO = @GT_NO@
|
|||||||
GT_YES = @GT_YES@
|
GT_YES = @GT_YES@
|
||||||
HAVE_FILECMD = @HAVE_FILECMD@
|
HAVE_FILECMD = @HAVE_FILECMD@
|
||||||
HAVE_SLINGSHOT = @HAVE_SLINGSHOT@
|
HAVE_SLINGSHOT = @HAVE_SLINGSHOT@
|
||||||
HAVE_XVIEW = @HAVE_XVIEW@
|
|
||||||
HAVE_nroff = @HAVE_nroff@
|
HAVE_nroff = @HAVE_nroff@
|
||||||
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
|
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
|
||||||
INSTOBJEXT = @INSTOBJEXT@
|
INSTOBJEXT = @INSTOBJEXT@
|
||||||
@ -152,11 +151,7 @@ VERSION = @VERSION@
|
|||||||
WRITEDEP = @WRITEDEP@
|
WRITEDEP = @WRITEDEP@
|
||||||
X11_WWW = @X11_WWW@
|
X11_WWW = @X11_WWW@
|
||||||
XCURSES = @XCURSES@
|
XCURSES = @XCURSES@
|
||||||
XEXT_LIB = @XEXT_LIB@
|
|
||||||
XPM_LIB = @XPM_LIB@
|
XPM_LIB = @XPM_LIB@
|
||||||
XVIEW_CFLAGS = @XVIEW_CFLAGS@
|
|
||||||
XVIEW_CPPFLAGS = @XVIEW_CPPFLAGS@
|
|
||||||
XVIEW_LIBS = @XVIEW_LIBS@
|
|
||||||
ZVT_LIBS = @ZVT_LIBS@
|
ZVT_LIBS = @ZVT_LIBS@
|
||||||
builddir = @builddir@
|
builddir = @builddir@
|
||||||
dep = @dep@
|
dep = @dep@
|
||||||
@ -179,7 +174,7 @@ SUBDIRS = C
|
|||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
HEADERS = $(HAVE_XVIEW_PRIVATE_HEADERS)
|
HEADERS =
|
||||||
|
|
||||||
DIST_COMMON = Makefile.in
|
DIST_COMMON = Makefile.in
|
||||||
|
|
||||||
@ -196,21 +191,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
|||||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
|
|
||||||
install-HAVE_XVIEW_PRIVATEHEADERS: $(HAVE_XVIEW_PRIVATE_HEADERS)
|
|
||||||
@$(NORMAL_INSTALL)
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(HAVE_XVIEW_PRIVATEdir)
|
|
||||||
@list='$(HAVE_XVIEW_PRIVATE_HEADERS)'; for p in $$list; do \
|
|
||||||
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
|
|
||||||
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(HAVE_XVIEW_PRIVATEdir)/$$p"; \
|
|
||||||
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(HAVE_XVIEW_PRIVATEdir)/$$p; \
|
|
||||||
done
|
|
||||||
|
|
||||||
uninstall-HAVE_XVIEW_PRIVATEHEADERS:
|
|
||||||
@$(NORMAL_UNINSTALL)
|
|
||||||
list='$(HAVE_XVIEW_PRIVATE_HEADERS)'; for p in $$list; do \
|
|
||||||
rm -f $(DESTDIR)$(HAVE_XVIEW_PRIVATEdir)/$$p; \
|
|
||||||
done
|
|
||||||
|
|
||||||
# This directory's subdirectories are mostly independent; you can cd
|
# This directory's subdirectories are mostly independent; you can cd
|
||||||
# into them and run `make' without going through this Makefile.
|
# into them and run `make' without going through this Makefile.
|
||||||
# To change the values of `make' variables: instead of editing Makefiles,
|
# To change the values of `make' variables: instead of editing Makefiles,
|
||||||
@ -341,13 +321,13 @@ installcheck: installcheck-recursive
|
|||||||
install-exec-am:
|
install-exec-am:
|
||||||
install-exec: install-exec-recursive
|
install-exec: install-exec-recursive
|
||||||
|
|
||||||
install-data-am: install-HAVE_XVIEW_PRIVATEHEADERS
|
install-data-am:
|
||||||
install-data: install-data-recursive
|
install-data: install-data-recursive
|
||||||
|
|
||||||
install-am: all-am
|
install-am: all-am
|
||||||
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||||
install: install-recursive
|
install: install-recursive
|
||||||
uninstall-am: uninstall-HAVE_XVIEW_PRIVATEHEADERS
|
uninstall-am:
|
||||||
uninstall: uninstall-recursive
|
uninstall: uninstall-recursive
|
||||||
all-am: Makefile $(HEADERS)
|
all-am: Makefile $(HEADERS)
|
||||||
all-redirect: all-recursive
|
all-redirect: all-recursive
|
||||||
@ -355,7 +335,6 @@ install-strip:
|
|||||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
|
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
|
||||||
installdirs: installdirs-recursive
|
installdirs: installdirs-recursive
|
||||||
installdirs-am:
|
installdirs-am:
|
||||||
$(mkinstalldirs) $(DESTDIR)$(HAVE_XVIEW_PRIVATEdir)
|
|
||||||
|
|
||||||
|
|
||||||
mostlyclean-generic:
|
mostlyclean-generic:
|
||||||
@ -391,8 +370,7 @@ maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
|
|||||||
|
|
||||||
maintainer-clean: maintainer-clean-recursive
|
maintainer-clean: maintainer-clean-recursive
|
||||||
|
|
||||||
.PHONY: uninstall-HAVE_XVIEW_PRIVATEHEADERS \
|
.PHONY: install-data-recursive \
|
||||||
install-HAVE_XVIEW_PRIVATEHEADERS install-data-recursive \
|
|
||||||
uninstall-data-recursive install-exec-recursive \
|
uninstall-data-recursive install-exec-recursive \
|
||||||
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
|
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
|
||||||
all-recursive check-recursive installcheck-recursive info-recursive \
|
all-recursive check-recursive installcheck-recursive info-recursive \
|
||||||
|
|||||||
535
mc-aclocal.m4
535
mc-aclocal.m4
@ -1,538 +1,3 @@
|
|||||||
dnl
|
|
||||||
dnl XView & SlingShot library checking
|
|
||||||
dnl (c) 1995 Jakub Jelinek
|
|
||||||
dnl
|
|
||||||
|
|
||||||
dnl Set xview_includes, xview_libraries, and no_xview (initially yes).
|
|
||||||
dnl Also sets xview_no_private_headers to yes if there are no xview_private
|
|
||||||
dnl headers in the system.
|
|
||||||
AC_DEFUN(AC_PATH_XVIEW,
|
|
||||||
[
|
|
||||||
no_xview=yes
|
|
||||||
AC_ARG_WITH(xview, [--with-xview Use the XView toolkit],no_xview=)
|
|
||||||
|
|
||||||
AC_ARG_WITH(xview-includes, [--with-xview-includes=path Specifies XView includes directory],
|
|
||||||
[
|
|
||||||
if test x$withval = xyes; then
|
|
||||||
AC_MSG_WARN(Usage is: --with-xview-includes=path)
|
|
||||||
xview_includes=NONE
|
|
||||||
no_xview=
|
|
||||||
else
|
|
||||||
xview_includes=$withval
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[
|
|
||||||
xview_includes=NONE
|
|
||||||
])dnl
|
|
||||||
AC_ARG_WITH(xview-libraries, [--with-xview-libraries=path Specifies XView libraries directory],
|
|
||||||
[
|
|
||||||
if test x$withval = xyes; then
|
|
||||||
AC_MSG_WARN(Usage is: --with-xview-libraries=path)
|
|
||||||
xview_libraries=NONE
|
|
||||||
no_xview=
|
|
||||||
else
|
|
||||||
xview_libraries=$withval
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[
|
|
||||||
xview_libraries=NONE
|
|
||||||
])dnl
|
|
||||||
|
|
||||||
if test "$no_xview" != yes; then
|
|
||||||
if test "$no_x" = yes; then
|
|
||||||
no_xview=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "$no_xview" != yes; then
|
|
||||||
AC_MSG_CHECKING(for XView)
|
|
||||||
if test x$xview_libraries = xNONE; then
|
|
||||||
if test x$xview_includes = xNONE; then
|
|
||||||
AC_CACHE_VAL(ac_cv_path_xview,
|
|
||||||
[
|
|
||||||
no_xview=yes
|
|
||||||
AC_PATH_XVIEW_XMKMF
|
|
||||||
if test "x$no_xview" = xyes; then
|
|
||||||
AC_PATH_XVIEW_DIRECT
|
|
||||||
fi
|
|
||||||
if test "x$no_xview" = xyes; then
|
|
||||||
ac_cv_path_xview="no_xview=yes"
|
|
||||||
else
|
|
||||||
ac_cv_path_xview="no_xview= ac_xview_includes=$ac_xview_includes ac_xview_libraries=$ac_xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers"
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
eval "$ac_cv_path_xview"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$no_xview" = xyes; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
else
|
|
||||||
if test "x$xview_includes" = x || test "x$xview_includes" = xNONE; then
|
|
||||||
xview_includes=$ac_xview_includes
|
|
||||||
fi
|
|
||||||
if test "x$xview_libraries" = x || test "x$xview_libraries" = xNONE; then
|
|
||||||
xview_libraries=$ac_xview_libraries
|
|
||||||
fi
|
|
||||||
xview_no_private_headers=$ac_xview_no_private_headers
|
|
||||||
ac_cv_path_xview="no_xview= ac_xview_includes=$xview_includes ac_xview_libraries=$xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers"
|
|
||||||
if test "x$xview_libraries" != x; then
|
|
||||||
ac_msg_xview="libraries $xview_libraries"
|
|
||||||
else
|
|
||||||
ac_msg_xview=""
|
|
||||||
fi
|
|
||||||
if test "x$xview_includes" != x; then
|
|
||||||
if test "x$ac_msg_xview" != x; then
|
|
||||||
ac_msg_xview="$ac_msg_xview, "
|
|
||||||
fi
|
|
||||||
ac_msg_xview="${ac_msg_xview}headers $xview_includes"
|
|
||||||
fi
|
|
||||||
if test "x$xview_no_private_headers" = xyes; then
|
|
||||||
if test "x$ac_msg_xview" != x; then
|
|
||||||
ac_msg_xview="$ac_msg_xview, "
|
|
||||||
fi
|
|
||||||
ac_msg_xview="${ac_msg_xview}without xview_private headers"
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$ac_msg_xview])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Internal subroutine of AC_PATH_XVIEW
|
|
||||||
dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes).
|
|
||||||
AC_DEFUN(AC_PATH_XVIEW_XMKMF,
|
|
||||||
[rm -fr conftestdir
|
|
||||||
if mkdir conftestdir; then
|
|
||||||
cd conftestdir
|
|
||||||
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
|
|
||||||
cat > Imakefile <<'EOF'
|
|
||||||
#include <XView.tmpl>
|
|
||||||
acfindxv:
|
|
||||||
@echo 'ac_im_library_dest="${LIBRARY_DEST}"; ac_im_header_dest="${HEADER_DEST}"'
|
|
||||||
EOF
|
|
||||||
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
|
|
||||||
no_xview=
|
|
||||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
|
||||||
eval `make acfindxv 2>/dev/null | grep -v make`
|
|
||||||
# Screen out bogus values from the imake configuration.
|
|
||||||
if test -f "$ac_im_header_dest/xview/xview.h"; then
|
|
||||||
ac_xview_includes="$ac_im_header_dest"
|
|
||||||
else
|
|
||||||
no_xview=yes
|
|
||||||
fi
|
|
||||||
if test -d "$ac_im_library_dest"; then
|
|
||||||
ac_xview_libraries="$ac_im_library_dest"
|
|
||||||
else
|
|
||||||
no_xview=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_xview" != xyes; then
|
|
||||||
if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then
|
|
||||||
ac_xview_no_private_headers=
|
|
||||||
else
|
|
||||||
ac_xview_no_private_headers=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
cd ..
|
|
||||||
rm -fr conftestdir
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Internal subroutine of AC_PATH_XVIEW
|
|
||||||
dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes).
|
|
||||||
AC_DEFUN(AC_PATH_XVIEW_DIRECT,
|
|
||||||
[test -z "$xview_direct_test_library" && xview_direct_test_library=xview
|
|
||||||
test -z "$xview_direct_test_function" && xview_direct_test_function=xv_unique_key
|
|
||||||
test -z "$xview_direct_test_include" && xview_direct_test_include=xview/xview.h
|
|
||||||
AC_TRY_CPP([#include <$xview_direct_test_include>],
|
|
||||||
[no_xview= ac_xview_includes=],
|
|
||||||
[ for ac_dir in \
|
|
||||||
$OPENWINHOME/include \
|
|
||||||
/usr/openwin/include \
|
|
||||||
/usr/openwin/share/include \
|
|
||||||
\
|
|
||||||
/usr/X11R6/include \
|
|
||||||
/usr/X11R5/include \
|
|
||||||
/usr/X11R4/include \
|
|
||||||
\
|
|
||||||
/usr/include/X11R6 \
|
|
||||||
/usr/include/X11R5 \
|
|
||||||
/usr/include/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/local/X11R6/include \
|
|
||||||
/usr/local/X11R5/include \
|
|
||||||
/usr/local/X11R4/include \
|
|
||||||
\
|
|
||||||
/usr/local/include/X11R6 \
|
|
||||||
/usr/local/include/X11R5 \
|
|
||||||
/usr/local/include/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/X11/include \
|
|
||||||
/usr/include/X11 \
|
|
||||||
/usr/local/X11/include \
|
|
||||||
/usr/local/include/X11 \
|
|
||||||
\
|
|
||||||
/usr/X386/include \
|
|
||||||
/usr/x386/include \
|
|
||||||
/usr/XFree86/include/X11 \
|
|
||||||
\
|
|
||||||
/usr/include \
|
|
||||||
/usr/local/include \
|
|
||||||
/usr/unsupported/include \
|
|
||||||
/usr/athena/include \
|
|
||||||
/usr/local/x11r5/include \
|
|
||||||
/usr/lpp/Xamples/include \
|
|
||||||
; \
|
|
||||||
do
|
|
||||||
if test -r "$ac_dir/$xview_direct_test_include"; then
|
|
||||||
no_xview= ac_xview_includes=$ac_dir
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done])
|
|
||||||
|
|
||||||
if test "x$no_xview" != xyes; then
|
|
||||||
if test "x$ac_xview_includes" != x; then
|
|
||||||
if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then
|
|
||||||
ac_xview_no_private_headers=
|
|
||||||
else
|
|
||||||
ac_xview_no_private_headers=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
AC_TRY_CPP([#include <xview_private/draw_impl.h>],
|
|
||||||
[ac_xview_no_private_headers=],[ac_xview_no_private_headers=yes])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for the libraries.
|
|
||||||
# See if we find them without any special options.
|
|
||||||
# Don't add to $LIBS permanently.
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
ac_save_LDFLAGS="$LDFLAGS"
|
|
||||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
|
||||||
LIBS="-l$xview_direct_test_library -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS"
|
|
||||||
AC_TRY_LINK([#include <$xview_direct_test_include>
|
|
||||||
], [${xview_direct_test_function}()],
|
|
||||||
[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_xview= ac_xview_libraries=],
|
|
||||||
[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS"
|
|
||||||
# First see if replacing the include by lib works.
|
|
||||||
for ac_dir in `echo "$ac_xview_includes" | sed s/include/lib/` \
|
|
||||||
$OPENWINHOME/lib \
|
|
||||||
$OPENWINHOME/share/lib \
|
|
||||||
/usr/openwin/lib \
|
|
||||||
/usr/openwin/share/lib \
|
|
||||||
\
|
|
||||||
/usr/X11R6/lib \
|
|
||||||
/usr/X11R5/lib \
|
|
||||||
/usr/X11R4/lib \
|
|
||||||
\
|
|
||||||
/usr/lib/X11R6 \
|
|
||||||
/usr/lib/X11R5 \
|
|
||||||
/usr/lib/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/local/X11R6/lib \
|
|
||||||
/usr/local/X11R5/lib \
|
|
||||||
/usr/local/X11R4/lib \
|
|
||||||
\
|
|
||||||
/usr/local/lib/X11R6 \
|
|
||||||
/usr/local/lib/X11R5 \
|
|
||||||
/usr/local/lib/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/X11/lib \
|
|
||||||
/usr/lib/X11 \
|
|
||||||
/usr/local/X11/lib \
|
|
||||||
/usr/local/lib/X11 \
|
|
||||||
\
|
|
||||||
/usr/X386/lib \
|
|
||||||
/usr/x386/lib \
|
|
||||||
/usr/XFree86/lib/X11 \
|
|
||||||
\
|
|
||||||
/usr/lib \
|
|
||||||
/usr/local/lib \
|
|
||||||
/usr/unsupported/lib \
|
|
||||||
/usr/athena/lib \
|
|
||||||
/usr/local/x11r5/lib \
|
|
||||||
/usr/lpp/Xamples/lib \
|
|
||||||
; \
|
|
||||||
do
|
|
||||||
for ac_extension in a so sl; do
|
|
||||||
if test -r $ac_dir/lib${xview_direct_test_library}.$ac_extension; then
|
|
||||||
no_xview= ac_xview_libraries=$ac_dir
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done])])
|
|
||||||
|
|
||||||
dnl Substitute XVIEW_LIBS and XVIEW_CFLAGS and
|
|
||||||
dnl HAVE_XVIEW, which is either yes or no.
|
|
||||||
dnl Both contain X_LIBS resp. X_CFLAGS inside
|
|
||||||
dnl Also substitutes HAVE_XVIEW_PRIVATE_HEADERS
|
|
||||||
dnl if there are xview_private headers in the system
|
|
||||||
AC_DEFUN(AC_PATH_XVIEW_XTRA,
|
|
||||||
[AC_REQUIRE([AC_PATH_XVIEW])dnl
|
|
||||||
if test "$no_xview" = yes; then
|
|
||||||
# Not all programs may use this symbol, but it does not hurt to define it.
|
|
||||||
XVIEW_CFLAGS="$X_CFGLAGS $XVIEW_CFLAGS -DXVIEW_MISSING"
|
|
||||||
else
|
|
||||||
if test -n "$xview_includes"; then
|
|
||||||
XVIEW_CFLAGS="$X_CFLAGS $XVIEW_CFGLAGS"
|
|
||||||
if test "$xview_includes" != "$x_includes"; then
|
|
||||||
XVIEW_CPPFLAGS="-I$xview_includes"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# It would be nice to have a more robust check for the -R ld option than
|
|
||||||
# just checking for Solaris.
|
|
||||||
# It would also be nice to do this for all -L options, not just this one.
|
|
||||||
if test -n "$xview_libraries"; then
|
|
||||||
if test "$xview_libraries" = "$x_libraries"; then
|
|
||||||
XVIEW_LIBS="$X_LIBS $XVIEW_LIBS"
|
|
||||||
else
|
|
||||||
XVIEW_LIBS="$X_LIBS $XVIEW_LIBS -L$xview_libraries"
|
|
||||||
if test "`(uname) 2>/dev/null`" = SunOS &&
|
|
||||||
uname -r | grep '^5' >/dev/null; then
|
|
||||||
XVIEW_LIBS="$XVIEW_LIBS -R$xview_libraries"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_xview" = xyes; then
|
|
||||||
HAVE_XVIEW=no
|
|
||||||
else
|
|
||||||
HAVE_XVIEW=yes
|
|
||||||
fi
|
|
||||||
if test "x$xview_no_private_headers" = xyes; then
|
|
||||||
HAVE_XVIEW_PRIVATE_HEADERS=no
|
|
||||||
else
|
|
||||||
HAVE_XVIEW_PRIVATE_HEADERS=yes
|
|
||||||
fi
|
|
||||||
AC_SUBST(XVIEW_CFLAGS)dnl
|
|
||||||
AC_SUBST(XVIEW_CPPFLAGS)dnl
|
|
||||||
AC_SUBST(XVIEW_LIBS)dnl
|
|
||||||
AC_SUBST(HAVE_XVIEW)dnl
|
|
||||||
AC_SUBST(HAVE_XVIEW_PRIVATE_HEADERS)dnl
|
|
||||||
])dnl
|
|
||||||
|
|
||||||
dnl Internal subroutine of AC_PATH_SLINGSHOT
|
|
||||||
AC_DEFUN(AC_PATH_SLINGSHOT_DIRECT,
|
|
||||||
[
|
|
||||||
AC_TRY_CPP([#include <sspkg/rectobj.h>],[no_ss= ac_ss_includes=],
|
|
||||||
[ for ac_dir in \
|
|
||||||
$OPENWINHOME/include \
|
|
||||||
/usr/openwin/include \
|
|
||||||
/usr/openwin/share/include \
|
|
||||||
\
|
|
||||||
/usr/X11R6/include \
|
|
||||||
/usr/X11R5/include \
|
|
||||||
/usr/X11R4/include \
|
|
||||||
\
|
|
||||||
/usr/include/X11R6 \
|
|
||||||
/usr/include/X11R5 \
|
|
||||||
/usr/include/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/local/X11R6/include \
|
|
||||||
/usr/local/X11R5/include \
|
|
||||||
/usr/local/X11R4/include \
|
|
||||||
\
|
|
||||||
/usr/local/include/X11R6 \
|
|
||||||
/usr/local/include/X11R5 \
|
|
||||||
/usr/local/include/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/X11/include \
|
|
||||||
/usr/include/X11 \
|
|
||||||
/usr/local/X11/include \
|
|
||||||
/usr/local/include/X11 \
|
|
||||||
\
|
|
||||||
/usr/X386/include \
|
|
||||||
/usr/x386/include \
|
|
||||||
/usr/XFree86/include/X11 \
|
|
||||||
\
|
|
||||||
/usr/include \
|
|
||||||
/usr/local/include \
|
|
||||||
/usr/unsupported/include \
|
|
||||||
/usr/athena/include \
|
|
||||||
/usr/local/x11r5/include \
|
|
||||||
/usr/lpp/Xamples/include \
|
|
||||||
; \
|
|
||||||
do
|
|
||||||
if test -r "$ac_dir/sspkg/rectobj.h"; then
|
|
||||||
no_ss= ac_ss_includes=$ac_dir
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done])
|
|
||||||
|
|
||||||
# Check for the libraries.
|
|
||||||
# See if we find them without any special options.
|
|
||||||
# Don't add to $LIBS permanently.
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
ac_save_LDFLAGS="$LDFLAGS"
|
|
||||||
LDFLAGS="$LDFLAGS $XVIEW_LIBS"
|
|
||||||
LIBS="-lsspkg -lm -lxview -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS"
|
|
||||||
AC_TRY_LINK([#include <sspkg/rectobj.h>
|
|
||||||
], [rectobj_get_selected_list()],
|
|
||||||
[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_ss= ac_ss_libraries=],
|
|
||||||
[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS"
|
|
||||||
# First see if replacing the include by lib works.
|
|
||||||
for ac_dir in `echo "$ac_ss_includes" | sed s/include/lib/` \
|
|
||||||
$OPENWINHOME/lib \
|
|
||||||
$OPENWINHOME/share/lib \
|
|
||||||
/usr/openwin/lib \
|
|
||||||
/usr/openwin/share/lib \
|
|
||||||
\
|
|
||||||
/usr/X11R6/lib \
|
|
||||||
/usr/X11R5/lib \
|
|
||||||
/usr/X11R4/lib \
|
|
||||||
\
|
|
||||||
/usr/lib/X11R6 \
|
|
||||||
/usr/lib/X11R5 \
|
|
||||||
/usr/lib/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/local/X11R6/lib \
|
|
||||||
/usr/local/X11R5/lib \
|
|
||||||
/usr/local/X11R4/lib \
|
|
||||||
\
|
|
||||||
/usr/local/lib/X11R6 \
|
|
||||||
/usr/local/lib/X11R5 \
|
|
||||||
/usr/local/lib/X11R4 \
|
|
||||||
\
|
|
||||||
/usr/X11/lib \
|
|
||||||
/usr/lib/X11 \
|
|
||||||
/usr/local/X11/lib \
|
|
||||||
/usr/local/lib/X11 \
|
|
||||||
\
|
|
||||||
/usr/X386/lib \
|
|
||||||
/usr/x386/lib \
|
|
||||||
/usr/XFree86/lib/X11 \
|
|
||||||
\
|
|
||||||
/usr/lib \
|
|
||||||
/usr/local/lib \
|
|
||||||
/usr/unsupported/lib \
|
|
||||||
/usr/athena/lib \
|
|
||||||
/usr/local/x11r5/lib \
|
|
||||||
/usr/lpp/Xamples/lib \
|
|
||||||
; \
|
|
||||||
do
|
|
||||||
for ac_extension in a so sl; do
|
|
||||||
if test -r $ac_dir/libsspkg.$ac_extension; then
|
|
||||||
no_ss= ac_ss_libraries=$ac_dir
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done])])
|
|
||||||
|
|
||||||
dnl Set ss_includes, ss_libraries, and no_ss (initially yes).
|
|
||||||
AC_DEFUN(AC_PATH_SLINGSHOT,
|
|
||||||
[AC_REQUIRE([AC_PATH_XVIEW_XTRA])dnl
|
|
||||||
AC_MSG_CHECKING(for SlingShot)
|
|
||||||
AC_ARG_WITH(ss, [--with-ss Use the SlingShot extension])
|
|
||||||
|
|
||||||
AC_ARG_WITH(ss-includes, [--with-ss-includes=path Specifies SlingShot includes directory],
|
|
||||||
[
|
|
||||||
if test x$withval = xyes; then
|
|
||||||
AC_MSG_WARN(Usage is: --with-ss-includes=path)
|
|
||||||
ss_includes=NONE
|
|
||||||
else
|
|
||||||
ss_includes=$withval
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[
|
|
||||||
ss_includes=NONE
|
|
||||||
])dnl
|
|
||||||
AC_ARG_WITH(ss-libraries, [--with-ss-libraries=path Specifies SlingShot libraries directory],
|
|
||||||
[
|
|
||||||
if test x$withval = xyes; then
|
|
||||||
AC_MSG_WARN(Usage is: --with-ss-libraries=path)
|
|
||||||
ss_libraries=NONE
|
|
||||||
else
|
|
||||||
ss_libraries=$withval
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[
|
|
||||||
ss_libraries=NONE
|
|
||||||
])dnl
|
|
||||||
|
|
||||||
if test "x$with_ss" = xno; then
|
|
||||||
no_ss=yes
|
|
||||||
else
|
|
||||||
if test "x$ss_includes" != xNONE && test "x$ss_libraries" != xNONE; then
|
|
||||||
no_ss=
|
|
||||||
else
|
|
||||||
AC_CACHE_VAL(ac_cv_path_ss,
|
|
||||||
[
|
|
||||||
no_ss=yes
|
|
||||||
AC_PATH_SLINGSHOT_DIRECT
|
|
||||||
if test "x$no_ss" = xyes; then
|
|
||||||
ac_cv_path_ss="ac_noss=yes"
|
|
||||||
else
|
|
||||||
ac_cv_path_ss="ac_ss_includes=$ac_ss_includes ac_ss_libraries=$ac_ss_libraries"
|
|
||||||
fi
|
|
||||||
])dnl
|
|
||||||
eval "$ac_cv_path_ss"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_ss" = xyes; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
else
|
|
||||||
if test "x$ss_includes" = x || test "x$ss_includes" = xNONE; then
|
|
||||||
ss_includes=$ac_ss_includes
|
|
||||||
fi
|
|
||||||
if test "x$ss_libraries" = x || test "x$ss_libraries" = xNONE; then
|
|
||||||
ss_libraries=$ac_ss_libraries
|
|
||||||
fi
|
|
||||||
ac_cv_path_ss="no_ss= ac_ss_includes=$ss_includes ac_ss_libraries=$ss_libraries"
|
|
||||||
if test "x$ss_libraries" = x; then
|
|
||||||
if test "x$ss_includes" = x; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([headers $ss_includes])
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test "x$ss_includes" = x; then
|
|
||||||
AC_MSG_RESULT([libraries $ss_libraries])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([libraries $ss_libraries, headers $ss_includes])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Substitute SLINGSHOT_LIBS and SLINGSHOT_CFLAGS and
|
|
||||||
dnl HAVE_SLINGSHOT, which is either yes or no.
|
|
||||||
dnl Both contain XVIEW_LIBS resp. XVIEW_CFLAGS inside
|
|
||||||
AC_DEFUN(AC_PATH_SLINGSHOT_XTRA,
|
|
||||||
[AC_REQUIRE([AC_PATH_SLINGSHOT])dnl
|
|
||||||
if test "$no_ss" = yes; then
|
|
||||||
# Not all programs may use this symbol, but it does not hurt to define it.
|
|
||||||
SLINGSHOT_CFLAGS="$XVIEW_CFGLAGS $SLINGSHOT_CFLAGS -DSLINGSHOT_MISSING"
|
|
||||||
else
|
|
||||||
if test -n "$ss_includes"; then
|
|
||||||
SLINGSHOT_CFLAGS="$XVIEW_CFLAGS $SLINGSHOT_CFGLAGS -I$ss_includes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# It would be nice to have a more robust check for the -R ld option than
|
|
||||||
# just checking for Solaris.
|
|
||||||
# It would also be nice to do this for all -L options, not just this one.
|
|
||||||
if test -n "$ss_libraries"; then
|
|
||||||
SLINGSHOT_LIBS="$XVIEW_LIBS $SLINGSHOT_LIBS -L$ss_libraries"
|
|
||||||
if test "`(uname) 2>/dev/null`" = SunOS &&
|
|
||||||
uname -r | grep '^5' >/dev/null; then
|
|
||||||
SLINGSHOT_LIBS="$SLINGSHOT_LIBS -R$ss_libraries"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_ss" = xyes; then
|
|
||||||
HAVE_SLINGSHOT=no
|
|
||||||
else
|
|
||||||
HAVE_SLINGSHOT=yes
|
|
||||||
fi
|
|
||||||
AC_SUBST(SLINGSHOT_CFLAGS)dnl
|
|
||||||
AC_SUBST(SLINGSHOT_LIBS)dnl
|
|
||||||
AC_SUBST(HAVE_SLINGSHOT)dnl
|
|
||||||
])dnl
|
|
||||||
|
|
||||||
dnl
|
|
||||||
dnl XView library checking end
|
|
||||||
dnl
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Check for size of d_name dirent member
|
dnl Check for size of d_name dirent member
|
||||||
dnl
|
dnl
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user