diff --git a/.travis.yml b/.travis.yml index 687042e57a..c4aacde838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,24 +9,33 @@ matrix: addons: apt: sources: - - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted universe multiverse' + - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted security universe multiverse' - ubuntu-toolchain-r-test packages: - cppcheck - # imake - - xutils-dev # X11 libaries - libxcomposite-dev - libxdamage-dev + - libxkbfile-dev - libxfont-dev + - libxfont1-dev - libxinerama-dev - libxpm-dev - libxrandr-dev - libxtst-dev + - x11proto-bigreqs-dev - x11proto-fonts-dev + - x11proto-resource-dev + - x11proto-video-dev + - x11proto-xcmisc-dev + - x11proto-xf86bigfont-dev + - x11proto-xf86dga-dev + - x11proto-xf86vidmode-dev + - xfonts-utils + - xutils-dev # soft requirements - quilt - - x11-xkb-utils + - ghostscript env: - MATRIX_EVAL="CC=gcc && CXX=g++" @@ -37,23 +46,33 @@ matrix: addons: apt: sources: + - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted security universe multiverse' - ubuntu-toolchain-r-test packages: - g++-9 - # imake - - xutils-dev # X11 libaries - libxcomposite-dev + - libxkbfile-dev - libxdamage-dev - libxfont-dev + - libxfont1-dev - libxinerama-dev - libxpm-dev - libxrandr-dev - libxtst-dev + - x11proto-bigreqs-dev - x11proto-fonts-dev + - x11proto-resource-dev + - x11proto-video-dev + - x11proto-xcmisc-dev + - x11proto-xf86bigfont-dev + - x11proto-xf86dga-dev + - x11proto-xf86vidmode-dev + - xfonts-utils + - xutils-dev # soft requirements - quilt - - x11-xkb-utils + - ghostscript env: - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" @@ -63,23 +82,33 @@ matrix: addons: apt: sources: + - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted security universe multiverse' - llvm-toolchain-xenial-3.9 packages: - clang-3.9 - # imake - - xutils-dev # X11 libaries - libxcomposite-dev + - libxkbfile-dev - libxdamage-dev - libxfont-dev + - libxfont1-dev - libxinerama-dev - libxpm-dev - libxrandr-dev - libxtst-dev + - x11proto-bigreqs-dev - x11proto-fonts-dev + - x11proto-resource-dev + - x11proto-video-dev + - x11proto-xcmisc-dev + - x11proto-xf86bigfont-dev + - x11proto-xf86dga-dev + - x11proto-xf86vidmode-dev + - xfonts-utils + - xutils-dev # soft requirements - quilt - - x11-xkb-utils + - ghostscript env: - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" @@ -89,24 +118,34 @@ matrix: addons: apt: sources: + - sourceline: 'deb http://archive.ubuntu.com/ubuntu main restricted security universe multiverse' - llvm-toolchain-xenial-8 - ubuntu-toolchain-r-test packages: - clang-8 - # imake - - xutils-dev # X11 libaries - libxcomposite-dev + - libxkbfile-dev - libxdamage-dev - libxfont-dev + - libxfont1-dev - libxinerama-dev - libxpm-dev - libxrandr-dev - libxtst-dev + - x11proto-bigreqs-dev - x11proto-fonts-dev + - x11proto-resource-dev + - x11proto-video-dev + - x11proto-xcmisc-dev + - x11proto-xf86bigfont-dev + - x11proto-xf86dga-dev + - x11proto-xf86vidmode-dev + - xfonts-utils + - xutils-dev # soft requirements - quilt - - x11-xkb-utils + - ghostscript env: - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" diff --git a/Makefile b/Makefile index 42f9f25b4e..323a5fbd4f 100644 --- a/Makefile +++ b/Makefile @@ -26,136 +26,248 @@ USRLIBDIR ?= $(NXLIBDIR)/X11 INCLUDEDIR ?= $(PREFIX)/include CONFIGURE ?= ./configure --prefix="$(PREFIX)" -# check if the xkbcomp devel pkg is available - we need it for the next step -ifneq ($(shell pkg-config --exists xkbcomp && echo yes), yes) - $(warning xkbcomp devel package missing, using imake default values) -endif -ifneq ($(shell pkg-config --exists fontutil && echo yes), yes) - $(warning fontutil devel package missing, using imake default values) -endif - -IMAKE_DEFINES ?= - SHELL:=/bin/bash NX_X11_HEADERS = \ - Xlib.h \ - Xresource.h \ - Xutil.h \ - cursorfont.h \ - Xlibint.h \ - Xcms.h \ - Xlocale.h \ - XKBlib.h \ - XlibConf.h \ - Xregion.h \ - ImUtil.h \ - $(NULL) + Xlib.h \ + Xresource.h \ + Xutil.h \ + cursorfont.h \ + Xlibint.h \ + Xcms.h \ + Xlocale.h \ + XKBlib.h \ + XlibConf.h \ + Xregion.h \ + ImUtil.h \ + $(NULL) NX_XTRANS_HEADERS = \ - transport.c \ - Xtrans.c \ - Xtrans.h \ - Xtransint.h \ - Xtranslcl.c \ - Xtranssock.c \ - Xtransutil.c \ - $(NULL) + transport.c \ + Xtrans.c \ + Xtrans.h \ + Xtransint.h \ + Xtranslcl.c \ + Xtranssock.c \ + Xtransutil.c \ + $(NULL) + +NX_X11PROTO_HEADERS = \ + DECkeysym.h \ + HPkeysym.h \ + keysymdef.h \ + keysym.h \ + Sunkeysym.h \ + Xalloca.h \ + Xarch.h \ + Xatom.h \ + Xauth.h \ + Xdefs.h \ + XF86keysym.h \ + Xfuncproto.h \ + Xfuncs.h \ + X.h \ + Xmd.h \ + Xosdefs.h \ + Xos.h \ + Xos_r.h \ + Xpoll.h \ + Xproto.h \ + Xprotostr.h \ + Xthreads.h \ + Xw32defs.h \ + XWDFile.h \ + Xwindows.h \ + Xwinsock.h \ + $(NULL) + +NX_X11PROTO_EXTENSION_HEADERS = \ + bigreqstr.h \ + composite.h \ + compositeproto.h \ + damageproto.h \ + damagewire.h \ + dpms.h \ + dpmsstr.h \ + panoramiXext.h \ + panoramiXproto.h \ + randr.h \ + randrproto.h \ + record.h \ + recordstr.h \ + render.h \ + renderproto.h \ + saver.h \ + saverproto.h \ + scrnsaver.h \ + security.h \ + securstr.h \ + shapeconst.h \ + sync.h \ + syncstr.h \ + xcmiscstr.h \ + Xdbeproto.h \ + xf86bigfont.h \ + xf86bigfproto.h \ + xfixesproto.h \ + xfixeswire.h \ + XI.h \ + XIproto.h \ + XKBconfig.h \ + XKBfile.h \ + XKBgeom.h \ + XKB.h \ + XKBproto.h \ + XKBrules.h \ + XKBsrv.h \ + XKBstr.h \ + XKMformat.h \ + XKM.h \ + XResproto.h \ + xtestconst.h \ + xtestext1.h \ + xteststr.h \ + Xv.h \ + XvMC.h \ + XvMCproto.h \ + Xvproto.h \ + $(NULL) + +NX_MESAGL_HEADERS = \ + glext.h \ + gl.h \ + glxext.h \ + osmesa.h \ + $(NULL) + +NX_GLX_HEADERS = \ + glx.h \ + glxint.h \ + glxmd.h \ + glxproto.h \ + glxtokens.h \ + $(NULL) + +NX_COMP_HEADERS = \ + MD5.h \ + NXalert.h \ + NX.h \ + NXpack.h \ + NXproto.h \ + NXvars.h \ + $(NULL) + +NX_COMPSHAD_HEADERS = \ + Shadow.h \ + $(NULL) all: build -clean: version imakeconfig +clean: test -f nxcomp/Makefile && ${MAKE} -C nxcomp clean || true test -f nxproxy/Makefile && ${MAKE} -C nxproxy clean || true test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean || true test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean || true + test -f nx-X11/programs/Xserver/Makefile && ${MAKE} -C nx-X11/programs/Xserver clean || true test -d nx-X11 && ${MAKE} clean-env || true test -f nxdialog/Makefile && ${MAKE} -C nxdialog clean || true -distclean: clean version imakeconfig +distclean: clean test -f nxcomp/Makefile && ${MAKE} -C nxcomp distclean || true test -f nxproxy/Makefile && ${MAKE} -C nxproxy distclean || true test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean || true test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad distclean || true + test -f nx-X11/programs/Xserver/Makefile && ${MAKE} -C nx-X11/programs/Xserver distclean || true test -d nx-X11 && ${MAKE} -C nx-X11 distclean || true test -f nxdialog/Makefile && ${MAKE} -C nxdialog distclean || true test -x ./mesa-quilt && ./mesa-quilt pop -a $(RM_DIR_REC) nx-X11/extras/Mesa/.pc/ - $(RM_FILE) nx-X11/config/cf/nxversion.def - $(RM_FILE) nx-X11/config/cf/nxconfig.def test: echo "No testing for NX (redistributed)" -version: - # prepare nx-X11/config/cf/nxversion.def - sed \ - -e 's/###NX_VERSION_MAJOR###/$(shell ./version.sh 1)/' \ - -e 's/###NX_VERSION_MINOR###/$(shell ./version.sh 2)/' \ - -e 's/###NX_VERSION_MICRO###/$(shell ./version.sh 3)/' \ - -e 's/###NX_VERSION_PATCH###/$(shell ./version.sh 4)/' \ - nx-X11/config/cf/nxversion.def.in \ - > nx-X11/config/cf/nxversion.def - -imakeconfig: - # auto-config some setting - - # check if system supports Xfont2 - (echo "#define HasXfont2 `pkg-config --exists xfont2 && echo YES || echo NO`") >nx-X11/config/cf/nxconfig.def - - # check if system has an _old_ release of Xfont1 - (echo "#define HasLegacyXfont1 `pkg-config --exists 'xfont < 1.4.2' && echo YES || echo NO`") >>nx-X11/config/cf/nxconfig.def - - # check if system has an _old_ release of XextProto - (echo "#define HasLegacyXextProto `pkg-config --exists 'xextproto < 7.1.0' && echo YES || echo NO`") >>nx-X11/config/cf/nxconfig.def - - # the system's directory with the xkb data and binary files (these - # needs to be independent of Imake's ProjectRoot or the configure - # prefix.) - (pkg-config --exists xkbcomp && echo "#define SystemXkbConfigDir `pkg-config xkbcomp --variable=xkbconfigdir`"; :) >>nx-X11/config/cf/nxconfig.def - (pkg-config --exists xkbcomp && echo "#define SystemXkbBinDir `pkg-config xkbcomp --variable=prefix`/bin"; :) >>nx-X11/config/cf/nxconfig.def - - (pkg-config --exists fontutil && echo "#define SystemFontRootDir `pkg-config fontutil --variable=fontrootdir`"; :) >>nx-X11/config/cf/nxconfig.def - - # let's create the nx-X11 Makefiles now, once everything has been defined - $(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)" - -build-env: version imakeconfig - # prepare Makefiles and the nx-X11 symlinking magic - ${MAKE} -j1 -C nx-X11 BuildIncludes IMAKE_DEFINES="$(IMAKE_DEFINES)" - - # set up environment for libNX_X11 build (X11 header files) +build-env: + # set up environment for libNX_X11 build (libNX_X11 header files) mkdir -p nx-X11/exports/include/nx-X11/ for header in $(NX_X11_HEADERS); do \ ${SYMLINK_FILE} ../../../lib/include/X11/$${header} nx-X11/exports/include/nx-X11/$${header}; \ done - # set up environment for libNX_X11 build (Xtrans header/include files) + # set up environment for libNX_X11 build (NX_Xtrans header/include files) mkdir -p nx-X11/exports/include/nx-X11/Xtrans/ for header in $(NX_XTRANS_HEADERS); do \ ${SYMLINK_FILE} ../../../../lib/include/xtrans/$${header} nx-X11/exports/include/nx-X11/Xtrans/$${header}; \ done -clean-env: version + # setup environment for libNX_X11 and Xserver build (nx-X11 proto headers) + mkdir -p nx-X11/exports/include/nx-X11/ + for header in $(NX_X11PROTO_HEADERS); do \ + ${SYMLINK_FILE} ../../../include/$${header} nx-X11/exports/include/nx-X11/$${header}; \ + done + + # setup environment for Xserver build (nx-X11 extension proto headers) + mkdir -p nx-X11/exports/include/nx-X11/extensions + for header in $(NX_X11PROTO_EXTENSION_HEADERS); do \ + ${SYMLINK_FILE} ../../../../include/extensions/$${header} nx-X11/exports/include/nx-X11/extensions/$${header}; \ + done + + # setup environment for Xserver GLX/Mesa build + for header in $(NX_MESAGL_HEADERS); do \ + ${SYMLINK_FILE} ../../extras/Mesa/include/GL/$${header} nx-X11/include/GL/$${header}; \ + done + mkdir -p nx-X11/exports/include/GL + for header in $(NX_GLX_HEADERS) $(NX_MESAGL_HEADERS); do \ + ${SYMLINK_FILE} ../../../include/GL/$${header} nx-X11/exports/include/GL/$${header}; \ + done + + # setup environment for building against nxcomp + mkdir -p nx-X11/exports/include/nx + for header in $(NX_COMP_HEADERS); do \ + ${SYMLINK_FILE} ../../../../nxcomp/include/$${header} nx-X11/exports/include/nx/$${header}; \ + done + + # setup environment for building against nxcompshad + mkdir -p nx-X11/exports/include/nx + for header in $(NX_COMPSHAD_HEADERS); do \ + ${SYMLINK_FILE} ../../../../nxcompshad/include/$${header} nx-X11/exports/include/nx/$${header}; \ + done + +clean-env: for header in $(NX_X11_HEADERS); do \ ${RM_FILE} nx-X11/exports/include/nx-X11/$${header}; \ done for header in $(NX_XTRANS_HEADERS); do \ ${RM_FILE} nx-X11/exports/include/nx-X11/Xtrans/$${header}; \ done + for header in $(NX_X11PROTO_HEADERS); do \ + ${RM_FILE} nx-X11/exports/include/nx-X11/$${header}; \ + done + for header in $(NX_X11PROTO_EXTENSION_HEADERS); do \ + ${RM_FILE} nx-X11/exports/include/nx-X11/extensions/$${header}; \ + done + for header in $(NX_GLX_HEADERS) $(NX_MESAGL_HEADERS); do \ + ${RM_FILE} nx-X11/exports/include/GL/$${header}; \ + done + for header in $(NX_MESAGL_HEADERS); do \ + ${RM_FILE} nx-X11/include/GL/$${header}; \ + done + for header in $(NX_COMP_HEADERS) $(NX_COMPSHAD_HEADERS); do \ + ${RM_FILE} nx-X11/exports/include/nx/$${header}; \ + done - [ -d exports/include/nx-X11/Xtrans ] && $(RM_DIR) exports/include/nx-X11/Xtrans/ || : - [ -d exports/include/nx-X11/ ] && $(RM_DIR) exports/include/nx-X11/ || : - - ${MAKE} -j1 -C nx-X11 clean IMAKE_DEFINES="$(IMAKE_DEFINES)" + [ -d nx-X11/exports/include/nx-X11/Xtrans ] && $(RM_DIR) nx-X11/exports/include/nx-X11/Xtrans/ || : + [ -d nx-X11/exports/include/nx-X11/extensions ] && $(RM_DIR) nx-X11/exports/include/nx-X11/extensions/ || : + [ -d nx-X11/exports/include/nx-X11/ ] && $(RM_DIR) nx-X11/exports/include/nx-X11/ || : + [ -d nx-X11/exports/include/nx/ ] && $(RM_DIR) nx-X11/exports/include/nx/ || : + [ -d nx-X11/exports/include/GL/ ] && $(RM_DIR) nx-X11/exports/include/GL/ || : + [ -d nx-X11/exports/include/ ] && $(RM_DIR) nx-X11/exports/include/ || : + [ -d nx-X11/exports/ ] && $(RM_DIR) nx-X11/exports/ || : build-lite: cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} build-full: build-env -# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... - # build nxcomp first cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} @@ -171,8 +283,7 @@ build-full: build-env # build nxagent fourth ./mesa-quilt push -a - ${MAKE} -j1 -C nx-X11 BuildDependsOnly IMAKE_DEFINES="$(IMAKE_DEFINES)" - ${MAKE} -C nx-X11 World USRLIBDIR="$(USRLIBDIR)" SHLIBDIR="$(SHLIBDIR)" IMAKE_DEFINES="$(IMAKE_DEFINES)" + cd nx-X11/programs/ && CONFIGURE="${CONFIGURE}" ./buildit.sh # build nxproxy fifth cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} diff --git a/debian/patches/2001_nx-X11_install-location.debian.patch b/debian/patches/2001_nx-X11_install-location.debian.patch deleted file mode 100644 index b14fa14dd2..0000000000 --- a/debian/patches/2001_nx-X11_install-location.debian.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: FHS adaptation for Debian packaging - On Debian, NX libraries and binaries are installed to - /usr/lib/nx. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -733,7 +733,7 @@ - #define AlternateUsrLibDir YES - #endif - #else --#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) -+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11) - #ifndef AlternateUsrLibDir - #define AlternateUsrLibDir NO - #endif -@@ -751,7 +751,7 @@ - #define AlternateUsrDataDir YES - #endif - #else --#define UsrDataDir Concat4(/usr/local,/,share,/nx) -+#define UsrDataDir Concat4(/usr,/,share,/nx) - #ifndef AlternateUsrDataDir - #define AlternateUsrDataDir NO - #endif ---- a/nx-X11/config/cf/site.def -+++ b/nx-X11/config/cf/site.def -@@ -69,7 +69,7 @@ - #ifdef AfterVendorCF - - #ifndef ProjectRoot --#define ProjectRoot /usr/local -+#define ProjectRoot /usr - #endif - - /* diff --git a/debian/patches/series b/debian/patches/series index e1ec9c56dd..b38d6cd732 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -2001_nx-X11_install-location.debian.patch 2002_xserver-xext_set-securitypolicy-path.debian.patch 2003_nxdialog-use-python3.patch diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4 new file mode 100644 index 0000000000..db42d3eb01 --- /dev/null +++ b/m4/ac_define_dir.m4 @@ -0,0 +1,49 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ac_define_dir.html +# =========================================================================== +# +# SYNOPSIS +# +# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) +# +# DESCRIPTION +# +# This macro sets VARNAME to the expansion of the DIR variable, taking +# care of fixing up ${prefix} and such. +# +# VARNAME is then offered as both an output variable and a C preprocessor +# symbol. +# +# Example: +# +# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Andreas Schwab +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2008 Alexandre Oliva +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AC_DEFINE_DIR], [ + prefix_NONE= + exec_prefix_NONE= + test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix +dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn +dnl refers to ${prefix}. Thus we have to use `eval' twice. + eval ac_define_dir="\"[$]$2\"" + eval ac_define_dir="\"$ac_define_dir\"" + AC_SUBST($1, "$ac_define_dir") + AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) + test "$prefix_NONE" && prefix=NONE + test "$exec_prefix_NONE" && exec_prefix=NONE +]) diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile deleted file mode 100644 index b2874c3a82..0000000000 --- a/nx-X11/Imakefile +++ /dev/null @@ -1,157 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/**************************************************************************/ - -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" - -RELEASE = XOrgReleaseString - -#ifndef OSName -#define OSName Unknown Operating System! -#endif - - SUBDIRS = include config programs - -#if HasParallelMake -#ifdef ParallelDefines - TOPPARALLELMFLAGS = TopParallelDefines -#endif -#endif - -MakeSubdirs($(SUBDIRS)) - -DependSubdirs($(SUBDIRS)) - -#define IHaveSpecialMakefileTarget - -#if !defined(Win32Architecture) || defined(mingwArchitecture) -VerifyOS:: - @echo "" - @echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")." - @echo "" -#ifdef LinuxArchitecture -VerifyOS:: - @echo Linux Distribution: LinuxDistName - @echo libc version: LinuxCLibMajorVersion"."LinuxCLibMinorVersion"."LinuxCLibTeenyVersion - @echo binutils version: `expr LinuxBinUtilsMajorVersion / 10`.`expr LinuxBinUtilsMajorVersion % 10` - @echo "" -#endif -#if defined(GccMajorVersion) && defined(GccMinorVersion) -VerifyOS:: - @echo GCC version: GccMajorVersion"."GccMinorVersion - @echo "" -#endif - -includes:: - MakeDir($(BUILDINCDIR)) - MakeDir($(BUILDBINDIR)) - -XCOMM -XCOMM Watch out!!! Make sure you do make includes after removing X11.... -XCOMM -clean:: - $(RM) -r $(BUILDINCDIR) - $(RM) -r $(BUILDLIBDIR) - $(RM) -r $(BUILDBINDIR) - - MAKE_OPTS = -f xmakefile - -World:: - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(TOPPARALLELMFLAGS) all - -Everything:: - @echo "" - @echo Rebuilding $(RELEASE) of the X Window System. - @echo "" - @date - @echo "" - -$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak - $(MAKE) $(MFLAGS) xmakefile - $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles - $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes - $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) - @echo "" - @date - @echo "" - @echo Rebuild of $(RELEASE) of the X Window System complete. - @echo "" - -XCOMM clean out link tree looking for stuff that should get checked in -dangerous_strip_clean:: - $(MAKE) -k distclean - find . -type l -exec rm {} \; - find . \( \! -type d \) -print - -#else /* not Win32Architecture else */ -VerifyOS:: - @echo : - @echo Building on OSName. - @echo : - -includes:: - MakeDir($(BUILDINCDIR:/=\)) - -XCOMM -XCOMM Watch out!!! Make sure you do make includes after removing X11.... -XCOMM -clean:: - RmTreeCmd $(BUILDINCDIR:/=\) - RmTreeCmd $(BUILDLIBDIR:/=\) - -Everything:: - @echo : - @echo Rebuilding $(RELEASE) of the X Window System. - @echo : - @echo : - RMoveToBakFile(xmakefile) - $(MAKE) $(MFLAGS) xmakefile - $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles - $(MAKE) $(MFLAGS) $(MAKE_OPTS) includes - $(MAKE) $(MFLAGS) $(MAKE_OPTS) depend - $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) - @echo : - @echo : - @echo Rebuild of $(RELEASE) of the X Window System complete. - @echo : - -#ifdef ProjectRoot -install:: - MakeDir($(PROJECTROOT:/=\)) -#endif - -install:: - MakeDir($(INCROOT:/=\)) - MakeDir($(USRLIBDIR:/=\)) - MakeDir($(LIBDIR:/=\)) - -#endif /* not Win32Architecture else */ - -XCOMM special target to determine if the xmakefile exists. -XCOMM Works on both Unix and NMAKE.EXE -xmakefile-exists:: - -#ifndef MakeManKeywords -#define MakeManKeywords YES /* install.man rebuilds "man -k" database? */ -#endif - -#ifndef MakeHtmlManIndex -#define MakeHtmlManIndex YES /* install.man generates HTML man page index */ -#endif diff --git a/nx-X11/Makefile b/nx-X11/Makefile deleted file mode 100644 index 4249a710fc..0000000000 --- a/nx-X11/Makefile +++ /dev/null @@ -1,126 +0,0 @@ -# $Xorg: Makefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ -# $Id: Makefile,v 1.5 2005/12/14 23:41:52 alanc Exp $ - - - -# $XFree86: xc/Makefile,v 3.28tsi Exp $ - -# Luna users will need to either run make as "make MAKE=make" -# or add "MAKE = make" to this file. - -RELEASE = "Release $(shell cat ../VERSION)" -SHELL = /bin/sh -RM = rm -f -MV = mv -WORLDOPTS = -WIN32WORLDOPTS = -i -TOP = . -CURRENT_DIR = . -CONFIGSRC = $(TOP)/config -IRULESRC = $(CONFIGSRC)/cf -IMAKE = imake -IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) -MAKE_OPTS = -f xmakefile -MAKE_CMD = $(MAKE) $(MAKE_OPTS) - -all: - @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial - @${MAKE} ${MAKE_OPTS} $@ - -all-initial: - @echo Please use make World, or on NT use nmake World.Win32. - @echo - @echo Read the release notes carefully before proceeding. - @echo Do not name your log file make.log or it will be deleted. - -World: BuildEnv - @echo "" - @echo Building $(RELEASE). - @echo "" - @date - @echo "" - ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World - @echo "" - @date - @echo "" - @echo Full build of $(RELEASE) complete. - @echo "" - -CleanEnv: SetupEnv - ${MAKE} ${MAKE_OPTS} -k clean - rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; - -SetupEnv: xmakefile VerifyOS Makefiles - -BuildEnv: SetupEnv BuildIncludes BuildDependsOnly - -BuildIncludes: SetupEnv includes - -BuildDependsOnly: SetupEnv depend - -Makefile:: - $(MAKE) $(MFLAGS) xmakefile -.PRECIOUS: Makefile - -xmakefile: - if [ -f xmakefile ]; then \ - set -x; \ - $(RM) xmakefile.bak; \ - $(MV) xmakefile xmakefile.bak; \ - else \ - exit 0; \ - fi - which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -# don't allow any default rules in this Makefile -.SUFFIXES: -# quiet "make" programs that display a message if suffix list empty -.SUFFIXES: .Dummy - -# a copy of every rule that might be invoked at top level - -clean: CleanEnv - -dangerous_strip_clean: xmakefile - ${MAKE} ${MAKE_OPTS} $@ - -distclean: clean - -${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - find config programs include -type f -name Makefile | while read makefile; do rm -f $$makefile; done - $(RM) xmakefile - -depend: xmakefile - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -Everything: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -external.ln: xmakefile - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -includes: xmakefile VerifyOS Makefiles - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -install.sdk: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -install.ln: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -install.man: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -install: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -Makefiles: xmakefile VerifyOS - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -man_keywords: SetupEnv - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -tags: xmakefile - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ - -VerifyOS: xmakefile - ${MAKE} ${MAKE_OPTS} ${MFLAGS} $@ diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile deleted file mode 100644 index 1cf85aac8b..0000000000 --- a/nx-X11/config/Imakefile +++ /dev/null @@ -1,20 +0,0 @@ -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" - -#undef BootstrapCleanSubdirs -#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" - -NULL = - -SUBDIRS = cf - -#if defined(XorgVersionString) \ - && defined(ProjectRoot) && \ - defined(BuildBindist) -all:: - -clean:: -#endif - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/config/cf/.gitignore b/nx-X11/config/cf/.gitignore deleted file mode 100644 index 84793355f7..0000000000 --- a/nx-X11/config/cf/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -date.def -nxversion.def diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf deleted file mode 100644 index 9d683b858f..0000000000 --- a/nx-X11/config/cf/Imake.cf +++ /dev/null @@ -1,1067 +0,0 @@ -/* - * To add support for another platform: - * - * 1. Identify a machine-specific cpp symbol. If your preprocessor - * does not have any built in, you will need to add the symbol to the - * cpp_argv table in config/imake/imakemdep.h and rebuild imake with - * the BOOTSTRAPCFLAGS variable set (see the macII for an example). - * - * 2. Add all machine-specific cpp symbols (either defined by you or by - * the preprocessor or compiler) to the predefs table in - * config/imake/imakemdep.h. - * - * 3. But a new #ifdef block below that defines MacroIncludeFile and - * MacroFile for your new platform and then #undefs the machine- - * specific preprocessor symbols (to avoid problems with file names). - * - * 4. Create a .cf file with the name given by MacroFile. - */ - -#if defined(__APPLE__) -# undef __APPLE__ -# define MacroIncludeFile -# define MacroFile darwin.cf -# define DarwinArchitecture -# ifdef __ppc__ -# define PpcDarwinArchitecture -# undef __ppc__ -# endif -# ifdef __i386__ -# define i386DarwinArchitecture -# undef __i386__ -# endif -#endif - -#if defined(clipper) || defined(__clipper__) -# undef clipper -# define MacroIncludeFile -# define MacroFile ingr.cf -# define IngrArchitecture -#endif /* clipper */ - -#ifdef __CYGWIN__ -#define MacroIncludeFile -#define MacroFile cygwin.cf -#define cygwinArchitecture -#define i386Architecture -#undef i386 -#undef i486 -#undef i586 -#undef i686 -#undef __i386__ -#undef _X86_ -#undef __CYGWIN__ -#endif /* CYGWIN */ - -#ifdef ultrix -# define MacroIncludeFile -# define MacroFile ultrix.cf -# ifdef vax -# undef vax -# define VaxArchitecture -# endif -# ifdef mips -# undef mips -# define MipsArchitecture -# define MipselArchitecture -# endif -# undef ultrix -# define UltrixArchitecture -#endif /* ultrix */ - -#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__) -# define MacroIncludeFile -# define MacroFile bsd.cf -# undef vax -# define BSDArchitecture -# define VaxArchitecture -#endif /* vax */ - -#ifdef __bsdi__ -# define MacroIncludeFile -# define MacroFile bsdi.cf -# undef __bsdi__ -# ifdef bsdi -# undef bsdi -# endif -# define BSDOSArchitecture -# if defined(__i386__) || defined(i386) -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -# undef __i386__ -# endif -# if defined(__ppc__) || defined(ppc) -# define PpcBsdArchitecture -# define PpcArchitecture -# undef ppc -# undef __ppc__ -# endif -# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc) -# define SparcBsdArchitecture -# define SparcArchitecture -# undef sparc -# undef __sparc__ -# undef __sparc_v9__ -# endif -#endif /* bsdi */ - -#ifdef __OpenBSD__ -# undef __OpenBSD__ -# undef __NetBSD__ -# define OpenBSDArchitecture -# define KOpenBSDArchitecture -# define MacroIncludeFile -# define MacroFile OpenBSD.cf -# ifdef __i386__ -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -# endif -# if defined(__sparc__) || defined(sparc) -# if !defined(__arch64__) -# define SparcArchitecture -# else -# define Sparc64Architecture -# endif -# undef sparc -# endif -# if defined(__mips__) || defined(mips) -# define MipsArchitecture -# ifdef arc -# define ArcArchitecture -# undef arc -# endif -# ifdef pmax -# define PmaxArchitecture -# undef pmax -# endif -# undef mips -# endif -# if defined(__alpha__) || defined(alpha) -# define AlphaArchitecture -# undef __alpha__ -# undef alpha -# endif -# if defined(__amd64__) || defined(__x86_64__) -# define AMD64Architecture -# undef __amd64__ -# undef __x86_64__ -# undef amd64 -# endif -# if defined(__mc68020__) || defined(mc68020) -# define Mc68020Architecture -# if defined(amiga) -# define AmigaArchitecture -# undef amiga -# endif -# if defined(hp300) -# define Hp300Architecture -# undef hp300 -# endif -# if defined(mac68k) -# define Mac68kArchitecture -# undef mac68k -# endif -# if defined(mvme68k) -# define Mvme68kArchitecture -# undef mvme68k -# endif -# if defined(sun3) -# define Sun3Architecture -# undef sun3 -# endif -# undef mc68000 -# endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ -# undef __macppc__ -# undef macppc -# endif -# ifdef __vax__ -# undef vax -# undef __vax__ -# define VaxArchitecture -# endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ -#endif /* OpenBSD */ - -/* Systems based on kernel of OpenBSD */ -#if defined(__OpenBSD_kernel__) -#define KOpenBSDArchitecture -#endif - -#ifdef __NetBSD__ -# define MacroIncludeFile -# define MacroFile NetBSD.cf -# undef __NetBSD__ -# define NetBSDArchitecture -# define KNetBSDArchitecture -# ifdef __i386__ -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -# endif -# if defined(__sparc64__) || defined(__sparc_v9__) || defined(__arch64__) -# define Sparc64Architecture -# endif -# if defined(__sparc__) || defined(sparc) -# define SparcArchitecture -# undef sparc -# if defined(__sparc_v9__) || defined(__arch64__) -# define Sparc64Architecture -# endif -# endif -# ifdef mips -# define MipsArchitecture -# define ArcArchitecture -# undef mips -# endif -# ifdef __alpha__ -# define AlphaArchitecture -# define AlphaBsdArchitecture -# undef __alpha__ -# endif -# ifdef mc68000 -# define Mc68020Architecture -# endif -# ifdef __arm32__ -# define Arm32Architecture -# undef __arm32__ -# endif -# ifdef __vax__ -# define VaxArchitecture -# undef __vax__ -# endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ -# endif -#endif /* NetBSD */ - -/* Systems based on kernel of NetBSD */ -#if defined(__NetBSD_kernel__) -#define KNetBSDArchitecture -#endif - -#ifdef __DragonFly__ -# define MacroIncludeFile -# define MacroFile DragonFly.cf -# undef __DragonFly__ -# undef __FreeBSD__ -# define DragonFlyArchitecture -# define FreeBSDArchitecture -# ifdef __i386__ -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -# endif -# ifdef __sparc64__ -# define Sparc64Architecture -# undef __sparc64__ -# endif -# ifdef __ia64__ -# define ia64Architecture -# undef __ia64__ -# endif -# ifdef __amd64__ -# define x86_64Architecture -# undef __amd64__ -# undef __x86_64__ -# endif -#endif /* __DragonFly__ */ - -#ifdef __FreeBSD__ -# define MacroIncludeFile -# define MacroFile FreeBSD.cf -# undef __FreeBSD__ -# define FreeBSDArchitecture -# define KFreeBSDArchitecture -# ifdef __i386__ -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -# endif -# ifdef __alpha__ -# define AlphaBsdArchitecture -# define AlphaArchitecture -# undef __alpha__ -# endif -# ifdef __sparc64__ -# define Sparc64Architecture -# undef __sparc64__ -# endif -# ifdef __ia64__ -# define ia64Architecture -# undef __ia64__ -# endif -# ifdef __amd64__ -# define AMD64Architecture -# undef __amd64__ -# undef __x86_64__ -# endif -# ifdef __powerpc__ -# define PpcArchitecture -# undef __powerpc__ -# endif -#endif /* __FreeBSD__ */ - -/* Systems based on kernel of FreeBSD */ -#if defined(__FreeBSD_kernel__) -#define KFreeBSDArchitecture -#endif - -#ifdef AMOEBA - /* Should be before the 'sun' entry because we may be cross-compiling */ -# define MacroIncludeFile -# define MacroFile Amoeba.cf -# if defined(i80386) || defined(__i80386__) -# undef i80386 -# define i386Architecture -# else -# if defined(mc68000) || defined(__mc68000__) -# undef mc68000 -# define Sun3Architecture -# define SunArchitecture -# else -# if defined(sparc) || defined(__sparc__) -# undef sparc -# define SparcArchitecture -# define SunArchitecture -# endif -# endif -# undef sun -# endif -#endif /* AMOEBA */ - -#ifdef sun -# define MacroIncludeFile -# define MacroFile sun.cf -# ifdef SVR4 -# undef SVR4 -# define SVR4Architecture -# endif -# ifdef sparc -# undef sparc -# define SparcArchitecture -# endif -# ifdef __sparcv9 -# undef __sparcv9 -# define Sparc64Architecture -# endif -# ifdef mc68000 -# undef mc68000 -# define Sun3Architecture -# endif -# if defined(__amd64) || defined(__x86_64) -# undef __amd64 -# undef __x86_64 -# undef amd64 -# undef i386 -# define AMD64Architecture -# endif -# ifdef i386 -# undef i386 -# define i386Architecture -# endif -# undef sun -# define SunArchitecture -#endif /* sun */ - -#ifdef __SCO__ -# define MacroIncludeFile -# define MacroFile sco5.cf -# undef __SCO__ -# undef sco -# undef USL -# undef SYSV -# undef i386 -# undef SCO -# undef SVR4 -# define i386Architecture -# define SCOArchitecture -# define i386SVR3Architecture -# define SVR3Architecture -# define i386ScoArchitecture -# define i386Sco325Architecture -# undef i386 -# undef i486 -# undef i586 -# undef i686 -# undef k6 -# undef __i386__ -# undef __i486__ -# undef __i586__ -# undef __i686__ -# undef __k6__ -# undef __i386 -# undef __i486 -# undef __i586 -# undef __i686 -# undef __k6 -# undef pentium -# undef __pentium -# undef pentiumpro -# undef __pentiumpro -#endif /* __SCO__ - SCO Open Server 5 */ - -#ifdef __UNIXWARE__ -# define MacroIncludeFile -# define MacroFile usl.cf -# undef __UNIXWARE__ -# undef USL -# undef SVR4 -# undef i386 -# undef SVR5 -# undef SYSV5 -# define SVR4Architecture -# define i386Architecture -# define USLArchitecture -# define UnixWareArchitecture -# undef i386 -# undef i486 -# undef i586 -# undef i686 -# undef k6 -# undef __i386__ -# undef __i486__ -# undef __i586__ -# undef __i686__ -# undef __k6__ -# undef __i386 -# undef __i486 -# undef __i586 -# undef __i686 -# undef __k6 -# undef pentium -# undef __pentium -# undef pentiumpro -# undef __pentiumpro -#endif /* __UNIXWARE__ */ - -#ifdef NCR -# define MacroIncludeFile -# define MacroFile ncr.cf -# undef NCR -# undef SVR4 -# undef i386 -# define SVR4Architecture -# define i386Architecture -# define NCRArchitecture -#endif /* NCR */ - -#ifdef apollo -# define MacroIncludeFile -# define MacroFile apollo.cf -# undef apollo -# define ApolloArchitecture -#endif /* apollo */ - -#ifdef sony -# define MacroIncludeFile -# define MacroFile sony.cf -# undef sony -# undef sony_news -# define SonyArchitecture -# ifdef mc68020 -# undef mc68020 -# undef mc68030 -# define Mc68020Architecture -# endif -# ifdef mips -# undef mips -# define MipsArchitecture -# endif -# ifdef __svr4 -# define SVR4Architecture -# else -# if !defined(bsd43) || defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV) -# define SonySysvArchitecture -# else -# define SonyBsdArchitecture -# endif -# endif -#endif /* sony */ - -#ifdef M4310 -# define MacroIncludeFile -# define MacroFile pegasus.cf -# undef M4310 -# define PegasusArchitecture -#endif /* M4310 */ - -#ifdef M4330 -# define MacroIncludeFile -# define MacroFile m4330.cf -# undef M4330 -# define M4330Architecture -#endif /* M4330 */ - -#ifdef macII -# define MacroIncludeFile -# define MacroFile macII.cf -# undef macII -# define MacIIArchitecture -#endif /* macII */ - -#ifdef stellar -# define MacroIncludeFile -# define MacroFile stellar.cf -# undef stellar -# define StellarArchitecture -#endif /* stellar */ - -#if defined(ibm) || defined(_IBMR2) || defined(ibm032) -# define MacroIncludeFile -# define MacroFile ibm.cf -# ifdef ibm -# undef ibm -# endif -# define IBMArchitecture -# ifdef i386 -# undef i386 -# define PS2Architecture -# endif -# ifdef ibm032 -# undef ibm032 -# define RtArchitecture -# endif -# ifdef _IBMR2 -# undef _IBMR2 -# if (DefaultOSMajorVersion < 5) -# define RsArchitecture -# else -# define PpcArchitecture -# endif -# endif -#endif /* ibm */ - -#ifdef luna -# undef luna -# define MacroIncludeFile -# define MacroFile luna.cf -# define LunaArchitecture -# ifdef mc68000 -# undef mc68000 -# define Mc68000Architecture -# else -# undef mc88000 -# define Mc88000Architecture -# endif -#endif /* luna */ - -#ifdef Mips -# define MacroIncludeFile -# define MacroFile Mips.cf -# undef Mips -# undef mips -# if defined(SYSTYPE_BSD43) || defined(BSD) || defined(BSD43) -# define MipsBsdArchitecture -# else /* BSD */ -# define MipsSysvArchitecture -# endif /* BSD */ -#endif /* Mips */ - -#ifdef MOTOROLA -# define MacroIncludeFile -# define MacroFile moto.cf -# undef MOTOROLA -# ifdef SYSV -# define MotoR3Architecture -# endif -# ifdef SVR4 -# define MotoR4Architecture -# endif -#endif /* MOTOROLA */ - -#if defined(SVR4) -# ifdef i386 -# define i386Architecture -# undef i386 -# endif -# ifdef PC98 -# define PANIX98Architecture -# undef PC98 -# endif -# define SVR4Architecture -# define MacroIncludeFile -# define MacroFile svr4.cf -# undef SVR4 -#endif /* SVR4 */ - -#ifdef SYSV -# ifdef i386 -# undef i386 -# ifdef ISC -# define i386Architecture -# define i386SVR3Architecture -# define MacroIncludeFile -# define MacroFile isc.cf -# define i386IscArchitecture -# undef ISC -# ifdef ISC202 -# define IscVersion 202 -# undef ISC202 -# else -# ifdef ISC30 -# define IscVersion 300 -# undef ISC30 -# else -# ifdef ISC40 -# define IscVersion 400 -# undef ISC40 -# else -# define IscVersion 221 -# endif /* ISC40 */ -# endif /* ISC30 */ -# endif /* ISC202 */ -# endif /* ISC */ -# ifndef MacroFile -# define i386SVR3Architecture -# define MacroIncludeFile -# define MacroFile x386.cf -# endif /* MacroFile */ -# endif /* i386 */ -#endif /* SYSV */ - -/* SYSV386 is here for backward compatibility only */ -#ifdef SYSV386 -# undef i386 -# ifdef SVR4 -# define i386Architecture -# define SVR4Architecture -# define i386SVR4Architecture -# define MacroIncludeFile -# define MacroFile svr4.cf -# undef SVR4 -# else /* ! SVR4 */ -# ifdef ISC -# define i386Architecture -# define i386SVR3Architecture -# define MacroIncludeFile -# define MacroFile isc.cf -# define i386IscArchitecture -# undef ISC -# ifdef ISC202 -# define IscVersion 202 -# undef ISC202 -# else -# ifdef ISC30 -# define IscVersion 300 -# undef ISC30 -# else -# ifdef ISC40 -# define IscVersion 400 -# undef ISC40 -# else -# define IscVersion 221 -# endif /* ISC40 */ -# endif /* ISC30 */ -# endif /* ISC202 */ -# endif /* ISC */ -# ifndef MacroFile -# define i386SVR3Architecture -# define MacroIncludeFile -# define MacroFile x386.cf -# endif /* MacroFile */ -# endif /* ! SVR4 */ -#endif /* SYSV386 */ - -#ifdef __convex__ -# define MacroIncludeFile -# define MacroFile convex.cf -# ifdef convex -# undef convex -# endif -# define ConvexArchitecture -#endif /* _convex_ */ - -#ifdef Oki -# define MacroIncludeFile -# define MacroFile Oki.cf -# undef Oki -# define i860SVR4Architecture -# define SVR4Architecture -# undef SVR4 -#endif /* Oki */ - -#if defined(WIN32) && !defined(__GNUC__) -# define MacroIncludeFile -# define MacroFile Win32.cf -# define Win32Architecture -#endif /* WIN32 */ - -#if defined(WIN32) && defined(__GNUC__) -#define MacroIncludeFile -#define MacroFile mingw.cf -#define Win32Architecture -#define mingwArchitecture -#define i386Architecture -#undef i386 -#undef i486 -#undef i586 -#undef i686 -#undef __i386__ -#undef _X86_ -#undef __MINGW32__ -#endif /* CYGWIN */ - -#if defined(linux) || defined(__GLIBC__) -# define MacroIncludeFile -# define MacroFile linux.cf -# undef linux -# ifdef __linux__ -# define LinuxArchitecture -# endif -# ifdef i386 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef i386 -XCOMM Keep cpp from replacing path elements containing i486/i586/i686 -# ifdef i486 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef i486 -# endif -# ifdef i586 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef i586 -# endif -# ifdef i686 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef i686 -# endif -# ifdef k6 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef k6 -# endif -# endif /* k6 */ -# ifdef __i386__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i386__ -# endif /* __i386__ */ -# ifdef __i486__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i486__ -# endif /* __i486__ */ -# ifdef __i586__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i586__ -# endif /* __i586__ */ -# ifdef __i686__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i686__ -# endif /* __i686__ */ -# ifdef __k6__ -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __k6__ -# endif /* __k6__ */ -# ifdef __i386 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i386 -# endif /* __i386 */ -# ifdef __i486 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i486 -# endif /* __i486 */ -# ifdef __i586 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i586 -# endif /* __i586 */ -# ifdef __i686 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __i686 -# endif /* __i686 */ -# ifdef __k6 -# ifndef i386Architecture -# define i386Architecture -# endif -# undef __k6 -# endif /* __k6 */ -/* Keep this order! s390x has also __s390__ defined */ -# if defined(__s390x__) -# define s390xArchitecture -# undef __s390x__ -# undef __s390__ -# endif -# ifdef __s390__ -# define s390Architecture -# undef __s390__ -# endif /* s390 */ -# ifdef __alpha -# define AlphaArchitecture -# undef __alpha -# endif /* __alpha */ -# ifdef __alpha__ -# ifndef AlphaArchitecture -# define AlphaArchitecture -# endif -# undef __alpha__ -# endif /* __alpha__ */ -# ifdef __arm__ -# define Arm32Architecture -# undef arm -# undef __arm -# undef __arm__ -# if defined(__ARMEB__) -# define Arm32ebArchitecture -# endif -# undef __ARMEB__ -# endif -# ifdef __aarch64__ -# define Arm64Architecture -# endif -# ifdef mc68000 -# define Mc68020Architecture -# undef mc68000 -# endif /* mc68000 */ -# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64) -# define PpcArchitecture -# undef powerpc -# endif -# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64) -# ifndef PpcArchitecture -# define PpcArchitecture -# endif -# undef __powerpc__ -# endif -# ifdef __powerpc64__ -/* Can be both BE or LE. Trust that __BYTE_ORDER__ is set. */ -# undef tmp_set_big_endian -# define tmp_set_big_endian 1 -# if defined (__BYTE_ORDER__) && defined (__ORDER_LITTLE_ENDIAN__) && defined (__ORDER_BIG_ENDIAN__) -# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define tmp_set_big_endian 0 -# endif -# endif -# if tmp_set_big_endian -# ifndef Ppc64Architecture -# define Ppc64Architecture -# endif -# else -# ifndef Ppc64LeArchitecture -# define Ppc64LeArchitecture -# endif -# endif -# undef __powerpc64__ -# undef tmp_set_big_endian -# endif -# ifdef sparc -# define SparcArchitecture -# undef sparc -# endif -# ifdef __sparc__ -# ifndef SparcArchitecture -# define SparcArchitecture -# endif -# undef __sparc__ -# endif -# ifdef ia64 -# define ia64Architecture -# undef ia64 -# endif -# ifdef __ia64__ -# ifndef ia64Architecture -# define ia64Architecture -# endif -# undef __ia64__ -# endif -# if defined(mips) || defined(__mips__) -# define MipsArchitecture -# undef mips -# undef __mips__ -# if defined(MIPSEL) || defined(_MIPSEL) -# define MipselArchitecture -# if (_MIPS_SIM == _ABI64) -# define Mips64elArchitecture -# endif -# endif -# undef MIPSEL -# undef _MIPSEL -# endif -# ifdef __hppa__ -# ifndef HPArchitecture -# define HPArchitecture -# endif -# undef __hppa__ -# endif /* __hppa__ */ -# ifdef __sh__ -# ifndef SuperHArchitecture -# define SuperHArchitecture -# endif -# ifdef __BIG_ENDIAN__ -# ifndef SuperHebArchitecture -# define SuperHebArchitecture -# endif -# endif -# undef __sh__ -# endif /* __sh__ */ -# if defined(__SH3__) || defined(__sh3__) -# ifndef SuperH3Architecture -# define SuperH3Architecture -# endif -# undef __SH3__ -# undef __sh3__ -# endif /* __SH3__ or __sh3__ */ -# ifdef __SH4__ -# ifdef __SH4_NOFPU__ -# ifndef SuperH4NOFPUArchitecture -# define SuperH4NOFPUArchitecture -# endif -# undef __SH4_NOFPU__ -# else -# ifndef SuperH4Architecture -# define SuperH4Architecture -# endif -# endif -# undef __SH4__ -# endif /* __SH4__ */ -/* for compatibility with 3.3.x */ -# ifdef PpcArchitecture -# define PowerPCArchitecture -# endif -# if defined(__s390x__) -# define s390xArchitecture -# undef __s390x__ -# endif -# if defined(__amd64__) || defined (__x86_64__) -# undef __amd64__ -# undef __x86_64__ -# define AMD64Architecture -# endif -# if defined(amd64__) || defined (x86_64__) -# undef amd64__ -# undef x86_64__ -# ifndef AMD64Architecture -# define AMD64Architecture -# endif -# endif -#endif /* linux || __GLIBC__ */ - -#ifdef __uxp__ -# define MacroIncludeFile -# define MacroFile fujitsu.cf -# define FujitsuArchitecture -# undef __uxp__ -# define UXPArchitecture -# define SVR4Architecture -# ifdef sparc -# undef sparc -# define SparcArchitecture -# endif -#endif /* __uxp__ */ - -#ifdef __sxg__ -# define MacroIncludeFile -# define MacroFile fujitsu.cf -# define FujitsuArchitecture -# undef __sxg__ -# define mc68000Architecture -#endif /* __sxg__ */ - -#ifdef _SEQUENT_ -/* undefine assignments resulting from -DSVR4 */ -# undef MacroIncludeFile -# define MacroIncludeFile -# undef MacroFile -# define MacroFile sequent.cf -# undef _SEQUENT_ -# define DynixPtxArchitecture -# define SequentArchitecture -#endif - -#if defined(_nec_ews_svr4) || defined(nec_ews_svr4) || defined(nec_ews_svr2) || defined(SX) || defined(_nec_up) || defined(_nec_ft) || defined(PC_UX) -# ifdef nec -# undef nec -# endif -# define MacroIncludeFile -# define MacroFile nec.cf -# define NecArchitecture -#endif - -#ifdef minix -#define MacroIncludeFile -#define MacroFile minix.cf -#undef minix -#define MinixArchitecture -#define i386Architecture -#endif /* minix */ - -/* Systems with GNU libc and userland */ -#if defined(__GNU__) -#define GNUArchitecture -#define MacroIncludeFile -#define MacroFile gnu.cf -#ifdef __i386__ -#define i386Architecture -#endif -#endif - -#ifdef MACH -#ifdef __GNU__ -/* Mach-based GNU system */ -#define GNUMachArchitecture -#else -#define MacroIncludeFile -#define MacroFile mach.cf -#endif -#undef MACH -#ifdef i386 -#define i386MachArchitecture -#define i386Architecture -#endif /* i386 */ -#undef i386 -#endif /* MACH */ - -/* On NetBSD, `unix' is not defined, and cpp emits a warning every time - * it sees a test using the `unix' symbol */ -#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3) -#ifdef unix -#undef unix -#endif -#endif - -#ifdef SparcArchitecture -# if defined(__sparc_v9) || defined(__arch64__) -# define Sparc64Architecture -# endif -#endif - -#ifndef MacroIncludeFile -XCOMM WARNING: Imake.cf not configured; guessing at definitions!!! -XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. -#define MacroIncludeFile -#define MacroFile generic.cf -#endif diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules deleted file mode 100644 index 4d522f9e2a..0000000000 --- a/nx-X11/config/cf/Imake.rules +++ /dev/null @@ -1,3627 +0,0 @@ -XCOMM --------------------------------------------------------------------- -XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM --------------------------------------------------------------------- - -/* - * MACHINE-INDEPENDENT RULES; DO NOT MODIFY - * - * Warning, when defining rules: make sure you do not include both a trailing - * backslash and double ampersand backslash or else you will get an extra - * backslash in the Makefile. - * - * The following macros are defined for the various templates and Imakefiles - * (for a list of the applicable make variables, see the template files): - * - * Concat (a,b) - * Concat3 (a,b,c) - * Concat4 (a,b,c,d) - * _Use (a,b) - * _UseCat (a,b,c) - * _MUse (a,b) - * _MUseCat (a,b,c) - * ProgramTargetName (target) - * HostProgramTargetName (target) - * ProgramRelinkName (target) - * RunProgram (progvar,options) - * RunProgramWithSetup (setup,progvar,options) - * RemoveFile (file) - * RemoveFiles (files) - * CenterLoadTarget (target,srclist,libs,defines) - * CenterProgramTarget (program,srclist,objlist,locallibs,syslibs) - * SentinelLinkTarget (step,program,linklist) - * SentinelProgramTarget (program,deplist,linklist) - * SentinelCplusplusProgramTarget (program,deplist,linklist) - * PurifyLinkTarget (step,program,linklist) - * PurifyProgramTarget (program,deplist,linklist) - * PurifyCplusplusProgramTarget (program,deplist,linklist) - * ProofLinkTarget (step,program,linklist) - * ProofProgramTarget (program,deplist,linklist) - * ProofCplusplusProgramTarget (program,deplist,linklist) - * ProofCleanTarget () - * RemoveTargetProgram (program) - * MakeDir (dir) - * InstallDirectory (dir) - * BuildIncludesTop (srclist) - * BuildIncludes (srclist,dstsubdir,dstupdir) - * LinkRule (program,options,objects,libraries) - * HostLinkRule (program,options,objects,libraries) - * LinkInstallRule (program,options,objects,libraries) - * NoCmpScript (target) - * NoConfigRec (target) - * NormalProgramTarget (program,objects,deplibs,locallibs,syslibs) - * SetUIDProgramTarget (program,objects,deplibs,locallibs,syslibs) - * SingleProgramTarget (program,objects,locallibs,syslibs) - * SimpleProgramTarget (program) - * ComplexProgramTarget (program) - * ComplexProgramTarget_1 (program,locallib,syslib) - * ComplexProgramTarget_2 (program,locallib,syslib) - * ComplexProgramTarget_3 (program,locallib,syslib) - * ServerTargetWithFlags (server,subdirs,objects,libs,syslibs,flags) - * ServerTarget (server,subdirs,objects,libs,syslibs) - * LibX11Links () - * MoveToBakFile (file) - * RMoveToBakFile (file) - * RanLibrary (args) - * LibraryTargetName (libname) - * LibraryTargetNameSuffix (libname,suffix) - * InstallNamedTarget (step,srcname,flags,dest,dstname) - * InstallTarget (step,file,flags,dest) - * InstallLibrary (libname,dest) - * MergeIntoInstalledLibrary (tolib,fromlib) - * InstallLibraryAlias (libname,alias,dest) - * InstallLintLibrary (libname,dest) - * InstallManPageLong (file,destdir,dest) - * InstallManPage (file,destdir) - * InstallManPageAliases (file,destdir,aliases) - * ManKeywordsTarget (manpath) - * InstallNamedNonExec (srcname,dstname,dest) - * InstallNonExecFile (file,dest) - * InstallNonExecFileNoClobber (file,dest) - * InstallNonExec (file,dest) - * InstallProgramWithFlags (program,dest,flags) - * RelinkProgram (program,objects,libs,syslibs) - * InstallProgram (program,dest) - * InstallScript (program,dest) - * InstallNamedProg (srcname,dstname,dest) - * InstallNamedProgNoClobber (srcname,dstname,dest) - * MakeFlagsToShellFlags (makeflags,shellcmd) - * MakeNamedTargetSubdir (dir,flags,subname) - * LinkConfDirectoryLong (mdir,cdir,rdir,ldir,opath,npath) - * LinkConfDirectory (mdir,cdir,rdir,ldir) - * LinkConfFileLong (cfile,lfile,opath,npath) - * LinkConfFile (cfile,lfile) - * LinkFileList (step,list,dir,sub) - * LinkVarDirectory (mdir,cdir,rdir,ldir) - * InstallMultipleDestFlags (step,list,dest,flags) - * InstallMultipleDest (step,list,dest) - * InstallMultiple (list,dest) - * InstallMultipleFlags (list,dest,flags) - * InstallMultipleMan (list,dest) - * InstallMultipleManSuffix (list,dest,suffix) - * DependDependency () - * DependTarget () - * DependTarget3 (srcs1,srcs2,srcs3) - * CleanTarget () - * TagsTarget () - * ImakeDependency (target) - * BuildMakefileTarget (notused,imakeflags) - * MakefileTarget () - * LibMkdir (dir) - * LibCleanDir (dir) - * LintLibReferences (varname,libname,libsource) - * UnsharedLibReferences (varname,libname,libsource) - * ProjectUnsharedLibReferences (varname,libname,libsource,buildlibdir) - * SharedLibDependencies (libname,libsource,revname) - * SharedDSLibDependencies (libname,libsource,revname) - * SharedLibReferences (varname,libname,libsource,revname,rev) - * SharedDSLibReferences (varname,libname,libsource,revname,rev) - * ObjectCompile (options) - * NormalLibObjCompile (options) - * NormalSharedLibObjCompile (options) - * NormalRelocLibObjCompile (options) - * LibObjCompile (dir,options) - * DebuggedLibObjCompile (options) - * ProfiledLibObjCompile (options) - * SharedLibObjCompile (options) - * NormalLibraryObjectRule () - * NormalFortranObjectRule () - * ObjectFromSpecialSource (dst,src,flags) - * SpecialObjectRule (objs,depends,options) - * SpecialCObjectRule (basename,depends,options) - * LexFile (file) - * M4File (file,includes) - * YaccFile (file,flags) - * YaccFileNoFlags (file) - * MakeLibrary (libname,objlist) - * LinkBuildLibrary (lib) - * LinkBuildSonameLibrary (lib) - * NormalLibraryTarget (libname,objlist) - * NormalLibraryTarget2 (libname,objlist1,objlist2) - * NormalLibraryTarget3 (libname,objlist1,objlist2,objlist3) - * NormalDepLibraryTarget (libname,deplist,objlist) - * UnsharedLibraryTarget (libname,objlist,down,up) - * UnsharedLibraryTarget3 (libname,objlist1,objlist2,objlist3,down,up) - * SubdirLibraryRule (objlist) - * ProfiledLibraryTarget (libname,objlist) - * DebuggedLibraryTarget (libname,objlist) - * AliasedLibraryTarget (libname,alias) - * NormalRelocatableTarget (objname,objlist) - * ProfiledRelocatableTarget (objname,objlist) - * DebuggedRelocatableTarget (objname,objlist) - * LintLibraryTarget (libname,srclist) - * NormalLintTarget (srclist) - * LintTarget () - * LinkSourceFile (src,dir) - * LinkFile (tofile,fromfile) - * MakeSubincludesForBuild (step,dir,srclist) - * LangNamedTargetSubdirs (lang,name,dirs,verb,flags,subname) - * LangNamedMakeSubdirs (lang,name,dirs) - * LangMakeSubdirs (lang,dirs) - * NamedTargetSubdirs (name,dirs,verb,flags,subname) - * NamedMakeSubdirs (name,dirs) - * MakeSubdirs (dirs) - * DependSubdirs (dirs) - * ForceSubdirs (dirs) - * InstallSubdirs (dirs) - * InstallManSubdirs (dirs) - * IncludesSubdirs (dirs) - * NamedCleanSubdirs (name,dirs) - * CleanSubdirs (dirs) - * NamedTagSubdirs (name,dirs) - * TagSubdirs (dirs) - * MakeLintSubdirs (dirs,target,subtarget) - * LintSubdirs (dirs) - * MakeLintLibSubdirs (dirs) - * MakeMakeSubdirs (dirs,target) - * MakefileSubdirs (dirs) - * CppScriptTarget (dst,src,defs,deplist) - * MakeScriptFromCpp (name,defs) - * CppFileTarget (dst,src,defs,deplist) - * CppSourceFile (dst,src,defs,deplist) - * MakeDirectories (step,dirs) - * AllTarget (depends) - * StaticLibrary (libpath,libname) - * MakeMutex (targets) - * LinkBuildModule (module,subdir) - * LinkBuildNamedModule (module,name,subdir) - * DynamicModuleTarget (module,modlist) - * InstallDynamicModule (module,dest,subdir) - * InstallDynamicNamedModule (module,instname,dest,subdir) - * LinkerRuntimeLibraryPathFlag (path) - * - * - * The following are in specific Lib.rules: - * - * SharedLibraryTarget (libname,rev,solist,down,up) - * SharedLibraryDataTarget (libname,rev,salist) - * InstallSharedLibrary (libname,rev,dest) - * InstallSharedLibraryData (libname,rev,dest) - * SharedDepModuleTarget (name,deps,solist) - * - */ - -#define NullParameter - -/* if [ -d ] or [ ! -d ] causes make to fail, define this as - */ -#ifndef DirFailPrefix -#define DirFailPrefix -#endif - -/* - * NoCmpScript - suppress clearmake build script comparison. - */ -#ifndef NoCmpScript -#if HasClearmake -#define NoCmpScript(targ) @@\ -XCOMM special target for clearmake @@\ -.NO_CMP_SCRIPT: targ -#else -#define NoCmpScript(targ) /**/ -#endif -#endif - -/* - * NoConfigRec - suppress using clearmake configuration records. - */ -#ifndef NoConfigRec -#if HasClearmake -#define NoConfigRec(targ) @@\ -XCOMM special target for clearmake @@\ -.NO_CONFIG_REC: targ -#else -#define NoConfigRec(targ) /**/ -#endif -#endif - -/* - * Concat - concatenates two strings. - */ -#ifndef Concat -#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp) -#define Concat(a,b)a##b -#else -#define Concat(a,b)a/**/b -#endif -#endif - -/* - * Concat3 - concatenates three strings. - */ -#ifndef Concat3 -#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp) -#define Concat3(a,b,c)a##b##c -#else -#define Concat3(a,b,c)a/**/b/**/c -#endif -#endif - -/* - * Concat4 - concatenates four strings. - */ -#ifndef Concat4 -#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp) -#define Concat4(a,b,c,d)a##b##c##d -#else -#define Concat4(a,b,c,d)a/**/b/**/c/**/d -#endif -#endif - -/* - * _XUse - makes a choice based on UseInstalledX11. - */ -#ifndef _XUse -# if defined(UseInstalled) || UseInstalledX11 -# define _XUse(a,b) a -# else -# define _XUse(a,b) b -# endif -#endif /* _XUse */ - -/* - * _Use - makes a choice based on UseInstalled. - */ -#ifndef _Use -# define _Use _XUse -#endif /* _Use */ - -/* - * _XUseCat - combination of _XUse and Concat. - * exists to avoid problems with some preprocessors - */ -#ifndef _XUseCat -# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp) -# if defined(UseInstalled) || UseInstalledX11 -# define _XUseCat(a,b,c) a##c -# else -# define _XUseCat(a,b,c) b##c -# endif -# else -# if defined(UseInstalled) || UseInstalledX11 -# define _XUseCat(a,b,c) a/**/c -# else -# define _XUseCat(a,b,c) b/**/c -# endif -# endif -#endif /* _XUseCat */ - -/* - * _UseCat - combination of _Use and Concat. - * exists to avoid problems with some preprocessors - */ -#ifndef _UseCat -# define _UseCat _XUseCat -#endif /* _UseCat */ - -#ifndef ProgramTargetName -#define ProgramTargetName(target)target -#endif - -#ifndef HostProgramTargetName -#define HostProgramTargetName(target)target -#endif - -#ifndef ProgramRelinkName -#define ProgramRelinkName(target)Concat(target,-relink) -#endif - -#ifndef RunProgram -#define RunProgram(progvar,options) $(progvar) options -#endif - -#ifndef RunProgramWithSetup -#define RunProgramWithSetup(setup,progvar,options) setup $(progvar) options -#endif - -#ifndef RunPerlScript -#define RunPerlScript(script,options) $(PERLENVSETUP) $(PERL) $(PERLOPTS) script options -#endif - -#ifndef RemoveFile -#define RemoveFile(file) $(RM) file -#endif /* RemoveFile */ - -#ifndef RemoveFiles -#define RemoveFiles(files) $(RM) files -#endif /* RemoveFiles */ - -#if RemoveObsoleteFiles -#define RemoveOldFile(new,old,dir) @@\ - @if [ -f new ]; then set -x; \ @@\ - RemoveFile($(DESTDIR)dir/old); \ @@\ - fi -#else -#define RemoveOldFile(new,old,dir) $(_NULLCMD_) -#endif - -/* - * CenterLoadTarget - generate rules to load files into CodeCenter - */ -#ifndef CenterLoadTarget -#if HasCodeCenter -#define CenterLoadTarget(target,srclist,libs,defines) @@\ -ProgramTargetName(target):: srclist @@\ - XCOMM load defines srclist libs -#else -#define CenterLoadTarget(target,srclist,libs,defines) /**/ -#endif -#endif /* CenterLoadTarget */ - -/* - * CenterProgramTarget - generate rules to make CodeCenter read in sources - * and objects. - */ -#ifndef CenterProgramTarget -#define CenterProgramTarget(program,srclist,objlist,locallibs,syslibs) @@\ -CenterLoadTarget(Concat(debug_,program),srclist,$(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS) $(LDPRELIBS) locallibs $(LDLIBS) syslibs,$(ALLDEFINES)) @@\ - @@\ -CenterLoadTarget(Concat(odebug_,program),objlist,$(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS) $(LDPRELIBS) locallibs $(LDLIBS) syslibs,$(ALLDEFINES)) -#endif /* CenterProgramTarget */ - -#ifndef SentinelLinkTarget -#if HasSentinel -#define SentinelLinkTarget(step,program,linklist) @@\ -ProgramTargetName(step.sentinel): @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CC) -o program.sentinel $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) -#else -#define SentinelLinkTarget(step,program,linklist) /**/ -#endif -#endif /* SentinelLinkTarget */ - -/* - * SentinelProgramTarget - generate rules to make Sentinel image - */ -#ifndef SentinelProgramTarget -#if HasSentinel -#define SentinelProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.sentinel): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean clean.sentinel:: @@\ - RemoveFile(program.sentinel) -#else -#define SentinelProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* SentinelProgramTarget */ - -/* - * SentinelCplusplusProgramTarget - generate rules to make Sentinel image - */ -#ifndef SentinelCplusplusProgramTarget -#if HasSentinel -#define SentinelCplusplusProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.sentinel): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CXXENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean clean.sentinel:: @@\ - RemoveFile(program.sentinel) -#else -#define SentinelCplusplusProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* SentinelCplusplusProgramTarget */ - -#ifndef PurifyLinkTarget -#if HasPurify -#define PurifyLinkTarget(step,program,linklist) @@\ -ProgramTargetName(step.pure): @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CC) -o program.pure $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) -#else -#define PurifyLinkTarget(step,program,linklist) /**/ -#endif -#endif /* PurifyLinkTarget */ - -/* - * PurifyProgramTarget - generate rules to make Purify'ed image - */ -#ifndef PurifyProgramTarget -#if HasPurify -#define PurifyProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.pure): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean clean.pure:: @@\ - RemoveFile(program.pure) -#else -#define PurifyProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* PurifyProgramTarget */ - -/* - * PurifyCplusplusProgramTarget - generate rules to make Purify'ed image - */ -#ifndef PurifyCplusplusProgramTarget -#if HasPurify -#define PurifyCplusplusProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.pure): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CXXENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean clean.pure:: @@\ - RemoveFile(program.pure) -#else -#define PurifyCplusplusProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* PurifyCplusplusProgramTarget */ - -#ifndef ProofLinkTarget -#if HasTestCenter -#define ProofLinkTarget(step,program,linklist) @@\ -ProgramTargetName(step.tc): @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o program.tc $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) -#else -#define ProofLinkTarget(step,program,linklist) /**/ -#endif -#endif /* ProofLinkTarget */ - -/* - * ProofProgramTarget - generate rules to make Proof'ed image - */ -#ifndef ProofProgramTarget -#if HasTestCenter -#define ProofProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.tc): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean cleantc:: @@\ - RemoveFiles(program.tc program.tc.*.*) -#else -#define ProofProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* ProofProgramTarget */ - -/* - * ProofCplusplusProgramTarget - generate rules to make Proof'ed image - */ -#ifndef ProofCplusplusProgramTarget -#if HasTestCenter -#define ProofCplusplusProgramTarget(program,deplist,linklist) @@\ -ProgramTargetName(program.tc): deplist @@\ - RemoveTargetProgram($@) @@\ - $(CXXENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ - @@\ -clean cleantc:: @@\ - RemoveFiles(program.tc program.tc.*.*) -#else -#define ProofCplusplusProgramTarget(program,deplist,linklist) /**/ -#endif -#endif /* ProofCplusplusProgramTarget */ - -#ifndef ProofCleanTarget -#if HasTestCenter -#define ProofCleanTarget() @@\ -clean cleantc:: @@\ - $(RM) -r TC.Cache -#else -#define ProofCleanTarget() /**/ -#endif -#endif /* ProofCleanTarget */ - -#ifndef RemoveTargetProgram -#if RemoveTargetProgramByMoving -#define RemoveTargetProgram(program) \ --if [ -f program ]; then RemoveFile(Concat(program,~)); $(MV) program Concat(program,~); fi -#else -#define RemoveTargetProgram(program) RemoveFile(program) -#endif -#endif /* RemoveTargetProgram */ - -#ifndef MakeDir -#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then \ @@\ - set +x; \ @@\ - else \ @@\ - if [ -h dir ]; then \ @@\ - (set -x; rm -f dir); \ @@\ - fi; \ @@\ - (set -x; $(MKDIRHIER) dir); \ @@\ - fi -#endif /* MakeDir */ - -#ifndef MakeDirInline -#define MakeDirInline(dir) if [ -d dir ]; then \ @@\ - :; \ @@\ - else \ @@\ - if [ -h dir ]; then \ @@\ - (set -x; rm -f dir); \ @@\ - fi; \ @@\ - (set -x; $(MKDIRHIER) dir); \ @@\ - fi -#endif /* MakeDirInline */ - -#ifndef InstallDirectory -#define InstallDirectory(dir) @@\ -install:: @@\ - MakeDir(dir) -#endif /* InstallDirectory */ - -#ifndef InstallCreateLink -# define InstallCreateLink(dest,from,to) @@\ -install:: @@\ - cd $(DESTDIR)dest && \ @@\ - $(LN) -sf from to -#endif - -#ifndef BuildIncludesTop -#define BuildIncludesTop(srclist) @@\ -includes:: srclist @@\ - MakeDir($(BUILDINCDIR)) @@\ - @(set -x; cd $(BUILDINCDIR) && for i in srclist; do \ @@\ - RemoveFile(`basename $$i`); \ @@\ - $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \ @@\ - done) -#endif /* BuildIncludesTop */ - -#ifndef BuildIncludes -#define BuildIncludes(srclist,dstsubdir,dstupdir) @@\ -includes:: srclist @@\ - MakeDir($(BUILDINCDIR)/dstsubdir) @@\ - @(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\ - RemoveFile(`basename $$i`); \ @@\ - $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\ - done) -#endif /* BuildIncludes */ - -/* - * LinkBuildBinary - export a binary from the build tree. - */ -#ifndef LinkBuildBinary -#define LinkBuildBinary(binary) @@\ -all:: $(BUILDBINDIR)/binary binary @@\ - @@\ -$(BUILDBINDIR)/binary: binary @@\ - MakeDir($(BUILDBINDIR)) @@\ - RemoveFile($@) @@\ - cd $(BUILDBINDIR) && $(LN) $(BUILDBINTOP)/$(CURRENT_DIR)/binary . -#endif /* LinkBuildBinary */ - -#ifndef BuildInterfaces -#define BuildInterfaces(srclist,dstsubdir,dstupdir) @@\ -interfaces:: @@\ - MakeDir($(BUILDINCDIR)/dstsubdir) @@\ - @(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\ - RemoveFile($$i); \ @@\ - $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\ - done) -#endif /* BuildInterfaces */ - -/* - * LinkRule - link a program - */ -#ifndef LinkRule -#define LinkRule(program,options,objects,libraries) \ -$(CCLINK) -o program options objects libraries $(EXTRA_LOAD_FLAGS) -#endif /* LinkRule */ - -/* - * LinkRule - link a program, suitable for later installation - */ -#ifndef LinkInstallRule -#define LinkInstallRule(program,options,objects,libraries) \ -$(CCLINK) -o program options objects libraries $(EXTRA_INSTALL_LOAD_FLAGS) -#endif /* LinkInstallRule */ - -/* - * HostLinkRule - link a utility to be used on the build host - * (differs from LinkRule if cross compiling) - */ -#ifndef HostLinkRule -#define HostLinkRule LinkRule -#endif - -#ifndef CplusplusLinkRule -#define CplusplusLinkRule(program,options,objects,libraries) \ -$(CXXLINK) -o program options objects libraries $(EXTRA_LOAD_FLAGS) -#endif /* CplusplusLinkRule */ - -/* - * NormalProgramTarget - generate rules to compile and link the indicated - * program; since it does not use any default object files, it may be used for - * multiple programs in the same Imakefile. - */ -#ifndef NormalProgramTarget -#define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\ -ProgramTargetName(program): objects deplibs @@\ - RemoveTargetProgram($@) @@\ - LinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS) syslibs) @@\ - @@\ -SentinelProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ -PurifyProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ -ProofProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* NormalProgramTarget */ - - -/* - * NormalCplusplusProgramTarget - Like NormalTargetProgram, but uses - * C++ linking rules. - */ -#ifndef NormalCplusplusProgramTarget -#define NormalCplusplusProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\ -ProgramTargetName(program): objects deplibs @@\ - RemoveTargetProgram($@) @@\ - CplusplusLinkRule($@,$(CXXLDOPTIONS),objects,locallibs $(LDLIBS) syslibs) @@\ - @@\ -SentinelCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ -PurifyCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ -ProofCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* NormalCplusplusProgramTarget */ - - -#ifndef SetUIDProgramTarget -#define SetUIDProgramTarget NormalProgramTarget -#endif - - -/* - * SingleProgramTarget - obsolete version of NormalProgramTarget that does - * not have deplibs. - */ -#ifndef SingleProgramTarget -#define SingleProgramTarget(program,objects,locallibs,syslibs) @@\ -NormalProgramTarget(program,objects,NullParameter,locallibs,syslibs) -#endif /* SingleProgramTarget */ - -/* - * SimpleProgramTarget - generate rules for compiling and linking programs - * that only have one C source file. It should only be used in Imakefiles - * that describe a single program. - */ -#ifndef SimpleProgramTarget -#define SimpleProgramTarget(program) @@\ - OBJS = program.o @@\ - SRCS = program.c @@\ - @@\ -ComplexProgramTarget(program) -#endif /* SimpleProgramTarget */ - -#ifndef SimpleProgramTarget_1 -#define SimpleProgramTarget_1(program) @@\ - OBJS1 = program.o @@\ - SRCS1 = program.c @@\ - @@\ -ComplexProgramTarget_1(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_1 */ -#ifndef SimpleProgramTarget_2 -#define SimpleProgramTarget_2(program) @@\ - OBJS2 = program.o @@\ - SRCS2 = program.c @@\ - @@\ -ComplexProgramTarget_2(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_2 */ -#ifndef SimpleProgramTarget_3 -#define SimpleProgramTarget_3(program) @@\ - OBJS3 = program.o @@\ - SRCS3 = program.c @@\ - @@\ -ComplexProgramTarget_3(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_3 */ -#ifndef SimpleProgramTarget_4 -#define SimpleProgramTarget_4(program) @@\ - OBJS4 = program.o @@\ - SRCS4 = program.c @@\ - @@\ -ComplexProgramTarget_4(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_4 */ -#ifndef SimpleProgramTarget_5 -#define SimpleProgramTarget_5(program) @@\ - OBJS5 = program.o @@\ - SRCS5 = program.c @@\ - @@\ -ComplexProgramTarget_5(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_5 */ -#ifndef SimpleProgramTarget_6 -#define SimpleProgramTarget_6(program) @@\ - OBJS6 = program.o @@\ - SRCS6 = program.c @@\ - @@\ -ComplexProgramTarget_6(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_6 */ -#ifndef SimpleProgramTarget_7 -#define SimpleProgramTarget_7(program) @@\ - OBJS7 = program.o @@\ - SRCS7 = program.c @@\ - @@\ -ComplexProgramTarget_7(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_7 */ -#ifndef SimpleProgramTarget_8 -#define SimpleProgramTarget_8(program) @@\ - OBJS8 = program.o @@\ - SRCS8 = program.c @@\ - @@\ -ComplexProgramTarget_8(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_8 */ -#ifndef SimpleProgramTarget_9 -#define SimpleProgramTarget_9(program) @@\ - OBJS9 = program.o @@\ - SRCS9 = program.c @@\ - @@\ -ComplexProgramTarget_9(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_9 */ -#ifndef SimpleProgramTarget_10 -#define SimpleProgramTarget_10(program) @@\ - OBJS10 = program.o @@\ - SRCS10 = program.c @@\ - @@\ -ComplexProgramTarget_10(program,$(LOCAL_LIBRARIES),NullParameter) -#endif /* SimpleProgramTarget_10 */ - -#ifndef SimpleCplusplusProgramTarget -#define SimpleCplusplusProgramTarget(program) @@\ - OBJS = program.o @@\ - SRCS = program.CCsuf @@\ - @@\ -ComplexCplusplusProgramTarget(program) -#endif /* SimpleCplusplusProgramTarget */ - -#ifndef ProgramTargetHelper -#define ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\ -ProgramTargetName(program): $(objs) $(deplib) @@\ - RemoveTargetProgram($@) @@\ - LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\ - @@\ -CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\ -SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ - @@\ -InstallProgram(program,$(BINDIR)) @@\ -InstallManPage(program,$(MANDIR)) -#endif /* ProgramTargetHelper */ - -#ifndef ProgramTargetHelperNoMan -#define ProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib) @@\ -ProgramTargetName(program): $(objs) $(deplib) @@\ - RemoveTargetProgram($@) @@\ - LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\ - @@\ -CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\ -SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ - @@\ -InstallProgram(program,$(BINDIR)) -#endif /* ProgramTargetHelperNoMan */ - -#ifndef CplusplusProgramTargetHelper -#define CplusplusProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\ -ProgramTargetName(program): $(objs) $(deplib) @@\ - RemoveTargetProgram($@) @@\ - CplusplusLinkRule($@,$(CXXLDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\ - @@\ -CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\ -SentinelCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -PurifyCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -ProofCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ - @@\ -InstallProgram(program,$(BINDIR)) @@\ -InstallManPage(program,$(MANDIR)) -#endif /* CplusplusProgramTargetHelper */ - -#ifndef CplusplusProgramTargetHelperNoMan -#define CplusplusProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib) @@\ -ProgramTargetName(program): $(objs) $(deplib) @@\ - RemoveTargetProgram($@) @@\ - CplusplusLinkRule($@,$(CXXLDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\ - @@\ -CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\ -SentinelCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -PurifyCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ -ProofCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\ - @@\ -InstallProgram(program,$(BINDIR)) @@ -#endif /* CplusplusProgramTargetHelperNoMan */ - -/* - * ComplexProgramTarget - generate rules for compiling and linking the - * program specified by $(OBJS) and $(SRCS), installing the program and its - * man page, and generating dependencies. It should only be used in - * Imakefiles that describe a single program. - */ -#ifndef ComplexProgramTarget -#define ComplexProgramTarget(program) @@\ - PROGRAM = ProgramTargetName(program) @@\ - @@\ -AllTarget(ProgramTargetName(program)) @@\ - @@\ -ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* ComplexProgramTarget */ - -#ifndef ComplexCplusplusProgramTarget -#define ComplexCplusplusProgramTarget(program) @@\ - PROGRAM = ProgramTargetName(program) @@\ - @@\ -AllTarget(ProgramTargetName(program)) @@\ - @@\ -CplusplusProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* ComplexCplusplusProgramTarget */ - -/* - * ComplexProgramTargetNoMan - generate rules for compiling and linking - * the program specified by $(OBJS) and $(SRCS), installing the program - * and generating dependencies. It should only be used in Imakefiles - * that describe a single program, and have no manual page. - */ -#ifndef ComplexProgramTargetNoMan -#define ComplexProgramTargetNoMan(program) @@\ - PROGRAM = ProgramTargetName(program) @@\ - @@\ -AllTarget(ProgramTargetName(program)) @@\ - @@\ -ProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* ComplexProgramTargetNoMan */ - -#ifndef ComplexCplusplusProgramTarget -#define ComplexCplusplusProgramTarget(program) @@\ - PROGRAM = program @@\ - @@\ -AllTarget(program) @@\ - @@\ -CplusplusProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) -#endif /* ComplexCplusplusProgramTarget */ - -/* - * ComplexProgramTarget_1 - generate rules for compiling and linking the - * program specified by $(OBJS1) and $(SRCS1), installing the program and its - * man page, and generating dependencies for it and any programs described - * by $(SRCS2) through $(SRCS10). It should be used to build the primary - * program in Imakefiles that describe multiple programs. - */ -#ifndef ComplexProgramTarget_1 -#define ComplexProgramTarget_1(program,locallib,syslib) @@\ - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \ @@\ - $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10) @@\ - SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) \ @@\ - $(SRCS6) $(SRCS7) $(SRCS8) $(SRCS9) $(SRCS10) @@\ - @@\ -AllTarget($(PROGRAMS)) @@\ - @@\ -ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFiles($(PROGRAMS)) -#endif /* ComplexProgramTarget_1 */ - -#ifndef ComplexCplusplusProgramTarget_1 -#define ComplexCplusplusProgramTarget_1(program,locallib,syslib) @@\ - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \ @@\ - $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10) @@\ - SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) \ @@\ - $(SRCS6) $(SRCS7) $(SRCS8) $(SRCS9) $(SRCS10) @@\ - @@\ -AllTarget($(PROGRAMS)) @@\ - @@\ -CplusplusProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)@@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFiles($(PROGRAMS)) -#endif /* ComplexCplusplusProgramTarget_1 */ - -/* - * ComplexProgramTarget_2 - generate rules for compiling and linking the - * program specified by $(OBJS2) and $(SRCS2) and installing the program and - * man page. It should be used to build the second program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_2 -#define ComplexProgramTarget_2(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib) -#endif /* ComplexProgramTarget_2 */ - -#ifndef ComplexCplusplusProgramTarget_2 -#define ComplexCplusplusProgramTarget_2(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_2 */ - -/* - * ComplexProgramTarget_3 - generate rules for compiling and linking the - * program specified by $(OBJS3) and $(SRCS3) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_3 -#define ComplexProgramTarget_3(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib) -#endif /* ComplexProgramTarget_3 */ - -#ifndef ComplexCplusplusProgramTarget_3 -#define ComplexCplusplusProgramTarget_3(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_3 */ - -/* - * ComplexProgramTarget_4 - generate rules for compiling and linking the - * program specified by $(OBJS4) and $(SRCS4) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_4 -#define ComplexProgramTarget_4(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS4,OBJS4,DEPLIBS4,locallib,syslib) -#endif /* ComplexProgramTarget_4 */ - -#ifndef ComplexCplusplusProgramTarget_4 -#define ComplexCplusplusProgramTarget_4(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS4,OBJS4,DEPLIBS4,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_4 */ - -/* - * ComplexProgramTarget_5 - generate rules for compiling and linking the - * program specified by $(OBJS5) and $(SRCS5) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_5 -#define ComplexProgramTarget_5(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS5,OBJS5,DEPLIBS5,locallib,syslib) -#endif /* ComplexProgramTarget_5 */ - -#ifndef ComplexCplusplusProgramTarget_5 -#define ComplexCplusplusProgramTarget_5(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS5,OBJS5,DEPLIBS5,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_5 */ - -/* - * ComplexProgramTarget_6 - generate rules for compiling and linking the - * program specified by $(OBJS6) and $(SRCS6) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_6 -#define ComplexProgramTarget_6(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS6,OBJS6,DEPLIBS6,locallib,syslib) -#endif /* ComplexProgramTarget_6 */ - -#ifndef ComplexCplusplusProgramTarget_6 -#define ComplexCplusplusProgramTarget_6(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS6,OBJS6,DEPLIBS6,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_6 */ - -/* - * ComplexProgramTarget_7 - generate rules for compiling and linking the - * program specified by $(OBJS7) and $(SRCS7) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_7 -#define ComplexProgramTarget_7(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS7,OBJS7,DEPLIBS7,locallib,syslib) -#endif /* ComplexProgramTarget_7 */ - -#ifndef ComplexCplusplusProgramTarget_7 -#define ComplexCplusplusProgramTarget_7(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS7,OBJS7,DEPLIBS7,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_7 */ - -/* - * ComplexProgramTarget_8 - generate rules for compiling and linking the - * program specified by $(OBJS8) and $(SRCS8) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_8 -#define ComplexProgramTarget_8(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS8,OBJS8,DEPLIBS8,locallib,syslib) -#endif /* ComplexProgramTarget_8 */ - -#ifndef ComplexCplusplusProgramTarget_8 -#define ComplexCplusplusProgramTarget_8(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS8,OBJS8,DEPLIBS8,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_8 */ - -/* - * ComplexProgramTarget_9 - generate rules for compiling and linking the - * program specified by $(OBJS9) and $(SRCS9) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_9 -#define ComplexProgramTarget_9(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS9,OBJS9,DEPLIBS9,locallib,syslib) -#endif /* ComplexProgramTarget_9 */ - -#ifndef ComplexCplusplusProgramTarget_9 -#define ComplexCplusplusProgramTarget_9(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS9,OBJS9,DEPLIBS9,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_9 */ - -/* - * ComplexProgramTarget_10 - generate rules for compiling and linking the - * program specified by $(OBJS10) and $(SRCS10) and installing the program and - * man page. It should be used to build the third program in Imakefiles - * describing more than one program. - */ -#ifndef ComplexProgramTarget_10 -#define ComplexProgramTarget_10(program,locallib,syslib) @@\ -ProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib) -#endif /* ComplexProgramTarget_10 */ - -#ifndef ComplexCplusplusProgramTarget_10 -#define ComplexCplusplusProgramTarget_10(program,locallib,syslib) @@\ -CplusplusProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib) -#endif /* ComplexCplusplusProgramTarget_10 */ - -#ifndef MoveToBakFile -#define MoveToBakFile(file) -@if [ -f file ]; then set -x; \ @@\ - $(MV) file file.bak; else exit 0; fi -#endif /* MoveToBakFile */ - -#ifndef RMoveToBakFile -#define RMoveToBakFile(file) -@if [ -f file ]; then set -x; \ @@\ - RemoveFile(file.bak); $(MV) file file.bak; \ @@\ - else exit 0; fi -#endif /* RMoveToBakFile */ - -/* - * ServerTargetWithFlags - generate rules to compile, link, and relink a server - */ -#ifndef ServerTargetWithFlags -#define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\ -AllTarget(ProgramTargetName(server)) @@\ -AllTarget(ProgramRelinkName(server)) @@\ -ProgramTargetName(server): subdirs objects libs @@\ - MoveToBakFile($@) @@\ - LinkRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ - @@\ -Concat(load,server): @@\ - MoveToBakFile(ProgramTargetName(server)) @@\ - LinkRule(ProgramTargetName(server),$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ - @@\ -loadX:: Concat(load,server) @@\ - @@\ -SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ -PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ -ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ - @@\ -RelinkProgram(ProgramTargetName(server),objects,libs,syslibs) @@\ -InstallProgramWithFlags(server,$(BINDIR),flags) @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(server)) @@\ - RemoveFile(ProgramRelinkName(server)) -#endif /* ServerTargetWithFlags */ - -/* - * ServerTarget - rules to compile, link, and relink a normal server - */ -#ifndef ServerTarget -#define ServerTarget(server,subdirs,objects,libs,syslibs) @@\ -ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_)) -#endif /* ServerTarget */ - - -/* - * Creates libX11 compat symlinks to enable execution of rpath-dependent - * programs. - */ -#ifndef LibX11Links -#define LibX11Links() @@\ -AllTarget(libX11links) @@\ -libX11links: @@\ - $(LN) libNX_X11.so $(BUILDLIBDIR)/libX11.so @@\ - $(LN) libNX_X11.so.6 $(BUILDLIBDIR)/libX11.so.6 @@\ - $(LN) libNX_X11.so.6.3.0 $(BUILDLIBDIR)/libX11.so.6.3.0 @@\ - touch libX11links @@\ - @@\ -clean:: @@\ - RemoveFile($(BUILDLIBDIR)/libX11.so) @@\ - RemoveFile($(BUILDLIBDIR)/libX11.so.6) @@\ - RemoveFile($(BUILDLIBDIR)/libX11.so.6.3.0) @@\ - RemoveFile(libX11links) -#endif /* LibX11Links */ - - -#if DoRanlibCmd -#define RanLibrary(args) $(RANLIB) args -#else -#define RanLibrary(args) $(_NULLCMD_) -#endif - -#ifndef LibraryTargetName -#define LibraryTargetName(libname)Concat(lib,libname.a) -#endif - -/* This rule is used for libs in Xserver/Imakefile which are loaded, not - * linked into the core module. Since modules are called libXXXX.a, - * this rule mustn't be overridden by .cf files. - */ -#ifndef ModuleLibraryTargetName -#define ModuleLibraryTargetName(libname)Concat(lib,libname.a) -#endif - -#ifndef LibraryTargetNameSuffix -#define LibraryTargetNameSuffix(libname,suffix)Concat3(lib,libname,suffix.a) -#endif - -#ifndef InstallNamedInline -#define InstallNamedInline(srcname,flags,dest,dstname) $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname -#endif - -#ifndef InstallNamedTarget -#define InstallNamedTarget(step,srcname,flags,dest,dstname) @@\ -step:: srcname @@\ - MakeDir($(DESTDIR)dest) @@\ - InstallNamedInline(srcname,flags,dest,dstname) -#endif /* InstallNamedTarget */ - -/* - * InstallNamedTargetNoClobber - Like InstallNamedTarget, but doesn't - * do the install if an installed version already exists. Useful - * for files that might have local customizations that you don't - * want to clobber. Config files are good candidates for this. - */ -#ifndef InstallNamedTargetNoClobber -#define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname) @@\ -step:: srcname @@\ - MakeDir($(DESTDIR)dest) @@\ - @if [ -f $(DESTDIR)dest/dstname ]; then \ @@\ - echo "Not overwriting existing" $(DESTDIR)dest/dstname; \ @@\ - else set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname; fi -#endif /* InstallNamedTargetNoClobber */ - -#ifndef InstallTarget -#define InstallTarget(step,file,flags,dest) @@\ -InstallNamedTarget(step,file,flags,dest,file) -#endif /* InstallTarget */ - -#ifndef InstallInline -#define InstallInline(file,flags,dest) InstallNamedInline(file,flags,dest,file) -#endif - -/* - * InstallLibrary - generate rules to install the indicated library. - */ -#ifndef InstallLibrary -#define InstallLibrary(libname,dest) @@\ -install:: LibraryTargetName(libname) @@\ - MakeDir($(DESTDIR)dest) @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\ - RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname)) -#endif /* InstallLibrary */ - - -/* - * InstallDriverSDKLibrary - rule to install Driver SDK library. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKLibrary -#define InstallDriverSDKLibrary(lib,dir) -#endif - - -/* - * InstallDriverSDKNamedLibrary - rule to install Driver SDK library. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKNamedLibrary -#define InstallDriverSDKNamedLibrary(lib,dlib,dir) -#endif - - -/* - * InstallDriverSDKLibraryModule - rule to install Driver SDK library module. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKLibraryModule -#define InstallDriverSDKLibraryModule(lib,dlib,dir) -#endif - - -/* - * MergeIntoInstalledLibrary - generate rules to merge one library into another - */ -#ifndef MergeIntoInstalledLibrary -#define MergeIntoInstalledLibrary(tolib,fromlib) @@\ -install:: fromlib @@\ - $(SCRIPTSRC)/mergelib $(DESTDIR)tolib fromlib -#endif /* MergeIntoInstalledLibrary */ - -/* - * InstallLibraryAlias - generate rules to create a link from one library name - * to another for the purposes of aliasing. - */ -#ifndef InstallLibraryAlias -#define InstallLibraryAlias(libname,alias,dest) @@\ -install:: @@\ - -(cd $(DESTDIR)dest && ( \ @@\ - RemoveFile(LibraryTargetName(alias)); \ @@\ - $(LN) LibraryTargetName(libname) LibraryTargetName(alias))) -#endif /* InstallLibraryAlias */ - - -/* - * InstallLintLibrary - generate rules to install the indicated lint library. - */ -#ifndef InstallLintLibrary -#define InstallLintLibrary(libname,dest) @@\ -InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest) -#endif /* InstallLintLibrary */ - - -#if !CompressManPages -/* - * InstallManPageLong - generate rules to install the indicated manual page, - * giving it an alternate name. This is used for installing man pages whose - * base name without the .man suffix would normally be longer than 8 characters - * (the limit for using source code control systems on files systems with - * short file names). - */ -#ifndef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) @@\ -BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ - @@\ -CppManTarget(file,$(EXTRAMANDEFS)) @@\ - @@\ -InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) -#endif /* InstallManPageLong */ - - -/* - * InstallManPageAliases - generate rules to install manual page aliases. - */ -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ - @@\ -install.man:: @@\ - @(TMP="#tmp.$$$$"; \ @@\ - RemoveFile($${TMP}); \ @@\ - echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\ - done; \ @@\ - RemoveFile($${TMP})) -#endif /* InstallManPageAliases */ - - -/* - * InstallGenManPageLong - More general rules for installing manual pages -- - * doesn't assume MANSUFFIX. - */ -#ifndef InstallGenManPageLong -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -BuildInstallHtmlManPage(file,dest,suffix) @@\ - @@\ -CppManTarget(file, $(EXTRAMANDEFS)) @@\ - @@\ -install.man:: file.$(MANNEWSUFFIX) @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ - $(DESTDIR)destdir/dest.suffix -#endif /* InstallGenManPageLong */ - - -/* - * InstallGenManPageAliases - general equivalent of InstallManPageAliases - */ -#ifndef InstallGenManPageAliases -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,suffix) @@\ - @@\ -install.man:: @@\ - @(TMP="#tmp.$$$$"; \ @@\ - RemoveFile($${TMP}); \ @@\ - echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\ - done; \ @@\ - RemoveFile($${TMP})) -#endif /* InstallGenManPageAliases */ - -#else /* CompressManPages */ - -#ifndef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) @@\ -BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ - @@\ -CppManTarget(file, $(EXTRAMANDEFS)) @@\ - @@\ -install.man:: file.$(MANNEWSUFFIX) @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ - $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) -#endif - -#ifndef InstallGenManPageLong -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -BuildInstallHtmlManPage(file,dest,suffix) @@\ - @@\ -CppManTarget(file, $(EXTRAMANDEFS)) @@\ - @@\ -install.man:: file.$(MANNEWSUFFIX) @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ - $(DESTDIR)destdir/dest.suffix @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix -#endif - -#ifndef InstallMultipleMan -#define InstallMultipleMan(list,dest) @@\ -install.man:: list @@\ - MakeDir($(DESTDIR)dest) @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ - set -x; \ @@\ - $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ - $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ - $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ - done -#endif - -/* - * InstallManPageAliases - install soft links for aliases. - */ -#ifndef InstallManPageAliasesBase -#define InstallManPageAliasesBase(file,destdir,aliases) @@\ -install.man:: @@\ - @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ - (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ - $$i.$${SUFFIX})); \ @@\ - done) -#endif - -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif - - -/* - * InstallGenManPageAliases - install soft links for aliases. - */ -#ifndef InstallGenManPageAliases -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,suffix) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif - -#endif /* CompressManPages */ - - -/* - * InstallManPage - generate rules to install the indicated manual page. - */ -#ifndef InstallManPage -#define InstallManPage(file,destdir) @@\ -InstallManPageLong(file,destdir,file) -#endif /* InstallManPage */ - - -/* - * InstallGenManPage - general equivalent of InstallManPage - */ -#ifndef InstallGenManPage -#define InstallGenManPage(file,destdir,suffix) @@\ -InstallGenManPageLong(file,destdir,file,suffix) -#endif /* InstallGenManPage */ - - -/* - * RmanDependency - generate rules to build the rman program if - * this Imakefile is within the source tree. - */ -#ifndef RmanDependency -#ifdef UseInstalled -#define RmanDependency() /**/ -#else -#define RmanDependency() @@\ -NoCmpScript(ProgramTargetName($(RMAN))) @@\ - @@\ -ProgramTargetName($(RMAN)): @@\ - @echo "checking $(RMANBASENAME) over in $(TOP)/config/util first..."; \ @@\ - cd $(TOP)/config/util && $(MAKE) rmanonly; \ @@\ - echo "okay, continuing in $(CURRENT_DIR)" - -#endif /* UseInstalled */ -#endif /* RmanDependency */ - -#ifndef RmanCmdDependency -#ifdef UseInstalled -#define RmanCmdDependency /**/ -#else -#define RmanCmdDependency ProgramTargetName($(RMAN)) -#endif -#endif - -#ifndef BuildInstallHtmlManPage -#if BuildHtmlManPages -#define BuildInstallHtmlManPage(file,dest,suffix) @@\ -AllTarget(dest.suffix.html) @@\ - @@\ -dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ - RemoveFiles(dest.suffix.html dest.suffix-html) @@\ - RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ - > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ - @@\ -install.man:: dest.suffix.html @@\ - MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ - @(SUF=`expr suffix \: '\(.\)'`; \ @@\ - set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html) @@\ - @@\ -clean:: @@\ - RemoveFiles(dest.suffix.html dest.suffix-html) -#else -#define BuildInstallHtmlManPage(file,dest,suffix) /**/ -#endif -#endif - -#ifndef InstallHtmlManPageAliases -#if BuildHtmlManPages -#define InstallHtmlManPageAliases(file,aliases,suffix) @@\ -install.man:: file.suffix.html @@\ - MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ - @SUF=`expr suffix \: '\(.\)'`; \ @@\ - for i in aliases; do (set -x; \ @@\ - RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\ - (cd $(DESTDIR)$(DOCHTMLDIR); \ @@\ - $(LN) file.$$SUF.html $$i.$$SUF.html)); \ @@\ - done -#else -#define InstallHtmlManPageAliases(file,aliases,suffix) /**/ -#endif -#endif - -#ifndef HtmlManIndex -#if BuildHtmlManPages -#define HtmlManIndex @@\ -html_index:: @@\ - MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ - $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) -#else -#define HtmlManIndex html_index:: -#endif -#endif - - -/* - * ManKeywordsTarget - generate the database used by "man -k". - * This rule updates the index in the directory "manpath", which - * indexes all the manual pages in the section subdirectories under - * it. An update command is defined only on systems that have a - * per MANPATH element index. If the OS supports only one system-wide - * database, we don't update it, because then we can't do cross - * installations or use a non-empty DESTDIR for testing. - */ -#ifndef ManKeywordsTarget -#define ManKeywordsTarget(manpath) man_keywords:: -#endif - -/* - * InstallNamedNonExec - generate rules to install a data file - */ -#ifndef InstallNamedNonExec -#define InstallNamedNonExec(srcname,dstname,dest) @@\ -InstallNamedTarget(install,srcname,$(INSTDATFLAGS),dest,dstname) -#endif /* InstallNamedNonExec */ - - -/* - * InstallDriverSDKNamedNonExec - rule for installing server Driver SDK files. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKNamedNonExec -#define InstallDriverSDKNamedNonExec(srcname,dstname,dest) -#endif - - -/* - * InstallNonExecFile - generate rules to install a data file - */ -#ifndef InstallNonExecFile -#define InstallNonExecFile(file,dest) @@\ -InstallTarget(install,file,$(INSTDATFLAGS),dest) -#endif /* InstallNonExecFile */ - - -/* - * InstallNonExecFileNoClobber - install a data file once - */ -#ifndef InstallNonExecFileNoClobber -#define InstallNonExecFileNoClobber(file,dest) @@\ -InstallNamedTargetNoClobber(install,file,$(INSTDATFLAGS),dest,file) -#endif /* InstallNonExecFileNoClobber */ - - -/* - * InstallDriverSDKNonExecFile - rule for installing server Driver SDK files. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKNonExecFile -#define InstallDriverSDKNonExecFile(file,dir) -#endif - - -/* - * InstallNonExec - generate rules to install a data file, but does not - * try to create the destination directory (deprecated) - */ -#ifndef InstallNonExec -#define InstallNonExec(file,dest) @@\ -install:: file @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) file $(DESTDIR)dest -#endif /* InstallNonExec */ - - -/* - * RelinkProgram - relinks an executable program in preparation of installation - */ -#ifndef RelinkProgram -#define RelinkProgram(program,objects,libs,syslibs) @@\ -ProgramRelinkName(program): program @@\ - MoveToBakFile($@) @@\ - LinkInstallRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) -#endif /* RelinkProgram */ - - -/* - * InstallProgramWithFlags - generate rules to install an executable program - * using given install flags. - */ -#ifndef InstallProgramWithFlags -#if StripInstalledPrograms && CrossCompiling -#define InstallProgramWithFlags(program,dest,flags) @@\ -InstallTarget(install,ProgramRelinkName(program),$(INSTPGMFLAGS) flags,dest) @@\ - CrossStripCmd $(DESTDIR)dest/ProgramTargetName(program) -#else -#define InstallProgramWithFlags(program,dest,flags) @@\ -InstallTarget(install,ProgramRelinkName(program),$(INSTPGMFLAGS) flags,dest) -#endif /* StripInstalledPrograms && CrossCompiling */ -#endif /* InstallProgramWithFlags */ - - -/* - * InstallProgram - generate rules to install an executable program using any - * special install flags set in $(INSTALLFLAGS). - */ -#ifndef InstallProgram -#define InstallProgram(program,dest) @@\ -InstallProgramWithFlags(program,dest,NullParameter) -#endif /* InstallProgram */ - - - -/* - * InstallScript - install a shell script. - */ -#ifndef InstallScript -#define InstallScript(program,dest) @@\ -InstallNamedTarget(install,program.script,$(INSTBINFLAGS),dest,program) -#endif /* InstallScript */ - - -/* - * InstallNamedProg - install a program with renaming and no stripping. - */ -#ifndef InstallNamedProg -#define InstallNamedProg(srcname,dstname,dest) @@\ -InstallNamedTarget(install,srcname,$(INSTBINFLAGS),dest,dstname) -#endif /* InstallNamedProg */ - - -/* - * InstallNamedProgNoClobber - Like InstallNamedProg, but doesn't - * do the install if an installed version already exists. - */ -#ifndef InstallNamedProgNoClobber -#define InstallNamedProgNoClobber(srcname,dstname,dest) @@\ -InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname) -#endif /* InstallNamedProgNoClobber */ - - -/* - * InstallDriverSDKNamedProg - rule for installing server Driver SDK files. - * (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKNamedProg -#define InstallDriverSDKNamedProg(srcname,dstname,dest) -#endif - - -/* - * MakeFlagsToShellFlags - set variables before starting a loop. - * makeflags is the set of "make" flags to check. - * shellcmd is the shell command to execute if any of the flags are set. - * - * The usual use of this rule is to translate make's "don't quit on error" - * flags into the equivalent for the shell. To do this, "make -i" always - * becomes "set +e". "make -k" should also turn on "set +e" if the target - * is building subdirectories. That is, subdirectories are independent - * and should appear to be multiple targets, even though they are - * implemented in a loop in a single target. - */ -#ifndef MakeFlagsToShellFlags -#define MakeFlagsToShellFlags(makeflags,shellcmd)\ - for flag in ${MAKEFLAGS} ''; do \ @@\ - case "$$flag" in *=*) ;; --*) ;; *[makeflags]*) shellcmd;; esac; done -#endif - -/* - * MakeNamedTargetSubdir - do make in a subdir. - */ -#ifndef MakeNamedTargetSubdir -#define MakeNamedTargetSubdir(dir,flags,subname)\ - (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ - flags subname) -#endif - -/* - * LinkFileList - link a list of files from one place to another - */ -#ifndef LinkFileList -#define LinkFileList(step,list,dir,sub) @@\ -step:: @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - echo " cd" dir; cd dir && \ @@\ - for i in list; do (set -x; $(LN) -f sub/$$i .); done -#endif - - -/* - * LinkConfDirectoryLong - * - * Make links from opath (usually /lib/X11) to npath - * For example /usr/X11R6/lib/X11/xdm ==> /etc/X11/xdm so that X - * binaries can be mounted from a read-only volume like a CD-ROM; - * but files that may need to be edited can be stored locally on - * read-write media. If someone has an existing installation, be - * careful and move existing files to the new location in /etc. - * XXX Need to make the installation script do this when installing - * binary distributions. - * - * Since the link is used in the installation process, we need to - * make the link relative in order to honor $(DESTDIR) if it is set. - * - * Note: The sed script used here is not completely general. It assumes - * that no elements of the path are '..', and that none start with '.' - * that aren't just '.'. - * - * For a more general solution $(REVPATH) could be used. Even though - * it was intended for something a little different, it does do what is - * required here. - * - */ -#ifndef LinkConfDirectoryLong -#if UseSeparateConfDir && HasSymLinks -#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) @@\ -install:: @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - if [ -h Concat($(DESTDIR),npath/mdir) ]; then \ @@\ - $(RM) Concat($(DESTDIR),npath/mdir); \ @@\ - fi @@\ - MakeDir(Concat($(DESTDIR),opath/cdir)) @@\ - MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ - RELPATH=`echo opath/cdir | \ @@\ - sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ - cd Concat($(DESTDIR),opath/cdir); \ @@\ - if [ -d rdir -a ! -h rdir ]; then \ @@\ - (cd rdir; tar cf - . | \ @@\ - (cd Concat($(DESTDIR),npath/mdir); \ @@\ - tar xf -; exit 0); exit 0); \ @@\ - fi; \ @@\ - $(RM) -r rdir; \ @@\ - $(LN) Concat($${RELPATH},npath/mdir) ldir; \ @@\ - fi -#else -#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) -#endif -#endif - -#ifndef LinkConfDirectory -#define LinkConfDirectory(mdir,cdir,rdir,ldir) LinkConfDirectoryLong(mdir,cdir,rdir,ldir,$(LIBDIR),$(CONFDIR)) -#endif - -#ifndef LinkVarDirectory -#define LinkVarDirectory(mdir,cdir,rdir,ldir) LinkConfDirectoryLong(mdir,cdir,rdir,ldir,$(LIBDIR),$(VARDIR)) -#endif - -/* - * LinkConfFileLong - * - * Make links from opath (/lib/X11) to npath - * For example /usr/X11R6/lib/X11/xxx ==> /etc/X11/xxx so that X binaries - * can be mounted from a read-only volume like a CD-ROM; - * but files that may need to be edited can be stored locally on - * read-write media. If someone has an existing installation, be - * careful and move existing files to the new location in /etc. - * XXX Need to make the installation script do this when installing - * binary distributions. - * - * Since the link is used in the installation process, we need to - * make the link relative in order to honor $(DESTDIR) if it is set. - */ -#ifndef LinkConfFileLong -#if UseSeparateConfDir && HasSymLinks -#define LinkConfFileLong(cfile,lfile,opath,npath) @@\ -install:: @@\ - MakeDir(Concat($(DESTDIR),opath)) @@\ - MakeDir(Concat($(DESTDIR),npath)) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ - RELPATH=`echo opath | \ @@\ - sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ - cd Concat($(DESTDIR),opath); \ @@\ - if [ -f lfile -a ! -h lfile ]; then \ @@\ - cp -p lfile Concat($(DESTDIR),npath/cfile); \ @@\ - fi; \ @@\ - $(RM) -r lfile; \ @@\ - $(LN) Concat($${RELPATH},npath/cfile) lfile; \ @@\ - fi -#else -#define LinkConfFileLong(cfile,lfile,opath,npath) -#endif -#endif - - -#ifndef LinkConfFile -#define LinkConfFile(cfile,lfile) LinkConfFileLong(cfile,lfile,$(LIBDIR),$(CONFDIR)) -#endif - -/* - * InstallMultipleDestFlags - generate rules to install multiple files at - * once during a particular step in the build using a specific set of install - * flags. - */ -#ifndef InstallMultipleDestFlags -#define InstallMultipleDestFlags(step,list,dest,flags) @@\ -step:: list @@\ - MakeDir($(DESTDIR)dest) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - for i in list; do \ @@\ - (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \ @@\ - done -#endif /* InstallMultipleDestFlags */ - - -/* - * InstallDriverSDKMultipleDestFlags - rule for installing server Driver SDK - * files. (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKMultipleDestFlags -#define InstallDriverSDKMultipleDestFlags(list,dest,flags) -#endif - - -/* - * InstallMultipleDest - generate rules to install multiple files at once - * during a particular step in the build using any install flags set in - * $(INSTDATFLAGS). - */ -#ifndef InstallMultipleDest -#define InstallMultipleDest(step,list,dest) @@\ -InstallMultipleDestFlags(step,list,dest,$(INSTDATFLAGS)) -#endif /* InstallMultipleDest */ - -/* - * InstallMultiple - generate rules to install multiple files at once - * during the install step of the build using any install flags set in - * $(INSTALLFLAGS). - */ -#ifndef InstallMultiple -#define InstallMultiple(list,dest) @@\ -InstallMultipleDest(install,list,dest) -#endif /* InstallMultiple */ - - -/* - * InstallMultipleFlags - generate rules to install multiple files at once - * during the install step of the build using the given install flags. - */ -#ifndef InstallMultipleFlags -#define InstallMultipleFlags(list,dest,flags) @@\ -InstallMultipleDestFlags(install,list,dest,flags) -#endif /* InstallMultipleFlags */ - - -/* - * InstallMultipleMan - generate rules to install a variety of manual pages - * during the install.man step of the build. - */ -#ifndef InstallMultipleMan -#define InstallMultipleMan(list,dest) @@\ -InstallMultipleDestFlags(install.man,list,dest,$(INSTMANFLAGS)) -#endif /* InstallMultipleMan */ - -/* - * InstallMultipleManSuffix - generate rules to install multiple manual - * pages dufing the install.man step of the build, where - * the target files have the suffix given. - */ -#ifndef InstallMultipleManSuffix -#define InstallMultipleManSuffix(list,dest,suffix) @@\ -install.man:: @@\ - MakeDir($(DESTDIR)dest) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - for i in list; do \ @@\ - (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix $(DESTDIR)dest/$$i.$(MANSUFFIX)); \ @@\ - done -#endif /* InstallMultipleManSuffix */ - - -/* - * IncludeMakefile - rule to include another Makefile. - * Must not generate an error or even a warning if the named file - * is not present, since we use this to include Makefile.dep, which - * may not be built yet. - * This is defined non-null iff HasMakefileSafeInclude is YES. - * The double-@ is to ensure no leading spaces on the line. - */ -#ifndef IncludeMakefile -#if HasClearmake -#define IncludeMakefile(file) @@sinclude file -#else -#if HasBsdMake -#define IncludeMakefile(file) @@# dependencies are in .depend -#else -#define IncludeMakefile(file) /**/ -#endif -#endif -#endif - -/* - * DependDependencyStatement - Used by DependDependency to set up the - * most specific dependency, which differs based on whether we support - * a separate Makefile.dep on this platform. - */ -#ifndef DependDependencyStatement -#if HasMakefileSafeInclude -#define DependDependencyStatement() @@\ -DependFileName:: ProgramTargetName($(DEPEND)) -#else -#define DependDependencyStatement() @@\ -depend:: ProgramTargetName($(DEPEND)) -#endif -#endif - -/* - * DependDependency - generate rules to build the makedepend program if - * this Imakefile is within the source tree. - */ -#ifndef DependDependency -#ifdef UseInstalled -#define DependDependency() /**/ -#else -#define DependDependency() @@\ -DependDependencyStatement() @@\ - @@\ -NoCmpScript(ProgramTargetName($(DEPEND))) @@\ - @@\ -ProgramTargetName($(DEPEND)): @@\ - echo "using system-wide depend, continuing in $(CURRENT_DIR)" - -#endif /* UseInstalled */ -#endif /* DependDependency */ - - -/* - * DependTarget - generate rules to compute dependencies for all files listed - * in $(SRCS). - */ -#ifndef DependTarget -#if HasMakefileSafeInclude -#define DependTarget() @@\ -DependDependency() @@\ - @@\ -depend:: DependFileName @@\ - @@\ -DependFileName:: @@\ - RemoveFile($@) @@\ - RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) > $@ -#else /* HasMakefileSafeInclude */ -#define DependTarget() @@\ -DependDependency() @@\ - @@\ -depend:: @@\ - RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) -#endif /* HasMakefileSafeInclude else */ -#endif /* DependTarget */ - -/* - * DependTarget3 - generate rules to compute dependencies for all files given. - */ -#ifndef DependTarget3 -#if HasMakefileSafeInclude -#define DependTarget3(srcs1,srcs2,srcs3) @@\ -DependDependency() @@\ - @@\ -depend:: DependFileName @@\ - @@\ -DependFileName:: @@\ - RemoveFile($@) @@\ - RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1) > $@ @@\ - RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2) >> $@ @@\ - RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3) >> $@ -#else /* HasMakefileSafeInclude */ -#define DependTarget3(srcs1,srcs2,srcs3) @@\ -DependDependency() @@\ - @@\ -depend:: @@\ - RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1) @@\ - RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2) @@\ - RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3) -#endif /* HasMakefileSafeInclude else */ -#endif /* DependTarget3 */ - - -/* - * CleanTarget - generate rules to remove any garbage files - */ -#ifndef CleanTarget -#define CleanTarget() @@\ -clean:: @@\ - $(RM) FilesToClean ExtraFilesToClean DocFilesToClean "#"* @@\ - @@\ -ProofCleanTarget() -#endif /* CleanTarget */ - - -/* - * TagsTarget - generate rules to compute tags files for C source code. - */ -#ifndef TagsTarget -#define TagsTarget() @@\ -tags:: @@\ - $(TAGS) -w *.[ch] @@\ - $(TAGS) -xw *.[ch] > TAGS -#endif /* TagsTarget */ - - -/* - * ImakeDependency - generate rules to compile imake if this Imakefile is - * within the source tree. - */ -#ifndef ImakeDependency -#ifdef UseInstalled -#define ImakeDependency(target) /**/ -#else -#define ImakeDependency(target) @@\ -target:: ProgramTargetName($(IMAKE)) @@\ - @@\ -NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf) @@\ - @@\ -ProgramTargetName($(IMAKE)) $(IMAKE).Osuf: @@\ - echo "using system-wide imake, continuing in $(CURRENT_DIR)" -#endif /* UseInstalled */ -#endif /* ImakeDependency */ - - -/* - * BuildMakefileTarget - generate rules to build a Makefile from an Imakefile - * and any special imake flags. This is generally done automatically by the - * template or by any special Imakefiles. The first argument exists just - * because imakeflags is usually empty and some preprocessors will complain - * if an empty argument is passed as the sole argument to a macro. - */ -#ifndef BuildMakefileTarget -#define BuildMakefileTarget(notused,imakeflags) @@\ -ImakeDependency(Makefile) @@\ - @@\ -Makefile:: @@\ - RMoveToBakFile(Makefile) @@\ - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags - -#endif /* BuildMakefileTarget */ - - -/* - * MakefileTarget - generate rules to build a normal Makefile. - */ -#ifndef MakefileTarget -#define MakefileTarget() @@\ -BuildMakefileTarget(Imakefile,NullParameter) -#endif /* MakefileTarget */ - - -/* - * LibMkdir - helper for creating library object subdirectories - */ -#ifndef LibMkdir -#define LibMkdir(dir) DirFailPrefix@if [ -d dir ]; then exit 0; else set -x; mkdir dir; fi -#endif - -#ifndef LibMkdirLinkSubdirs -#define LibMkdirLinkSubdirs(dir) DirFailPrefix@if [ -d dir ]; then \ @@\ - exit 0; \ @@\ - else \ @@\ - echo "mkdir dir"; mkdir dir; \ @@\ - for i in $(SUBDIRS); do \ @@\ - j=`echo "$$i" | sed -e 's;[^/]\{1,\};..;g'`; \ @@\ - if [ ! -d "dir/`dirname $$i`" ]; then \ @@\ - $(MKDIRHIER) "dir/`dirname $$i`"; \ @@\ - fi; \ @@\ - echo $(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\ - $(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\ - done; \ @@\ - fi -#endif - -/* - * LibCleanDir - helper for cleaning library object subdirectories - */ -#ifndef LibCleanDir -#define LibCleanDir(dir) -@if [ -d dir ]; then \ @@\ - set -x; $(RM) -r dir; else exit 0; fi -#endif - -/* - * LintLibReferences - variables for lint libraries - */ -#ifndef LintLibReferences -#define LintLibReferences(varname,libname,libsource) @@\ -Concat(LINT,varname) = _UseCat($(LINTLIBDIR)/llib-l,libsource/llib-,libname.ln) -#endif - - -/* - * UnsharedLibReferences - variables for unshared libraries - */ -#ifndef UnsharedLibReferences -#define UnsharedLibReferences(varname,libname,libsource) @@\ -ProjectUnsharedLibReferences(varname,libname,libsource,$(BUILDLIBDIR)) -#endif - -/* - * ProjectUnsharedLibReferences - variables for unshared libraries - */ -#ifndef ProjectUnsharedLibReferences -#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ -Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -LintLibReferences(varname,libname,libsource) -#endif - -/* - * SharedLibDependencies - shared library dependencies - */ -#ifndef SharedLibDependencies -#define SharedLibDependencies(libname,libsource,revname) /**/ -#endif - -/* - * SharedDSLibDependencies - shared library dependencies with data separation - */ -#ifndef SharedDSLibDependencies -#define SharedDSLibDependencies(libname,libsource,revname) /**/ -#endif - -/* - * SharedLibReferences - variables for shared libraries - */ -#ifndef SharedLibReferences -#define SharedLibReferences(varname,libname,libsource,revname,rev) @@\ -revname = rev @@\ -Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\ -Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -LintLibReferences(varname,libname,libsource) -#endif - -/* - * SharedDSLibReferences - variables for shared libraries with data separation - */ -#ifndef SharedDSLibReferences -#define SharedDSLibReferences(varname,libname,libsource,revname,rev) @@\ -revname = rev @@\ -Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\ -Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -LintLibReferences(varname,libname,libsource) -#endif - -/* - * CPPOnlyCompile - run C compiler's preprocessor only - */ -#ifndef CPPOnlyCompile -#define CPPOnlyCompile(src,options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CC) -E $(CFLAGS) options src > $@ -#endif - -/* - * ObjectCompile - compile fragment for a normal object file - */ -#ifndef ObjectCompile -#define ObjectCompile(options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CC) -c $(CFLAGS) options $*.c -#endif - -/* - * CompileCToAsm - compile C file to assembler - */ -#ifndef CompileCToAsm -#define CompileCToAsm(options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CC) -S $(CFLAGS) options $*.c -#endif - - -/* - * CompileCplusplusToAsm - compile C++ file to assembler - */ -#ifndef CompileCplusplusToAsm -#define CompileCplusplusToAsm(options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CC) -S $(CFLAGS) options $*.cc -#endif - - -#ifndef ObjectCplusplusCompile -#define ObjectCplusplusCompile(options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CXX) -c $(CXXFLAGS) options $*.CCsuf -#endif - -/* - * NormalLibObjCompile - compile fragment for a normal library object file - */ -#ifndef NormalLibObjCompile -#define NormalLibObjCompile(options) ObjectCompile(options) -#endif - -#ifndef NormalRelocLibObjCompile -# if !StaticNeedsPicForShared -# define NormalRelocLibObjCompile(options) NormalLibObjCompile(options) -# else -# define NormalRelocLibObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) -# endif -#endif - -#ifndef NormalLibObjCplusplusCompile -#define NormalLibObjCplusplusCompile(options) ObjectCplusplusCompile(options) -#endif - -/* - * NormalSharedLibObjCompile - compile fragment for shared objects - */ -#ifndef NormalSharedLibObjCompile -#define NormalSharedLibObjCompile(options) NormalLibObjCompile(options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS)) -#endif - -#ifndef NormalSharedLibObjCplusplusCompile -#define NormalSharedLibObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(SHLIBDEF) $(SHAREDCODEDEF) $(CXXPICFLAGS)) -#endif - -/* - * LibObjCompile - compile fragment for unshared/profiled/debugged objects - */ -#ifndef LibObjCompile -#if HasGcc || HasGcc2 -#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@) @@\ - ClearmakeOSName \ - $(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \ - options $*.c -o dir/$@ -#else -#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@) @@\ - ClearmakeOSName \ - $(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \ - options $*.c @@\ - $(MV) $@ dir/$@ -#endif -#endif - -#ifndef LibObjCplusplusCompile -#if HasGcc || HasGcc2 -#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@) @@\ - ClearmakeOSName \ - $(CXX) -c $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) \ - options $*.CCsuf -o dir/$@ -#else -#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@) @@\ - ClearmakeOSName \ - $(CXX) -c $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) \ - options $*.CCsuf @@\ - $(MV) $@ dir/$@ -#endif -#endif - -/* - * DebuggedLibObjCompile - compile fragment for debugged objects - */ -#ifndef DebuggedLibObjCompile -#define DebuggedLibObjCompile(options) LibObjCompile(debugger,DebuggableCDebugFlags options) -#endif - -#ifndef DebuggedLibObjCplusplusCompile -#define DebuggedLibObjCplusplusCompile(options) LibObjCplusplusCompile(debugger,DebuggableCplusplusDebugFlags options) -#endif - -/* - * ProfiledLibObjCompile - compile fragment for profiled objects - */ -#ifndef ProfiledLibObjCompile -#define ProfiledLibObjCompile(options) LibObjCompile(profiled,ProfiledCDebugFlags options) -#endif - -#ifndef ProfiledLibObjCplusplusCompile -#define ProfiledLibObjCplusplusCompile(options) LibObjCplusplusCompile(profiled,ProfiledCplusplusDebugFlags options) -#endif - -/* - * UnsharedLibObjCompile - compile fragment for unshared objects - */ -#ifndef UnsharedLibObjCompile -#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options) -#endif - -#ifndef UnsharedLibObjCplusplusCompile -#define UnsharedLibObjCplusplusCompile(options) LibObjCplusplusCompile(unshared,$(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) options) -#endif - -/* - * SharedLibObjCompile - compile fragment for shared objects - */ -#ifndef SharedLibObjCompile -#define SharedLibObjCompile(options) LibObjCompile(shared,options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS)) -#endif - -/* - * NormalLibraryObjectRule - for simple libraries - */ -#ifndef NormalLibraryObjectRule -#define NormalLibraryObjectRule() @@\ -.c.Osuf: @@\ - NormalLibObjCompile($(_NOOP_)) -#endif /* NormalLibraryObjectRule */ - -#ifndef NormalCplusplusObjectRule -#define NormalCplusplusObjectRule() @@\ -.CCsuf.Osuf: @@\ - NormalLibObjCplusplusCompile($(_NOOP_)) -#endif - -#ifndef NormalFortranObjectRule -#define NormalFortranObjectRule() @@\ -.f.Osuf: @@\ - RemoveFile($@) @@\ - ClearmakeOSName \ - $(FC) -c $(FCFLAGS) $*.f -#endif - -/* - * SpecialObjectRule - generate rules to compile a file with special flags. - */ -#ifndef SpecialObjectRule -#define SpecialObjectRule(objs,depends,options) @@\ -objs: depends @@\ - ObjectCompile(options) -#endif /* SpecialObjectRule */ - -#ifndef SpecialCplusplusObjectRule -#define SpecialCplusplusObjectRule(baseobj,basedep,options) @@\ -baseobj.Osuf: basedep.CCsuf @@\ - ObjectCplusplusCompile(options) -#endif /* SpecialCplusplusObjectRule */ - -/* - * SpecialCObjectRule - generate rules to compile a C file with special flags. - * also handles CodeCenter rules - */ -#ifndef SpecialCObjectRule -#define SpecialCObjectRule(basename,depends,options) @@\ -SpecialObjectRule(basename.Osuf,basename.c depends,options) @@\ - @@\ -basename.i: basename.c depends @@\ - CPPOnlyCompile(basename.c,options) @@\ - @@\ -basename.s: basename.c depends @@\ - CompileCToAsm(options) @@\ - @@\ -CenterLoadTarget(debug_src,basename.c,NullParameter,$(ALLDEFINES) options) -#endif /* SpecialCObjectRule */ - - -#ifndef ObjectFromSpecialSource -#define ObjectFromSpecialSource(dst,src,flags) @@\ -NoConfigRec(dst.c) @@\ - @@\ -dst.c: src.c @@\ - RemoveFile($@) @@\ - $(LN) $? $@ @@\ - @@\ -SpecialCObjectRule(dst,NullParameter,flags) @@\ - @@\ -includes:: dst.c @@\ - @@\ -depend:: dst.c @@\ - @@\ -clean:: @@\ - RemoveFile(dst.c) -#endif /* ObjectFromSpecialSource */ - -#ifndef CPPOnlyAsm -#define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ - $(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\ - grep -v '^\#' > basename.i -#endif - -#ifndef AssembleObject -#define AssembleObject(basename,flags) CPPOnlyAsm(basename,flags) @@\ - RemoveFile(basename.o) @@\ - $(AS) -o basename.o basename.i @@\ - RemoveFile(basename.i) -#endif - -#ifndef NormalAsmObjectRule -#define NormalAsmObjectRule() @@\ -.S.o: @@\ - AssembleObject($*,$(_NOOP_)) @@\ - @@\ -.S.i: @@\ - CPPOnlyAsm($*,$(_NOOP_)) -#endif - -#ifndef ObjectFromSpecialAsmSource -#define ObjectFromSpecialAsmSource(dst,src,flags) @@\ -dst.S: src.S @@\ - RemoveFile($@) @@\ - $(LN) $? $@ @@\ - @@\ -dst.o: dst.S @@\ - AssembleObject(dst,flags) @@\ - @@\ -dst.i: dst.S @@\ - CPPOnlyAsm(dst,flags) @@\ - @@\ -depend:: dst.S @@\ - @@\ -clean:: @@\ - RemoveFile(dst.S) -#endif - -#ifndef ObjectFromAsmSource -#define ObjectFromAsmSource(src,flags) @@\ - @@\ -src.o: src.S @@\ - AssembleObject(src,flags) @@\ - @@\ -src.i: src.S @@\ - CPPOnlyAsm(src,flags) @@\ - @@\ -depend:: src.S -#endif - -#ifndef SwitchYYPrefix -#define SwitchYYPrefix(in,out,prefix) \ - sed 's/yy/prefix/g' in | sed 's/__REALLY_YY__/yy/' > out && RemoveFile(in) -#endif - -#ifndef LexFilePrefix -#define LexFilePrefix(file,prefix) @@\ -file.c: file.l @@\ - ClearmakeOSName \ - $(LEX) $(LFLAGS) file.l @@\ - SwitchYYPrefix(lex.yy.c,file.c,prefix) @@\ - @@\ -depend:: file.c @@\ - @@\ -clean:: @@\ - RemoveFiles(lex.yy.c file.c) -#endif - -#ifndef LexFileExplicit -#if HasClearmake /* provide a place to hang ClearmakeOSName */ -#define LexFileExplicit(file) @@\ -file.c: file.l @@\ - ClearmakeOSName \ - $(LEX) $(LFLAGS) file.l @@\ - $(MV) lex.yy.c file.c -#else -#define LexFileExplicit(file) /* the default rule is fine */ -#endif -#endif - -#ifndef LexFile -#define LexFile(file) @@\ -LexFileExplicit(file) @@\ - @@\ -depend:: file.c @@\ - @@\ -clean:: @@\ - RemoveFiles(lex.yy.c file.c) -#endif /* LexFile */ - - -#ifndef M4File -#define M4File(file,includes) @@\ -file: file.m4 includes @@\ - RemoveFile(file) @@\ - $(M4) $(M4FLAGS) file.m4 >file @@\ - @@\ -depend:: file @@\ - @@\ -clean:: @@\ - RemoveFile(file) -#endif /* M4File */ - -#ifndef YaccFilePrefix -#if HasGnuMake -#define YaccFilePrefix(file,flags,prefix) @@\ -depend:: file.c @@\ - @@\ -file.h: file.c @@\ - @@\ -file.c: file.y @@\ - ClearmakeOSName \ - $(YACC) flags file.y @@\ - SwitchYYPrefix(y.tab.c,file.c,prefix) @@\ - @if [ -f y.tab.h ]; then set -x; SwitchYYPrefix(y.tab.h,file.h,prefix); \@@\ - else exit 0; fi @@\ - @@\ -clean:: @@\ - RemoveFiles(y.tab.c y.tab.h file.h file.c) -#else -#define YaccFilePrefix(file,flags,prefix) @@\ -depend:: file.c @@\ - @@\ -file.h file.c: file.y @@\ - ClearmakeOSName \ - $(YACC) flags file.y @@\ - SwitchYYPrefix(y.tab.c,file.c,prefix) @@\ - @if [ -f y.tab.h ]; then set -x; SwitchYYPrefix(y.tab.h,file.h,prefix); \ @@\ - else exit 0; fi @@\ - @@\ -clean:: @@\ - RemoveFiles(y.tab.c y.tab.h file.h file.c) -#endif -#endif /* YaccFile */ - -#ifndef YaccFile -#if HasGnuMake -#define YaccFile(file,flags) @@\ -depend:: file.c @@\ - @@\ -file.h: file.c @@\ - @@\ -file.c: file.y @@\ - ClearmakeOSName \ - $(YACC) flags file.y @@\ - $(MV) y.tab.c file.c @@\ - @if [ -f y.tab.h ]; then set -x; $(MV) y.tab.h file.h; \ @@\ - else exit 0; fi @@\ - @@\ -clean:: @@\ - RemoveFiles(y.tab.c y.tab.h file.h file.c) -#else -#define YaccFile(file,flags) @@\ -depend:: file.c @@\ - @@\ -file.h file.c: file.y @@\ - ClearmakeOSName \ - $(YACC) flags file.y @@\ - $(MV) y.tab.c file.c @@\ - @if [ -f y.tab.h ]; then set -x; $(MV) y.tab.h file.h; \ @@\ - else exit 0; fi @@\ - @@\ -clean:: @@\ - RemoveFiles(y.tab.c y.tab.h file.h file.c) -#endif -#endif /* YaccFile */ - -#ifndef YaccFileNoFlags -#define YaccFileNoFlags(file) @@\ -depend:: file.c @@\ - @@\ -file.c: file.y @@\ - ClearmakeOSName \ - $(YACC) file.y @@\ - $(MV) y.tab.c file.c @@\ - @@\ -clean:: @@\ - RemoveFiles(y.tab.c file.c) -#endif /* YaccFileNoFlags */ - - -#ifndef MakeLibrary -#define MakeLibrary(libname,objlist) $(AR) libname objlist -#endif - -#ifndef LinkBuildLibrary -#ifdef UseInstalled -#define LinkBuildLibrary(lib) $(_NULLCMD_) -#else -#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR)) @@\ - RemoveFile($(BUILDLIBDIR)/lib) @@\ - cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib . -#endif -#endif /* LinkBuildLibrary */ - -#ifndef LinkBuildLibraryMaybe -#ifdef UseInstalled -#define LinkBuildLibraryMaybe(lib,doit) $(_NULLCMD_) -#else -#define LinkBuildLibraryMaybe(lib,doit) MakeDir($(BUILDLIBDIR)) @@\ - @if doit; then (set -x; \ @@\ - RemoveFile($(BUILDLIBDIR)/lib); \ @@\ - cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .); fi -#endif -#endif /* LinkBuildLibraryMaybe */ - -#ifndef _LinkBuildLibrary /* will get redefined elsewhere */ -#define _LinkBuildLibrary(lib) $(_NULLCMD_) -#endif /* _LinkBuildLibrary */ - -#ifndef LinkBuildSonameLibrary -#ifdef UseInstalled -#define LinkBuildSonameLibrary(lib) true -#else -#define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\ @@\ - (set -x; RemoveFile($(BUILDLIBDIR)/lib);\ @@\ - (cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .)) -#endif -#endif /* LinkBuildSonameLibrary */ - -#ifndef LinkBuildLibraryInline -#define LinkBuildLibraryInline(lib) LinkBuildSonameLibrary(lib) -#endif /* LinkBuildLibraryInline */ - -/* - * NormalLibraryTarget - generate rules to create a library. - */ -#ifndef NormalLibraryTarget -#define NormalLibraryTarget(libname,objlist) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist) @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* NormalLibraryTarget */ - - -/* - * NormalLibraryTarget2 - generate rules to create a library in two steps. - * This is used to create libraries with large numbers of files. - */ -#ifndef NormalLibraryTarget2 -#define NormalLibraryTarget2(libname,objlist1,objlist2) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist1 objlist2 $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist1) @@\ - MakeLibrary($@,objlist2) @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* NormalLibraryTarget2 */ - - -/* - * NormalLibraryTarget3 - generate rules to create a library in three steps. - * This is used to create libraries with very large numbers of files. - */ -#ifndef NormalLibraryTarget3 -#define NormalLibraryTarget3(libname,objlist1,objlist2,objlist3) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist1) @@\ - MakeLibrary($@,objlist2) @@\ - MakeLibrary($@,objlist3) @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* NormalLibraryTarget3 */ - - -/* - * NormalDepLibraryTarget - generate rules to create a library. - */ -#ifndef NormalDepLibraryTarget -#define NormalDepLibraryTarget(libname,deplist,objlist) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): deplist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist) @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* NormalDepLibraryTarget */ - - -/* - * UnsharedLibraryTarget - generate rules to create a library. - */ -#ifndef UnsharedLibraryTarget -#define UnsharedLibraryTarget(libname,objlist,down,up) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - @(set -x; cd down && MakeLibrary(up/$@,objlist)) || exit 1; @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* UnsharedLibraryTarget */ - - -/* - * UnsharedLibraryTarget3 - generate rules to create a library in three steps. - * This is used to create libraries with very large numbers of files. - */ -#ifndef UnsharedLibraryTarget3 -#define UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - (cd down && MakeLibrary(up/$@,objlist1)) @@\ - (cd down && MakeLibrary(up/$@,objlist2)) @@\ - (cd down && MakeLibrary(up/$@,objlist3)) @@\ - RanLibrary($@) @@\ - _LinkBuildLibrary($@) -#endif /* UnsharedLibraryTarget3 */ - - -/* - * SubdirLibraryRule - - */ -#ifndef SubdirLibraryRule -#define SubdirLibraryRule(objlist) @@\ -all:: DONE @@\ - @@\ -DONE: objlist @@\ - RemoveFile($@) @@\ - touch $@ @@\ - @@\ -clean:: @@\ - RemoveFile(DONE) -#endif /* SubdirLibraryRule */ - - -/* - * ProfiledLibraryTarget - generate rules to create a profiled library. - */ -#ifndef ProfiledLibraryTarget -#define ProfiledLibraryTarget(libname,objlist) @@\ -AllTarget(LibraryTargetNameSuffix(libname,_p)) @@\ - @@\ -LibraryTargetNameSuffix(libname,_p): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - cd profiled && MakeLibrary(../$@,objlist) @@\ - RanLibrary($@) - -#endif /* ProfiledLibraryTarget */ - - -/* - * ProfiledDepLibraryTarget - generate rules to create a profiled library. - */ -#ifndef ProfiledDepLibraryTarget -#define ProfiledDepLibraryTarget(libname,deplist,objlist) @@\ -AllTarget(LibraryTargetNameSuffix(libname,_p)) @@\ - @@\ -LibraryTargetNameSuffix(libname,_p): deplist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist) @@\ - RanLibrary($@) - -#endif /* ProfiledDepLibraryTarget */ - - -/* - * DebuggedLibraryTarget - generate rules to create a debuggable library. - */ -#ifndef DebuggedLibraryTarget -#define DebuggedLibraryTarget(libname,objlist) @@\ -AllTarget(LibraryTargetNameSuffix(libname,_d)) @@\ - @@\ -LibraryTargetNameSuffix(libname,_d): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - cd debugger && MakeLibrary(../$@,objlist) @@\ - RanLibrary($@) - -#endif /* DebuggedLibraryTarget */ - - -/* - * DebuggedDepLibraryTarget - generate rules to create a debuggable library. - */ -#ifndef DebuggedDepLibraryTarget -#define DebuggedDepLibraryTarget(libname,deplist,objlist) @@\ -AllTarget(LibraryTargetNameSuffix(libname,_d)) @@\ - @@\ -LibraryTargetNameSuffix(libname,_d): deplist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - MakeLibrary($@,objlist) @@\ - RanLibrary($@) - -#endif /* DebuggedDepLibraryTarget */ - - -/* - * AliasedLibraryTarget - generate rules to link one library to another. - */ -#ifndef AliasedLibraryTarget -#define AliasedLibraryTarget(libname,alias) @@\ -AllTarget(LibraryTargetName(alias)) @@\ - @@\ -LibraryTargetName(alias): LibraryTargetName(libname) @@\ - RemoveFile($@) @@\ - $(LN) LibraryTargetName(libname) $@ @@\ - @@\ -clean:: @@\ - RemoveFile(LibraryTargetName(alias)) -#endif /* AliasedLibraryTarget */ - - -/* - * NormalRelocatableTarget - generate rules to produce a relocatable object - * file instead of a library. - */ -#ifndef NormalRelocatableTarget -#define NormalRelocatableTarget(objname,objlist) @@\ -AllTarget(objname.Osuf) @@\ - @@\ -objname.Osuf: objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(LD) $(LDCOMBINEFLAGS) objlist -o $@ -#endif /* NormalRelocatableTarget */ - - -/* - * NormalDepRelocatableTarget - generate rules to produce a relocatable object - * file instead of a library. - */ -#ifndef NormalDepRelocatableTarget -#define NormalDepRelocatableTarget(objname,deplist,objlist) @@\ -AllTarget(objname.Osuf) @@\ - @@\ -objname.Osuf: deplist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(LD) $(LDCOMBINEFLAGS) objlist -o $@ -#endif /* NormalDepRelocatableTarget */ - - -/* - * ProfiledRelocatableTarget - generate rules to produce a profiled relocatable - * object file instead of a library. - */ -#ifndef ProfiledRelocatableTarget -#define ProfiledRelocatableTarget(objname,objlist) @@\ -AllTarget(Concat(objname,_p.Osuf)) @@\ - @@\ -Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(LD) -X -r objlist -o $@ - -#endif /* ProfiledRelocatableTarget */ - - -/* - * DebuggedRelocatableTarget - generate rules to produce a debuggable - * relocatable object file instead of a library. - */ -#ifndef DebuggedRelocatableTarget -#define DebuggedRelocatableTarget(objname,objlist) @@\ -AllTarget(Concat(objname,_d.Osuf)) @@\ - @@\ -Concat(objname,_d.Osuf): objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(LD) -X -r objlist -o $@ - -#endif /* DebuggedRelocatableTarget */ - - -/* - * LintLibraryTarget - generate rules to create a lint library. Note that the - * lint library is always forced to be newer than the library itself. - */ -#ifndef LintLibraryTarget -#define LintLibraryTarget(libname,srclist) @@\ -lintlib:: Concat(llib-l,libname.ln) @@\ - @@\ -Concat(llib-l,libname.ln): srclist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(LINT) Concat($(LINTLIBFLAG),libname) $(LINTFLAGS) srclist -#endif /* LintLibraryTarget */ - - -/* - * NormalLintTarget - generate rules to lint a set of sources. - */ -#ifndef NormalLintTarget -#define NormalLintTarget(srclist) @@\ -lint: @@\ - $(LINT) $(LINTFLAGS) srclist $(LINTLIBS) @@\ -lint1: @@\ - $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) -#endif /* NormalLintTarget */ - - -/* - * LintTarget - generate rules to lint $(SRCS) - */ -#ifndef LintTarget -#define LintTarget() @@\ -NormalLintTarget($(SRCS)) -#endif - - -/* - * LinkSourceFile - snag source file from some other directory - */ -#ifndef LinkSourceFile -#define LinkSourceFile(src,dir) @@\ -src: dir/src @@\ - RemoveFile($@) @@\ - $(LN) $? $@ @@\ - @@\ -NoConfigRec(src) @@\ - @@\ -includes:: src @@\ - @@\ -depend:: src @@\ - @@\ -clean:: @@\ - RemoveFile(src) -#endif - - -/* - * LinkFile - link a file - */ -#ifndef LinkFile -#define LinkFile(tofile,fromfile) @@\ -tofile:: fromfile @@\ - RemoveFile($@) @@\ - $(LN) $? $@ @@\ - @@\ -NoConfigRec(tofile) @@\ - @@\ -includes:: tofile @@\ - @@\ -depend:: tofile @@\ - @@\ -clean:: @@\ - RemoveFile(tofile) -#endif - - -#ifndef MakeSubincludesForBuild -#define MakeSubincludesForBuild(step,dir,srclist) @@\ -step:: dir srclist @@\ - @-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\ - set -x; cd dir && RemoveFiles($$list)) @@\ - @for i in srclist; do \ @@\ - (set -x; cd dir && $(LN) ../$$i .); \ @@\ - done @@\ - @@\ -dir:: @@\ - $(MKDIRHIER) dir @@\ - @@\ -clean:: @@\ - @-(if [ -d dir ]; then \ @@\ - list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\ - set -x; cd dir && RemoveFile($$list); else exit 0; fi) -#endif - - -/* - * LangNamedTargetSubdirs - recursively make a series of steps - */ -#ifndef LangNamedTargetSubdirs -#define LangNamedTargetSubdirs(lang,name,dirs,verb,flags,subname) @@\ -name:: @@\ - @MakeFlagsToShellFlags(ik,set +e); \ @@\ - for i in dirs ;\ @@\ - do \ @@\ - echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ - (cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\ - done -#endif - - -/* - * NamedMakeSubdirs - generate rules to do makes in the given subdirectories. - * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like - * the following in the appropriate Imakefile - * - * #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - */ -#ifndef LangNamedMakeSubdirs -#define LangNamedMakeSubdirs(lang,name,dirs) \ -LangNamedTargetSubdirs(lang,name,dirs,"making" name,PassCDebugFlags,all) -#endif /* LangNamedMakeSubdirs */ - -#ifndef LangMakeSubdirs -#define LangMakeSubdirs(lang,dirs) @@\ -LangNamedMakeSubdirs(lang,all,dirs) -#endif /* LangMakeSubdirs */ - - - -/* - * NamedTargetSubdirs - recursively make a series of steps - */ -#ifndef NamedTargetSubdirs -#define NamedTargetSubdirs(name,dirs,verb,flags,subname) @@\ -name:: @@\ - @MakeFlagsToShellFlags(ik,set +e); \ @@\ - for i in dirs ;\ @@\ - do \ @@\ - echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ - MakeNamedTargetSubdir($$i,flags,subname); \ @@\ - done -#endif - - -/* - * NamedMakeSubdirs - generate rules to do makes in the given subdirectories. - * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like - * the following in the appropriate Imakefile - * - * #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - */ -#ifndef NamedMakeSubdirs -#define NamedMakeSubdirs(name,dirs) \ -NamedTargetSubdirs(name,dirs,"making" name,PassCDebugFlags,all) -#endif /* NamedMakeSubdirs */ - -#ifndef MakeSubdirs -#define MakeSubdirs(dirs) @@\ -NamedMakeSubdirs(all,dirs) -#endif /* MakeSubdirs */ - - -/* - * DependSubdirs - generate rules to recursively compute dependencies as - * part of the make depend step. - */ -#ifndef DependSubdirs -#define DependSubdirs(dirs) \ -NamedTargetSubdirs(depend,dirs,"depending",NullParameter,depend) -#endif /* DependSubdirs */ - - -/* - * ForceSubdirs - force make to build subdirectories - */ -#ifndef ForceSubdirs -#if !HasBsdMake -#define ForceSubdirs(dirs) @@\ -dirs: FRC @@\ - @echo "making all in $(CURRENT_DIR)/$@..." @@\ - @MakeNamedTargetSubdir($@,PassCDebugFlags,all) @@\ - @@\ -FRC: -#else -/* For BSD 4.4 make */ -#define ForceSubdirs(dirs) @@\ -dirs: .EXEC @@\ - @cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \ @@\ - $(MAKE) $(MFLAGS) PassCDebugFlags all @@\ - @@\ -.EXEC: -#endif - -#endif /* ForceSubdirs */ - -/* - * InstallSubdirs - generate rules to recursively install programs and files. - */ -#ifndef InstallSubdirs -#define InstallSubdirs(dirs) \ -NamedTargetSubdirs(install,dirs,"installing",DESTDIR=$(DESTDIR),install) -#endif /* InstallSubdirs */ - - -/* - * InstallManSubdirs - generate rules to recursively install manual pages. - */ -#ifndef InstallManSubdirs -#define InstallManSubdirs(dirs) \ -NamedTargetSubdirs(install.man,dirs,"installing man pages",DESTDIR=$(DESTDIR),install.man) -#endif /* InstallManSubdirs */ - - -/* - * IncludesSubdirs - generate rules to recursively put include files in build - */ -#ifndef IncludesSubdirs -#define IncludesSubdirs(dirs) \ -NamedTargetSubdirs(includes,dirs,including,NullParameter,includes) -#endif - - -/* - * InstallDriverSDKSubdirs - generate rules to recursively install Driver - * SDK (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKSubdirs -#define InstallDriverSDKSubdirs(dirs) -#endif - -/* - * InstallDriverSDKObjectModule - generate rules to recursively install Driver - * SDK (only used for XFree86). This is a no-op - * rule so that Imakefiles on non-XFree86 systems - * continue to build Makefiles correctly. - */ -#ifndef InstallDriverSDKObjectModule -#define InstallDriverSDKObjectModule(module,dest,subdir) -#endif -#ifndef InstallDriverSDKObjectSubModule -#define InstallDriverSDKObjectSubModule(module,dest,subdir) -#endif - - - -/* - * CleanSubdirs - generate rules to recursively clean out garbage files. - */ -#define BootstrapCleanSubdirs /**/ /* used at top-level */ -#ifndef NamedCleanSubdirs -#define NamedCleanSubdirs(name,dirs) \ -NamedTargetSubdirs(name,dirs,"cleaning",BootstrapCleanSubdirs,clean) -#endif /* NamedCleanSubdirs */ - -#ifndef CleanSubdirs -#define CleanSubdirs(dirs) \ -NamedCleanSubdirs(clean,dirs) -#endif - - -/* - * TagSubdirs - generate rules to recursively create tags files. - */ -#ifndef NamedTagSubdirs -#define NamedTagSubdirs(name,dirs) \ -NamedTargetSubdirs(name,dirs,"tagging",TAGS='$(TAGS)',tags) -#endif /* TagSubdirs */ - -#ifndef TagSubdirs -#define TagSubdirs(dirs) \ -NamedTagSubdirs(tags,dirs) -#endif - -/* - * MakeLintSubdirs - generate rules to recursively lint directories as part - * of the named step. - */ -#ifndef MakeLintSubdirs -#define MakeLintSubdirs(dirs,target,subtarget) \ -NamedTargetSubdirs(target,dirs,"linting" for target and subtarget,DESTDIR=$(DESTDIR) LINTOPTS='$(LINTOPTS)',subtarget) -#endif /* MakeLintSubdirs */ - - -/* - * LintSubdirs - generate rules to recursively lint directories as part of - * the make lint step. - */ -#ifndef LintSubdirs -#define LintSubdirs(dirs) @@\ -MakeLintSubdirs(dirs,lint,lint) -#endif /* LintSubdirs */ - - -/* - * MakeLintLibSubdirs - generate rules to recursively create lint libraries. - */ -#ifndef MakeLintLibSubdirs -#define MakeLintLibSubdirs(dirs) @@\ -MakeLintSubdirs(dirs,lintlib,lintlib) -#endif /* MakeLintLibSubdirs */ - - -/* - * MakeMakeSubdirs - generate rules to recursively recreate Makefiles as part - * of the specified step in the build. If $(TOP) is set to an absolute path, - * do not prepend the ../ prefix. This makes running things outside of the - * source tree much easier. - * $(ONESUBDIR)/Makefile exists as a separate, explicit target so that - * clearmake will know what its goal is and do wink-in. - */ -#ifndef MakeMakeSubdirs -#define MakeMakeSubdirs(dirs,target) @@\ -$(ONESUBDIR)/Makefile: @@\ - @MakeFlagsToShellFlags(n,executeit="no"); \ @@\ - cd $(ONESUBDIR) && \ @@\ - if [ "$$executeit" != "no" ]; then \ @@\ - ImakeSubCmdHelper -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \ @@\ - fi; @@\ - @@\ -target:: @@\ - -@MakeFlagsToShellFlags(ik,set +e); \ @@\ - MakeFlagsToShellFlags(n,executeit="no"); \ @@\ - for i in dirs ;\ @@\ - do \ @@\ - case "$(CURRENT_DIR)" in \ @@\ - .) curdir= ;; \ @@\ - *) curdir=$(CURRENT_DIR)/ ;; \ @@\ - esac; \ @@\ - echo "making Makefiles in $$curdir$$i..."; \ @@\ - itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\ - curtmp="$(CURRENT_DIR)" \ @@\ - toptmp=""; \ @@\ - case "$$itmp" in \ @@\ - ../?*) \ @@\ - while echo "$$itmp" | grep '^\.\./' > /dev/null;\ @@\ - do \ @@\ - toptmp="/`basename $$curtmp`$$toptmp"; \ @@\ - curtmp="`dirname $$curtmp`"; \ @@\ - itmp="`echo $$itmp | sed 's;\.\./;;'`"; \ @@\ - done \ @@\ - ;; \ @@\ - esac; \ @@\ - case "$$itmp" in \ @@\ - */?*/?*/?*/?*) newtop=../../../../..;; \ @@\ - */?*/?*/?*) newtop=../../../..;; \ @@\ - */?*/?*) newtop=../../..;; \ @@\ - */?*) newtop=../..;; \ @@\ - *) newtop=..;; \ @@\ - esac; \ @@\ - newtop="$$newtop$$toptmp"; \ @@\ - case "$(TOP)" in \ @@\ - /?*) imaketop=$(TOP) \ @@\ - imakeprefix= ;; \ @@\ - .) imaketop=$$newtop \ @@\ - imakeprefix=$$newtop/ ;; \ @@\ - *) imaketop=$$newtop/$(TOP) \ @@\ - imakeprefix=$$newtop/ ;; \ @@\ - esac; \ @@\ - RemoveFile($$i/Makefile.bak); \ @@\ - if [ -f $$i/Makefile ]; then \ @@\ - echo " $(MV) Makefile Makefile.bak"; \ @@\ - if [ "$$executeit" != "no" ]; then \ @@\ - $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\ - fi; \ @@\ - fi; \ @@\ - $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\ - if [ -d $$i ] ; then \ @@\ - cd $$i; \ @@\ - $(MAKE) $(MFLAGS) Makefiles; \ @@\ - cd $$newtop; \ @@\ - else \ @@\ - exit 1; \ @@\ - fi; \ @@\ - done - -#define ImakeSubCmdHelper $(IMAKE_CMD) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - -#endif /* MakeMakeSubdirs */ - - -/* - * MakefileSubdirs - generate rules to create Makefiles. - */ -#ifndef MakefileSubdirs -#define MakefileSubdirs(dirs) @@\ -MakeMakeSubdirs(dirs,Makefiles) -#endif /* MakefileSubdirs */ - -/* - * Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM - * to cpp, because that trick does not work on all ANSI C preprocessors. - * Delete line numbers from the cpp output (-P is not portable, I guess). - * Allow XCOMM to be preceded by whitespace and provide a means of generating - * output lines with trailing backslashes. - * Allow XHASH to always be substituted, even in cases where XCOMM isn't. - */ -#ifndef CppSedMagic -#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' \ - -e '/^#line *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM$$/s/XCOMM/#/' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \ - -e '/^[ ]*XHASH/s/XHASH/#/' \ - -e '/\@\@$$/s/\@\@$$/\\/' -#endif /* CppSedMagic */ - -#ifndef CppFileTarget -#define CppFileTarget(dst,src,defs,deplist) @@\ -dst:: src deplist @@\ - RemoveFile($@) @@\ - ClearmakeOSName \ - $(CPP) CppNoLineInfoOption defs $@ @@\ - @@\ -clean:: @@\ - RemoveFiles(dst) -#endif /* CppFileTarget */ - -/* - * CppScriptTarget - generate rules to create a shell script by running the - * input through cpp. If the ExecableScripts configuration parameter is not - * set, then make sure that the first line begins with a colon. - */ -#ifndef CppScriptTarget -#if ExecableScripts /* can use #! instead of colon */ -#define CppScriptTarget(dst,src,defs,deplist) @@\ -dst:: src deplist @@\ - RemoveFile($@) @@\ - ClearmakeOSName \ - $(CPP) CppNoLineInfoOption defs $@ @@\ - chmod a+x $@ @@\ - @@\ -clean:: @@\ - RemoveFiles(dst) -#else -#define CppScriptTarget(dst,src,defs,deplist) @@\ -dst:: src deplist @@\ - RemoveFile($@) @@\ - ClearmakeOSName \ - echo \: >$@ @@\ - sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\ - chmod a+x $@ @@\ - @@\ -clean:: @@\ - RemoveFile(dst) -#endif /* ExecableScripts */ -#endif /* CppScriptTarget */ - - -/* - * MakeScriptFromCpp - generate rules to create a script from a file with a - * .cpp suffix. - */ -#ifndef MakeScriptFromCpp -#define MakeScriptFromCpp(name,defs) @@\ -CppScriptTarget(name,name.cpp,defs,NullParameter) -#endif /* MakeScriptFromCpp */ - -#ifndef CppSourceFile -#define CppSourceFile(dst,src,defs,deplist) @@\ -CppFileTarget(dst,src,defs,deplist) @@\ - @@\ -includes:: dst @@\ - @@\ -depend:: dst -#endif /* CppSourceFile */ - -/* Like CppFileTarget, but don't add any default defines */ -#ifndef CppRawFileTarget -#define CppRawFileTarget(dst,src,defs,deplist) @@\ -dst:: src deplist @@\ - RemoveFile($@) @@\ - ClearmakeOSName \ - $(RAWCPP) CppNoLineInfoOption defs $@ @@\ - @@\ -clean:: @@\ - RemoveFiles(dst) -#endif /* CppFileTarget */ - -/* - * CppManTarget - preprocess man pages. OS-specific man sections are replaced. - */ -#ifndef CppManTarget -#define CppManTarget(name,defs) @@\ -AllTarget(name.$(MANNEWSUFFIX)) @@\ - @@\ -name.$(MANNEWSUFFIX): name.$(MANSRCSUFFIX) @@\ - RemoveFile($@) @@\ - if test -z "$(PREPROCESSMANPAGES)" ; then \ @@\ - cd `dirname name` && \ @@\ - $(LN) `basename name.$(MANSRCSUFFIX)` `basename $@`; \ @@\ - else \ @@\ - ClearmakeOSName \ - $(RAWCPP) CppNoLineInfoOption $(MANDEFS) defs \ @@\ - < name.$(MANSRCSUFFIX) | CppSedMagic >$@; \ @@\ - fi @@\ - @@\ -clean:: @@\ - RemoveFile(name.$(MANNEWSUFFIX)) -#endif /* CppManTarget */ - -/* - * MakeDirectories - generate rules to create a hierarchy of directories. - */ -#ifndef MakeDirectories -#define MakeDirectories(step,dirs) @@\ -step:: @@\ - DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \ @@\ - for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\ - set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\ - done -#endif /* MakeDirectories */ - - -/* - * AllTarget - generate rules to build necessary things during make all. - */ -#ifndef AllTarget -#define AllTarget(depends) @@\ -all:: depends -#endif /* AllTarget */ - -#ifdef DefineOldLibraryRules -#include -#endif - -#ifndef StaticLibrary -#define StaticLibrary(libpath,libname) Concat3(libpath,/,LibraryTargetName(libname)) -#endif - -/* - * MakeMutex - generate mutex rules for parallel make - */ -#ifndef MakeMutex -#ifdef MutexDirective -#define MakeMutex(targets) @@\ -MutexDirective: targets -#endif /* MutexDirective */ -#endif /* MakeMutex */ - -/* - * Rules for dynamic modules. These are primarily used by XFree86 - */ - -#ifndef LinkBuildModule -#ifdef UseInstalled -#define LinkBuildModule(module,subdir) $(_NULLCMD_) -#else -#define LinkBuildModule(module,subdir)\ - MakeDir($(BUILDMODULEDIR)/subdir) @@\ - RemoveFile($(BUILDMODULEDIR)/subdir/module) @@\ - @(UP="`$(REVPATH) subdir`"; set -x; \ @@\ - cd $(BUILDMODULEDIR)/subdir && \ @@\ - $(LN) $(BUILDMODULETOP)/$${UP}$(CURRENT_DIR)/module .) -#endif -#endif /* LinkBuildModule */ - -#ifndef LinkBuildNamedModule -#ifdef UseInstalled -#define LinkBuildNamedModule(module,name,subdir) $(_NULLCMD_) -#else -#define LinkBuildNamedModule(module,name,subdir)\ - MakeDir($(BUILDMODULEDIR)/subdir) @@\ - RemoveFile($(BUILDMODULEDIR)/subdir/name) @@\ - @(UP="`$(REVPATH) subdir`"; set -x; \ @@\ - cd $(BUILDMODULEDIR)/subdir && \ @@\ - $(LN) $(BUILDMODULETOP)/$${UP}$(CURRENT_DIR)/module name) -#endif -#endif /* LinkBuildNamedModule */ - -/* - * ModuleObjectRule - */ -#ifndef ModuleObjectRule -#define ModuleObjectRule() NormalLibraryObjectRule() -#endif - -/* - * ObjectModuleTarget - build a module as a single object file - */ -#ifndef ObjectModuleTarget -#define ObjectModuleTarget(module,objects) @@\ -NormalRelocatableTarget(Concat(module,_drv), objects) -#endif - -/* - * LibraryModuleTarget - */ -#ifndef LibraryModuleTarget -#define LibraryModuleTarget(module, objects) @@\ -NormalLibraryTarget(module, objects) -#endif - -/* - * DepLibraryModuleTarget - */ -#ifndef DepLibraryModuleTarget -#define DepLibraryModuleTarget(module,deplist,objects) @@\ -NormalDepLibraryTarget(module, deplist, objects) -#endif - -/* - * DynamicModuleTarget - build a module to be dynamically loaded - */ -#ifndef DynamicModuleTarget -#define DynamicModuleTarget(module,modlist) @@\ -AllTarget(module) @@\ - @@\ -module: modlist @@\ - RemoveFile($@) @@\ - $(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist $(POSTNOSTDLIB) @@\ - @@\ -clean:: @@\ - RemoveFile(module) -#endif /* DynamicModuleTarget */ - -/* - * DepDynamicModuleTarget - build a module to be dynamically loaded - */ -#ifndef DepDynamicModuleTarget -#define DepDynamicModuleTarget(module,deplist,modlist) @@\ -AllTarget(module) @@\ - @@\ -module: deplist @@\ - RemoveFile($@) @@\ - $(CC) -o $@ $(SHLIBLDFLAGS) $(NOSTDLIB) modlist $(POSTNOSTDLIB) @@\ - @@\ -clean:: @@\ - RemoveFile(module) -#endif /* DepDynamicModuleTarget */ - -/* - * InstallDynamicModule - install a dynamic module - */ -#ifndef InstallDynamicModule -#define InstallDynamicModule(module,dest,subdir) @@\ -AllTarget(module) @@\ - LinkBuildModule(module,subdir) @@\ - @@\ -install:: module @@\ - MakeDir($(DESTDIR)dest/subdir) @@\ - $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir -#endif - -#ifndef InstallDynamicNamedModule -#define InstallDynamicNamedModule(module,instname,dest,subdir) @@\ -AllTarget(module) @@\ - LinkBuildNamedModule(module,instname,subdir) @@\ - @@\ -install:: module @@\ - MakeDir($(DESTDIR)dest/subdir) @@\ - $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir/instname -#endif - -/* Shortcuts for installing driver module, one per class */ -#ifndef InstallVideoObjectModule -#define InstallVideoObjectModule(module,dest) @@\ -InstallObjectModule(module,dest,drivers) -#endif -#ifndef InstallInputObjectModule -#define InstallInputObjectModule(module,dest) @@\ -InstallObjectModule(module,dest,input) -#endif -#ifndef InstallExtensionsObjectModule -#define InstallExtensionsObjectModule(module,dest) @@\ -InstallObjectModule(module,dest,extensions) -#endif -#ifndef InstallFontsObjectModule -#define InstallFontsObjectModule(module,dest) @@\ -InstallObjectModule(module,dest,fonts) -#endif -#ifndef InstallMultimediaObjectModule -#define InstallMultimediaObjectModule(module,dest) @@\ -InstallObjectModule(module,dest,multimedia) -#endif - -#ifndef InstallObjectModule -#define InstallObjectModule(module,dest,subdir) /**/ -#endif - -#ifndef InstallLibraryModule -#define InstallLibraryModule(module,dest,subdir) /**/ -#endif - -#ifndef InstallModuleManPage -#define InstallModuleManPage(module) @@\ -InstallGenManPage(module,$(DRIVERMANDIR),$(DRIVERMANSUFFIX)) -#endif - -#ifndef BuildObjectFromLibraryWithPath -#define BuildObjectFromLibraryWithPath(libpath,libname,objname) @@\ -AllTarget(objname.Osuf) @@\ - @@\ -objname.Osuf: Concat3(libpath,/lib,libname.a) @@\ - @$(MKDIRHIER) tmp @@\ - @$(CP) Concat3(libpath,/lib,libname.a) tmp @@\ - @(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \ @@\ - $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \ @@\ - RemoveFiles(*.Osuf)) @@\ - @$(RM) -r tmp @@\ - @@\ -clean:: @@\ - RemoveFile(objname.Osuf) -#endif - -#ifndef BuildObjectFromLibrary -#define BuildObjectFromLibrary(libname,objname) BuildObjectFromLibraryWithPath(.,libname,objname) -#endif - -/* - * LinkerRuntimeLibraryPathFlag - defined here to be a no-op for systems that - * don't need it. Overridden in system-specific config files for systems that - * need it, usually with something like "Concat(-R,path)" - */ -#ifndef LinkerRuntimeLibraryPathFlag -# define LinkerRuntimeLibraryPathFlag(path) /* */ -#endif - -/* Phony targets - GNU make has a feature to mark a target as phony, - * which means that it won't consider that target to be the name of a - * file. In general this speeds up make, since it doesn't have to - * look for those files when it sets out to create a phony target. - * However, on cygwin, this is actually required for correct - * operation, since the Win32 filesystems are case insensitive and the - * install target conflicts with the INSTALL file present in some - * (autotooled) directories. - * - * We probably don't need the #ifdef protection, since other make - * implementations would just consider this a normal rule. Better - * safe than sorry, though. - */ -#if HasGnuMake -.PHONY: all interfaces install install.man install.lib install.sdk \ - depend includes clean -#endif diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl deleted file mode 100644 index 25d985d75f..0000000000 --- a/nx-X11/config/cf/Imake.tmpl +++ /dev/null @@ -1,2257 +0,0 @@ -XCOMM ---------------------------------------------------------------------- -XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM ---------------------------------------------------------------------- - -/* - * generic imake template - */ - -/* - * Modify Imake.cf when adding a new architecture, do not modify this file. - * Platform-specific parameters may be set in the appropriate .cf - * configuration files. Site-specific parameters should be set in the file - * site.def. Full rebuilds are recommended if any parameters are changed. - * If your C preprocessor does not define any unique symbols, you will need - * to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing - * "make World" the first time). - */ - -#define ImakeConfigRelease 6 - -#define YES 1 -#define NO 0 - -/* Ensure that "all" is the default target in the Makefile. */ -all:: - -.SUFFIXES: .i - -/* Intercept clean rules for current directory */ -#undef clean -#define clean cleandir - -#include - -XCOMM ----------------------------------------------------------------------- -XCOMM site-specific configuration parameters that need to come before -XCOMM the platform-specific parameters - edit site.def to change -#define BeforeVendorCF -#include -#undef BeforeVendorCF - -#if defined(HasGcc3) && !defined(HasGcc2) -# define HasGcc2 HasGcc3 -#endif -#if defined(HasGcc2) && !defined(HasGcc) -# define HasGcc HasGcc2 -#endif - -#ifndef HasCenterLineC -#define HasCenterLineC NO -#endif -#ifndef HasCenterLineCplusplus -#define HasCenterLineCplusplus NO -#endif - -#ifndef HasClearmake -# define HasClearmake NO -#endif - -#ifndef ProPoliceSupport -#define ProPoliceSupport NO -#endif - -/* - * ClearmakeOSName - insert the current OS type into the clearmake - * build script, so .o files from different platforms cannot be winked in. - * If clearmake finds the build script for two .o files is the same, it - * will share the .o, even across different architectures. Inserting the - * O/S name into the build script in a comment prevents unwanted sharing. - * Note the trailing double-@ in the macro: end a line using this macro - * with backslash without the double-@ usually used. - * Like this: - * - * #define SomeRule() @@\ - * something or other @@\ - * ClearmakeOSName \ - * something else @@\ - * and more - */ -#ifndef ClearmakeOSName -# if HasClearmake -# define ClearmakeOSName @ XCOMM $(OSNAME) @@ -# else -# define ClearmakeOSName /**/ -# endif -#endif - -#if HasClearmake -# ifndef MakeCmd -# define MakeCmd clearmake -# endif -#endif - -#if HasClearmake -XCOMM ---------------------------------------------------------------------- -.c.o: - ClearmakeOSName $(CC) -c $(CFLAGS) $*.c -#endif - -XCOMM ---------------------------------------------------------------------- -XCOMM platform-specific configuration parameters - edit MacroFile to change -#include MacroIncludeFile - -XCOMM ---------------------------------------------------------------------- -XCOMM site-specific configuration parameters that go after -XCOMM the platform-specific parameters - edit site.def to change -#define AfterVendorCF -#include -#undef AfterVendorCF - -/* - * defaults for various generic parameters; set in site.def if needed - */ - -/* the following are needed before we can include Imake.rules */ - -#ifndef NothingOutsideProjectRoot -#define NothingOutsideProjectRoot NO -#endif - -#ifndef RemoveObsoleteFiles -#define RemoveObsoleteFiles YES -#endif - -#ifndef HasVarDirectory -#define HasVarDirectory YES -#endif -#ifndef UseEtcX11 -#define UseEtcX11 YES -#endif -#ifndef UseInstalledX11 -# define UseInstalledX11 NO -#endif -#ifdef UseInstalled -# undef UseInstalledX11 -# define UseInstalledX11 YES -#endif -#if NothingOutsideProjectRoot -#undef UseEtcX11 -#define UseEtcX11 NO -#endif -#ifndef UseSeparateConfDir -#define UseSeparateConfDir (UseEtcX11 || HasVarDirectory) -#endif -#if NothingOutsideProjectRoot -#undef UseSeparateConfDir -#define UseSeparateConfDir NO -#endif -#ifndef SystemV -#define SystemV NO /* SYSV (R3) */ -#endif -#ifndef SystemV4 -#define SystemV4 NO /* SVR4 */ -#endif -#ifndef HasCodeCenter -#define HasCodeCenter NO -#endif -#ifndef HasSentinel -#define HasSentinel NO -#endif -#ifndef HasPurify -#define HasPurify NO -#endif -#ifndef HasTestCenter -#define HasTestCenter NO -#endif -#ifndef HasGnuMake -#define HasGnuMake NO -#endif -/* - * The following fixes a glitch with GNU make -j - */ -#ifndef ForceServerRemake -#define ForceServerRemake HasGnuMake -#endif -#ifndef HasBsdMake -#define HasBsdMake NO -#endif -#ifndef HasParallelMake -#define HasParallelMake NO -#endif -#ifndef RemoveTargetProgramByMoving -#define RemoveTargetProgramByMoving NO -#endif -#ifndef DoRanlibCmd -#if SystemV || SystemV4 -#define DoRanlibCmd NO -#else -#define DoRanlibCmd YES -#endif -#endif -#ifndef ExecableScripts -#if SystemV -#define ExecableScripts NO -#else -#define ExecableScripts YES /* kernel exec() can handle #! */ -#endif -#endif - -#ifndef HasMakefileSafeInclude /* -include or sinclude in a Makefile */ -#if HasClearmake || HasBsdMake -#define HasMakefileSafeInclude YES -#else -#define HasMakefileSafeInclude NO /* see also vendor-specific .cf files */ -#endif -#endif - -#ifndef HasSymLinks -#define HasSymLinks YES -#endif - -#ifndef HasPerl -#define HasPerl YES -#endif - -#ifndef HasPerl5 -#define HasPerl5 HasPerl -#endif - -#ifndef PerlCmd -#define PerlCmd perl -#endif - -#ifndef PerlOptions -#define PerlOptions /**/ -#endif - -#ifndef PerlEnvSetup -#define PerlEnvSetup env LC_ALL=C -#endif - -#ifndef HasGperf -#define HasGperf NO -#endif - -#ifndef GperfCmd -#define GperfCmd gperf -#endif - -#ifndef RmanCmd -#endif - -#ifndef RmanOptions -#endif - -#ifndef BuildHtmlManPages -#ifdef RmanCmd -#define BuildHtmlManPages YES -#else -#define BuildHtmlManPages NO -#endif -#endif -/* Can't do this while bootstrapping imake */ -#ifdef BootStrap -#undef BuildHtmlManPages -#define BuildHtmlManPages NO -#endif - -#ifndef DontPreprocessManPages -#ifdef UseInstalled -#define DontPreprocessManPages YES -#else -#define DontPreprocessManPages NO -#endif -#endif - -#ifndef CompressManPages -#define CompressManPages NO -#endif - -#ifndef HasGroff -#define HasGroff NO -#endif -#ifndef HasGroffHtml -#define HasGroffHtml NO -#endif - -#ifndef HasCookieMaker -#define HasCookieMaker NO -#endif - -#ifndef StripInstalledPrograms -#define StripInstalledPrograms NO /* leave symbol table just in case */ -#endif -#ifndef StaticNeedsPicForShared -#define StaticNeedsPicForShared NO -#endif - -#include - -#ifndef HasSharedLibraries -#define HasSharedLibraries NO -#endif -#ifndef OSMajorVersion -#define OSMajorVersion 0 -#endif -#ifndef OSMinorVersion -#define OSMinorVersion 0 -#endif -#ifndef OSTeenyVersion -#define OSTeenyVersion 0 -#endif -#ifndef UnalignedReferencesAllowed -#define UnalignedReferencesAllowed NO /* if arbitrary deref is okay */ -#endif -#ifndef AvoidNullMakeCommand -#if !HasBsdMake -#define AvoidNullMakeCommand NO -#else -#define AvoidNullMakeCommand YES -#endif -#endif -#if AvoidNullMakeCommand -#ifndef NullMakeCommand -#define NullMakeCommand @ echo -n -#endif -/* - * An obscure bug in BSD4.3's original make causes it not to recognize a - * macro definition if the macro name starts with a non-alpha and in - * column one. - */ - _NULLCMD_ = NullMakeCommand -#endif - -#ifndef CrossCompiling -#define CrossCompiling NO -#undef CrossCompileDir -#endif -#ifndef BourneShell /* to force shell in makefile */ -#define BourneShell /bin/sh -#endif -#ifndef ConstructMFLAGS -#if SystemV -#define ConstructMFLAGS YES /* build MFLAGS from MAKEFLAGS */ -#else -#define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */ -#endif -#endif - -#ifndef ConstructMAKEFLAGS /* needed on old BSD-based? */ -#define ConstructMAKEFLAGS NO /* build MAKEFLAGS from MFLAGS */ -#endif - -#ifndef HasLargeTmp -#define HasLargeTmp NO /* be paranoid */ -#endif - -#ifndef HasMotif -#define HasMotif NO -#endif -#ifndef HasMotif2 -#define HasMotif2 NO /* only if system has working Motif2 or OpenMotif */ -#endif -#ifndef HasBSDAuth -#define HasBSDAuth NO -#endif - -#ifndef HasBSD44Sockets -#define HasBSD44Sockets NO -#endif -#ifndef HasSockets -#define HasSockets YES -#endif -#ifndef HasPoll -#if SystemV || SystemV4 -#define HasPoll YES -#else -#define HasPoll NO -#endif -#endif -#ifndef HasVFork -#if SystemV -#define HasVFork NO /* not yet... */ -#else -#define HasVFork YES -#endif -#endif -#ifndef HasSetProcTitle -#define HasSetProcTitle NO -#endif -#ifndef HasSetUserContext -#define HasSetUserContext NO -#endif -#ifndef HasLibCrypt -#define HasLibCrypt NO -#endif -#ifndef HasPutenv -#define HasPutenv NO /* assume not */ -#endif -/* setenv(3) and unsetenv(3) */ -#ifndef HasSetenv -#define HasSetenv YES /* assume yes */ -#endif -#ifndef HasVoidSignalReturn -#define HasVoidSignalReturn YES /* assume yes */ -#endif -#ifndef HasBsearch -#define HasBsearch YES /* assume yes */ -#endif -#ifndef HasSnprintf -#define HasSnprintf NO /* assume not */ -#endif -#ifndef HasStrlcat -#define HasStrlcat NO /* assume not */ -#endif -#ifndef HasReallocarray -#define HasReallocarray NO /* assume not */ -#endif -#ifndef HasDlopen -#define HasDlopen NO /* assume not */ -#endif -#ifndef HasWeakSymbols -#define HasWeakSymbols NO /* assume not */ -#endif -#ifndef HasIssetugid -#define HasIssetugid NO /* assume not */ -#endif -#ifndef HasGetresuid -#define HasGetresuid NO /* assume not */ -#endif -#ifndef HasMkstemp -#define HasMkstemp NO /* assume not */ -#endif -#ifndef HasUsableFileMmap -#define HasUsableFileMmap NO /* assume not */ -#endif -#ifndef HasGetIfAddrs -#define HasGetIfAddrs NO /* assume not */ -#endif -#ifndef HasStickyDirBit -#define HasStickyDirBit YES -#endif -#ifndef HasFchown -#define HasFchown YES -#endif -#ifndef HasPam -#define HasPam NO -#endif -#ifndef HasPamMisc -#define HasPamMisc NO -#endif -#ifndef HasGetpeereid -#define HasGetpeereid NO -#endif -#ifndef HasGetpeerucred -#define HasGetpeerucred NO -#endif -#ifndef NoStrstr -#define NoStrstr NO -#endif -#ifndef HasShadowPasswd -#define HasShadowPasswd NO -#endif -#ifndef HasBasename -#define HasBasename YES -#endif -#ifndef HasTimingsafeMemcmp -#define HasTimingsafeMemcmp NO /* assume not */ -#endif -#ifndef HasGetopt -# if !defined(Win32Architecture) -# define HasGetopt YES -# else -# define HasGetopt NO -# endif -#endif -#ifndef HasGetoptLong -# define HasGetoptLong NO -#endif -/* byte-order defaults */ -#ifndef ByteOrder -#if defined(VaxArchitecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(MipsArchitecture) && defined(MipselArchitecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(MipsArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(i386Architecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(ia64Architecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(AMD64Architecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(SparcArchitecture) || defined(Sparc64Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(AlphaArchitecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(Mc68000Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Mc68020Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Mc88000Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(s390Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(s390xArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Arm32ebArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Arm32Architecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(Arm64ebArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Arm64Architecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(RsArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(PpcArchitecture) || defined(Ppc64Architecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(Ppc64LeArchitecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(HPArchitecture) -#define ByteOrder X_BIG_ENDIAN -#elif defined(SuperHArchitecture) -#define ByteOrder X_LITTLE_ENDIAN -#elif defined(SuperHebArchitecture) -#define ByteOrder X_BIG_ENDIAN -#endif -#endif /* ByteOrder */ -X_BYTE_ORDER = ByteOrder - -#ifndef HasFortran -#define HasFortran NO -#endif -#ifndef HasGcc2ForCplusplus -#define HasGcc2ForCplusplus NO -#endif -#ifndef HasCplusplus -#if HasGcc2ForCplusplus -#define HasCplusplus YES -#else -#define HasCplusplus NO -#endif -#endif -#ifndef HasMktemp -#define HasMktemp NO /* if you have the mktemp command */ -#endif -#ifndef HasSecureRPC -#define HasSecureRPC NO /* if you have Secure RPC */ -#endif -#ifndef HasLatex -#define HasLatex NO -#endif -#ifndef HasShm -#if SystemV || SystemV4 -#define HasShm YES -#else -#define HasShm NO -#endif -#endif -#ifndef HasLegacyXextProto -#define HasLegacyXextProto NO -#endif -#ifndef HasCbrt -#define HasCbrt YES -#endif -#ifndef HasFfs -#define HasFfs YES -#endif -#ifndef HasXfont2 -#define HasXfont2 NO -#endif -#ifndef HasLegacyXfont1 -#define HasLegacyXfont1 NO -#endif -#ifndef UseTIRPC -#define UseTIRPC NO -#endif -#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */ -#define GzipLibrary -lz -#endif -#ifndef UseGnuMalloc -#define UseGnuMalloc NO -#endif -#ifndef GnuMallocLibrary -#define GnuMallocLibrary -lgmalloc -#endif -#ifndef MallocLibraries -#if UseGnuMalloc -#define MallocLibraries GnuMallocLibrary -#else -#define MallocLibraries /**/ -#endif -#endif -#ifndef HasPosixRegex /* Most modern platforms have it */ -#define HasPosixRegex YES -#endif -#ifndef RegexLibrary -#if HasPosixRegex -#define RegexLibrary /**/ -#else -#define RegexLibrary -lregex -#endif -#endif -#ifndef HasNCurses -#define HasNCurses NO -#endif -#ifndef NCursesLibName -#if HasNCurses -#define NCursesLibName -lncurses -#else -#define NCursesLibName -#endif -#endif -#ifdef NCursesLibDir -NCURSESLIBDIR = NCursesLibDir -#endif -#ifdef NCursesIncDir -NCURSESINCDIR = NCursesIncDir -#endif -#ifndef HasTk -#define HasTk NO -#endif -#ifndef TkLibName -#if HasTk -#define TkLibName tk -#else -#define TkLibName -#endif -#endif -TKLIBNAME = TkLibName -#ifndef TkLibDir -#if HasTk -#define TkLibDir /usr/local/lib -#else -#define TkLibDir -#endif -#endif -TKLIBDIR = TkLibDir -#ifndef TkIncDir -#if HasTk -#define TkIncDir /usr/local/include -#else -#define TkIncDir -#endif -#endif -#ifndef TkLibrary -#ifdef HasTk -#define TkLibrary Concat(-L,$(TKLIBDIR)) Concat(-l,$(TKLIBNAME)) -#else -#define TkLibrary -#endif -#endif -#ifndef HasTcl -#define HasTcl NO -#endif -#ifndef TclLibName -#if HasTcl -#define TclLibName tcl -#else -#define TclLibName -#endif -#endif -TCLLIBNAME = TclLibName -#ifndef TclLibDir -#if HasTcl -#define TclLibDir /usr/local/lib -#else -#define TclLibDir -#endif -#endif -TCLIBDIR = TclLibDir -#ifndef TclIncDir -#if HasTcl -#define TclIncDir /usr/local/include -#else -#define TclIncDir -#endif -#endif -#ifndef TclLibrary -#ifdef HasTcl -#define TclLibrary Concat(-L,$(TCLLIBDIR)) Concat(-l,$(TCLLIBNAME)) -#else -#define TclLibrary -#endif -#endif -#ifndef HasTsLib -#define HasTsLib NO -#endif -/* - * Libtool has two different behaviours for version numbers. - * On platforms which support a minor number, the library - * version is (version - minor).minor, on those that don't, - * the version if version.0. Linux and Darwin support minor - * numbers; some BSDs do as well. Set this to YES if libtool - * uses minor numbers on your platform. - */ -#ifndef LibtoolMinorVersions -#define LibtoolMinorVersions NO -#endif -#ifndef NeedConstPrototypes -#define NeedConstPrototypes NO -#endif -#ifndef NeedVarargsPrototypes -#define NeedVarargsPrototypes NO -#endif -#ifndef NeedNestedPrototypes -#define NeedNestedPrototypes NO -#endif -#ifndef NeedFunctionPrototypes -#define NeedFunctionPrototypes (NeedVarargsPrototypes || NeedNestedPrototypes) -#endif -#ifndef NeedWidePrototypes -#define NeedWidePrototypes YES /* mix and match ANSI-C, non-ANSI */ -#endif - -#ifndef UseCCMakeDepend /* use slow cc -E script */ -#define UseCCMakeDepend NO -#endif -#ifndef UseGccMakeDepend /* use slowish but correct gcc -M */ -#define UseGccMakeDepend NO -#endif - -#ifndef CaseSensitiveFileSystem -#define CaseSensitiveFileSystem YES -#endif - -/* DefaultUsrBin is independent of ProjectRoot. - This is a directory where programs will be found even if PATH - is not set, for example when coming in remotely via rsh. */ -#ifndef DefaultUsrBin -#define DefaultUsrBin /usr/bin -#endif - -#ifndef LibDirName -# define LibDirName lib -#endif - -#ifndef UsrLibDir -#ifdef ProjectRoot -#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx/X11) -#ifndef AlternateUsrLibDir -#define AlternateUsrLibDir YES -#endif -#else -#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) -#ifndef AlternateUsrLibDir -#define AlternateUsrLibDir NO -#endif -#endif -#else -#ifndef AlternateUsrLibDir -#define AlternateUsrLibDir YES -#endif -#endif - -#ifndef UsrDataDir -#ifdef ProjectRoot -#define UsrDataDir Concat4(ProjectRoot,/,share,/nx) -#ifndef AlternateUsrDataDir -#define AlternateUsrDataDir YES -#endif -#else -#define UsrDataDir Concat4(/usr/local,/,share,/nx) -#ifndef AlternateUsrDataDir -#define AlternateUsrDataDir NO -#endif -#endif -#else -#ifndef AlternateUsrDataDir -#define AlternateUsrDataDir YES -#endif -#endif - -#ifndef VarDirectory -#ifdef ProjectVar -#define VarDirectory ProjectVar -#else -#define VarDirectory /var -#endif -#endif -#ifndef VarLibDir -#define VarLibDir $(VARDIR)/lib -#endif - -/* - * SystemUsrLibDir is independent of ProjectRoot. It is used primarily - * to allow links for shared libraries in /usr/lib for compliance to - * various standards (e.g., Linux/OpenGL). - */ -#ifndef SystemUsrLibDir -#define SystemUsrLibDir /usr/LibDirName -#endif -#ifndef SystemUsrIncDir -#define SystemUsrIncDir /usr/include -#endif -#ifndef SystemXkbConfigDir -#define SystemXkbConfigDir /usr/share/X11/xkb -#endif -#ifndef SystemXkbBinDir -#define SystemXkbBinDir /usr/bin -#endif - -#ifndef SystemFontDir -#define SystemFontDir /usr/share/fonts/X11 -#endif - -#ifndef ShLibDir -#define ShLibDir UsrLibDir -#endif -#ifndef IncRoot -#ifdef ProjectRoot -#define IncRoot Concat(ProjectRoot,/include/nx) -#ifndef AlternateIncRoot -#define AlternateIncRoot YES -#endif -#else -#define IncRoot /usr/include -#ifndef AlternateIncRoot -#define AlternateIncRoot NO -#endif -#endif -#else -#ifndef AlternateIncRoot -#define AlternateIncRoot YES -#endif -#endif -#ifndef LintlibDir -#define LintlibDir $(USRLIBDIR)/lint -#endif -#ifndef SystemManDirectory -#if SystemV4 -#define SystemManDirectory /usr/share/man -#else -#define SystemManDirectory /usr/man -#endif -#endif -#ifndef ManDirectoryRoot -#ifdef ProjectRoot -#define ManDirectoryRoot Concat(ProjectRoot,/man) -#else -#define ManDirectoryRoot SystemManDirectory -#endif -#endif -#ifndef ManPath -#define ManPath ManDirectoryRoot -#endif -#ifndef ManSourcePath -#define ManSourcePath $(MANPATH)/man -#endif -#ifndef ManDir -#define ManDir $(MANSOURCEPATH)$(MANSUFFIX) -#endif -#ifndef LibmanDir -#define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) -#endif -#ifndef FileManDir -#define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) -#endif -#ifndef MiscManDir -#define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) -#endif -#ifndef DriverManDir -#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -#endif -#ifndef AppLoadDefs -#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) -#endif -#ifndef AppManDefs -#define AppManDefs -D__appmansuffix__=$(MANSUFFIX) -#endif -#ifndef LibManDefs -#define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX) -#endif -#ifndef FileManDefs -#define FileManDefs -D__filemansuffix__=$(FILEMANSUFFIX) -#endif -#ifndef MiscManDefs -#define MiscManDefs -D__miscmansuffix__=$(MISCMANSUFFIX) -#endif -#ifndef DriverManDefs -#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX) -#endif -#ifndef AdminManDefs -#define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX) -#endif -#ifndef ProjectManDefs -#define ProjectManDefs -D__projectroot__=$(PROJECTROOT) -#endif -#ifndef XConfigFileManDefs -#define XConfigFileManDefs -D__xconfigfile__=$(XCONFIGFILE) -#endif -#ifndef XConfigDirManDefs -#define XConfigDirManDefs -D__xconfigdir__=$(XCONFIGDIR) -#endif -#ifndef XLogFileManDefs -#define XLogFileManDefs -D__xlogfile__=$(XLOGFILE) -#endif -#ifndef XServerManDefs -#define XServerManDefs -D__xservername__=$(XSERVERNAME) -#endif - -#ifndef CompressManCmd -#define CompressManCmd gzip -n -#endif - -#ifndef HtmlIndexCmd -#if BuildHtmlManPages -#define HtmlIndexCmd $(MKHTMLINDEX) -#endif -#endif - -#ifndef LogDirectory -#if HasVarDirectory -#define LogDirectory $(VARDIR)/log -#else -#define LogDirectory /usr/adm -#endif -#endif - -#ifndef HasVarRun -#define HasVarRun NO -#endif - -#ifndef VarRunDirectory -#if HasVarRun -#define VarRunDirectory $(VARDIR)/run -#endif -#endif - -#ifndef HasVarDb -#define HasVarDb NO -#endif - -#ifndef VarDbDirectory -#if HasVarDb -#define VarDbDirectory $(VARDIR)/db -#endif -#endif - -#ifndef ConfigSrc -#define ConfigSrc $(TOP)/config -#endif -#ifndef DependDir -#if UseCCMakeDepend || UseGccMakeDepend -#define DependDir $(CONFIGSRC)/util -#else -#define DependDir $(CONFIGSRC)/makedepend -#endif -#endif -#ifndef UNCOMPRESSPATH -#define UNCOMPRESSPATH /usr/ucb/uncompress /* obsolete */ -#endif -#ifndef OptimizedCDebugFlags -#define OptimizedCDebugFlags -O -#endif -#ifndef OptimizedCplusplusDebugFlags -#define OptimizedCplusplusDebugFlags OptimizedCDebugFlags -#endif -#ifndef DebuggableCDebugFlags -#define DebuggableCDebugFlags -g -#endif -#ifndef DebuggableCplusplusDebugFlags -#define DebuggableCplusplusDebugFlags DebuggableCDebugFlags -#endif -#ifndef ProfiledCDebugFlags -#define ProfiledCDebugFlags -pg -#endif -#ifndef ProfiledCplusplusDebugFlags -#define ProfiledCplusplusDebugFlags ProfiledCDebugFlags -#endif -#ifndef NoOpCDebugFlags -#define NoOpCDebugFlags /**/ -#endif -#ifndef DefaultCDebugFlags -#define DefaultCDebugFlags OptimizedCDebugFlags -#endif -#ifndef DefaultCplusplusDebugFlags -#define DefaultCplusplusDebugFlags OptimizedCplusplusDebugFlags -#endif -#ifndef DefaultCCOptions -#define DefaultCCOptions /* floating point, etc. */ -#endif -#ifndef DefaultCplusplusOptions -#define DefaultCplusplusOptions /* floating point, etc. */ -#endif -#ifndef HardCodeLibdirFlag -#define HardCodeLibdirFlag /**/ -#endif -#ifndef NoRConst -#define NoRConst NO /* YES if const for structs of funcs is bad */ -#endif -#ifndef InstPgmFlags -# if CrossCompiling -# define InstPgmFlags -# else -# define InstPgmFlags -s -# endif -#endif -#ifndef InstBinFlags -#define InstBinFlags -m 0755 -#endif -#ifndef InstUidFlags -#define InstUidFlags -m 4711 -#endif -#ifndef InstLibFlags -#define InstLibFlags -m 0644 -#endif -#ifndef InstIncFlags -#define InstIncFlags -m 0444 -#endif -#ifndef InstManFlags -#define InstManFlags -m 0444 -#endif -#ifndef InstDatFlags -#define InstDatFlags -m 0444 -#endif -#ifndef InstKmemFlags /* put -g kmem -m 2711 in site.def... */ -#define InstKmemFlags InstUidFlags -#endif -#ifndef ParallelMakeFlags -#define ParallelMakeFlags /**/ -#endif -#ifndef ArCmdBase -#define ArCmdBase ar -#endif -#ifndef ArCmd -#if HasLargeTmp || SystemV4 -#define ArCmd ArCmdBase cq -#else -#define ArCmd ArCmdBase clq -#endif -#endif -#ifndef ArAddCmd -#if HasLargeTmp || SystemV4 -#define ArAddCmd ArCmdBase ru -#else -#define ArAddCmd ArCmdBase rul -#endif -#endif -#ifndef ArExtCmd -#if HasLargeTmp || SystemV4 -#define ArExtCmd ArCmdBase x -#else -#define ArExtCmd ArCmdBase xl -#endif -#endif -#ifndef BootstrapCFlags -#define BootstrapCFlags /**/ -#endif -#ifndef HasGcc3 -#define HasGcc3 NO -#endif -#ifndef HasGcc2 -#define HasGcc2 HasGcc3 -#endif -#ifndef HasGcc -#define HasGcc HasGcc2 -#endif -#ifndef HasIntelC -#define HasIntelC NO -#endif -#ifndef HasSunC -#define HasSunC NO -#endif -#ifndef HasBrokenCCForLink -#define HasBrokenCCForLink NO -#endif -#ifndef CcCmd -#if HasGcc2 -#define CcCmd gcc -fpcc-struct-return -#else -#if HasGcc -#define CcCmd gcc -fstrength-reduce -fpcc-struct-return -#else -#if HasCenterLineC -#define CcCmd clcc -#else -#define CcCmd cc -#endif -#endif -#endif -#endif -#ifndef CplusplusCmd -#if HasGcc2ForCplusplus -#define CplusplusCmd g++ -#else -#define CplusplusCmd CC -#endif -#endif -#ifndef CplusplusFilt -# define CplusplusFilt c++filt -#endif -#ifndef CplusplusLibC -#if HasGcc2ForCplusplus -#define CplusplusLibC -lstdc++ -#else -#define CplusplusLibC /**/ -#endif -#endif -#ifndef CplusplusStandardDefines -#define CplusplusStandardDefines StandardDefines -#endif -#ifndef CplusplusExtraDefines -#define CplusplusExtraDefines /**/ -#endif -#ifndef CplusplusExtraIncludes -#define CplusplusExtraIncludes /**/ -#endif -#ifndef CplusplusDependIncludes -#define CplusplusDependIncludes /**/ -#endif -#ifndef CplusplusOptions -#define CplusplusOptions DefaultCplusplusOptions -#endif -#ifndef CplusplusSpecialOptions -#define CplusplusSpecialOptions /**/ -#endif -#if HasFortran -#ifndef FortranCmd -#define FortranCmd f77 -#endif -#ifndef FortranFlags -#define FortranFlags /**/ -#endif -#ifndef FortranDebugFlags /* for -O or -g */ -#define FortranDebugFlags /**/ -#endif -#endif -#ifndef AsCmd -#define AsCmd as -#endif -#ifndef AsmDefines -#define AsmDefines /**/ -#endif -#ifndef CompressCmd -#define CompressCmd compress -#endif -#ifndef GzipCmd -#define GzipCmd gzip -#endif -#ifndef CppCmd -#define CppCmd /LibDirName/cpp -#endif -#ifndef RawCppCmd -#define RawCppCmd CppCmd -undef -#endif -#ifndef CppNoLineInfoOption -#define CppNoLineInfoOption /**/ -#endif -#ifndef PreProcessCmd -#define PreProcessCmd CcCmd -E -#endif -#ifndef InstallCmd /* hack should be in project */ -#if SystemV || SystemV4 -#ifdef UseInstalled /* assume BINDIR in path */ -#define InstallCmd bsdinst -#else -#define InstallCmd $(SHELL) $(CONFIGSRC)/util/bsdinst.sh -#endif -#else -#define InstallCmd install -#endif -#endif -#ifndef InstallFlags -#define InstallFlags -c -#endif -#ifndef StripCmd -#define StripCmd strip -#endif -#ifndef LdCmd -#define LdCmd ld -#endif -#ifndef M4Cmd -#define M4Cmd m4 -#endif -#ifndef M4Flags -#define M4Flags /**/ -#endif -#ifndef LexCmd -#define LexCmd lex -#endif -#ifndef LexLib -#define LexLib -ll -#endif -#ifndef HasFlex -#define HasFlex NO -#endif -#ifndef YaccCmd -#define YaccCmd yacc -#endif -#ifndef CplusplusYaccCmd -#define CplusplusYaccCmd YaccCmd -#endif -#ifndef LintCmd -#define LintCmd lint -#endif -#ifndef LintLibFlag -#if SystemV || SystemV4 -#define LintLibFlag -o -#else -#define LintLibFlag -C -#endif -#endif -#ifndef LintOpts -#if SystemV || SystemV4 -#define LintOpts -bh -#else -#define LintOpts -axz -#endif -#endif -#ifndef CpCmd -#define CpCmd cp -#endif -#ifndef LnCmd /* can use cp instead of ln if necessary */ -#if HasSymLinks -#define LnCmd ln -s -#else -#define LnCmd ln -#endif -#endif -#ifndef MakeCmd -#define MakeCmd make -#endif -#ifndef MvCmd -#define MvCmd mv -f -#endif -#ifndef RanlibCmd -#define RanlibCmd ranlib -#endif -#ifndef RanlibInstFlags -#define RanlibInstFlags /**/ -#endif -#ifndef RmCmd -#define RmCmd rm -f -#endif - -/* - * Module cross-compile stuff. By default they are defined to be exactly the - * same as the non-module versions. - */ -#ifndef ModuleCcCmd -#define ModuleCcCmd CcCmd -#endif -#ifndef ModuleCppCmd -#define ModuleCppCmd CppCmd -#endif -#ifndef ModuleCFlags -#define ModuleCFlags $(CFLAGS) -#endif -#ifndef ModuleAsCmd -#define ModuleAsCmd AsCmd -#endif -#ifndef ModuleAsFlags -#define ModuleAsFlags /**/ -#endif -#ifndef ModuleLdCmd -#define ModuleLdCmd LdCmd -#endif -#ifndef ModuleLdFlags -#define ModuleLdFlags /**/ -#endif -#ifndef ModuleLdCombineFlags -#define ModuleLdCombineFlags LdCombineFlags -#endif -#ifndef ModuleArCmd -#define ModuleArCmd ArCmd -#endif -#ifndef NeedModuleRanlib -#define NeedModuleRanlib NO -#endif -#ifndef ModuleRanlibCmd -#define ModuleRanlibCmd RanlibCmd -#endif - -#ifndef HostCcCmd -#define HostCcCmd cc -#endif -#ifndef StandardIncludes /* for platform-specifics */ -#define StandardIncludes /**/ -#endif -#ifndef StandardDefines -#if SystemV -#define StandardDefines -DSYSV -#else -#if SystemV4 -#define StandardDefines -DSVR4 -#else -#define StandardDefines /**/ -#endif -#endif -#endif -#ifndef StandardCppOptions -#define StandardCppOptions /**/ -#endif -#ifndef StandardCppDefines -#define StandardCppDefines StandardCppOptions StandardDefines -#endif -#ifndef Malloc0ReturnsNull -#if UseGnuMalloc -#define Malloc0ReturnsNull YES -#else -#define Malloc0ReturnsNull NO -#endif -#endif -#if Malloc0ReturnsNull -#ifndef Malloc0ReturnsNullDefines -#define Malloc0ReturnsNullDefines -DMALLOC_0_RETURNS_NULL -#endif -#endif -#ifndef ToolkitStringsABIOptions -#define ToolkitStringsABIOptions /**/ -#endif -#ifndef HasSetitimer -#define HasSetitimer YES -#endif -#ifndef HasSetitimerDefines -#define HasSetitimerDefines -DHAVE_SETITIMER=1 -#endif -#ifndef HasLdRunPath -#define HasLdRunPath NO -#endif -#ifndef LdPreLib -# if !defined(UseInstalled) -# define LdPreLib -L$(BUILDLIBDIR) -# else -# if AlternateUsrLibDir -# define LdPreLib -L$(USRLIBDIR) -# else -# define LdPreLib /**/ -# endif -#endif -#endif -#ifndef LdPostLib -#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath && !defined(CrossCompileDir) -#define LdPostLib -L$(USRLIBDIR) -#else -#define LdPostLib /**/ -#endif -#endif -#ifndef MathLibrary -#define MathLibrary -lm -#endif -#ifndef DlLibrary -#define DlLibrary -ldl -#endif -#ifndef ExtraLibraries -#if SystemV4 -#if HasSockets -#define ExtraLibraries -lsocket -lnsl -lw -#else -#define ExtraLibraries -lnsl -lw -#endif -#else -#define ExtraLibraries /**/ -#endif -#endif -#ifndef ExtraLoadOptions -#define ExtraLoadOptions /**/ -#endif -#ifndef ExtraLoadFlags -#define ExtraLoadFlags /**/ -#endif -#ifndef LdCombineFlags -#if SystemV4 -#define LdCombineFlags -r -#else -#define LdCombineFlags -X -r -#endif -#endif -#ifndef LdStripFlags -#define LdStripFlags -x -#endif -#ifndef TagsCmd -#define TagsCmd ctags -#endif -#ifndef LoaderLibPrefix -#define LoaderLibPrefix /**/ -#endif -#ifndef ImakeCmd -#define ImakeCmd imake -#endif -#ifndef ImakeWarningFlags -#define ImakeWarningFlags /* Nothing */ -#endif -#ifndef DependCmd -#define DependCmd gccmakedep -#endif -#ifndef DependDefines -# if UseCCMakeDepend || UseGccMakeDepend -# define DependDefines /**/ -# else -# define DependDefines -DUSE_MAKEDEPEND -# endif -#endif -#ifndef DependFlags -#define DependFlags /**/ -#endif -#ifndef DependFileName -#if !HasBsdMake -#define DependFileName Makefile.dep -#else -#define DependFileName .depend -#endif -#endif -#ifndef ExportListCmd -# ifndef ExportListGenSource -# define ExportListCmd /**/ -# elif !defined(UseInstalled) -# define ExportListCmd $(CONFIGSRC)/util/exportlistgen -# else -# define ExportListCmd exportlistgen -# endif -#endif -#ifndef MkdirHierCmd -#ifdef UseInstalled /* assume BINDIR in path */ -#define MkdirHierCmd mkdirhier -#else -#define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh -#endif -#endif -#ifndef RevPathCmd -#ifdef UseInstalled /* assume BINDIR in path */ -#define RevPathCmd revpath -#else -#define RevPathCmd $(CONFIGSRC)/util/revpath -#endif -#endif -#ifndef TroffCmd -#if HasGroff -#define TroffCmd groff -Tps -#else -#define TroffCmd troff -Tps -#endif -#endif -#ifndef NroffCmd -#define NroffCmd nroff -#endif -#ifndef HTMLroffCmd -#if HasGroff && HasGroffHtml -#define HTMLroffCmd groff -Thtml -#endif -#endif -#ifdef HTMLroffCmd -#ifndef DocFilesToClean -#define DocFilesToClean grohtml*.png *-auto-*.png -#endif -#endif -#ifndef MsMacros -#define MsMacros -ms -#endif -#ifndef ManMacros -#define ManMacros -man -#endif -#ifndef TblCmd -#define TblCmd tbl -#endif -#ifndef EqnCmd -#define EqnCmd eqn -#endif -#ifndef NeqnCmd -#define NeqnCmd neqn -#endif -#ifndef ColCmd -#define ColCmd col -#endif -#ifndef ColFlags -#define ColFlags -b -#endif -#ifndef DvipsCmd -#define DvipsCmd dvips -#endif -#ifndef LatexCmd -#define LatexCmd latex -#endif -#ifndef HasPdfLatex -#define HasPdfLatex NO -#endif -#ifndef PdfLatexCmd -#define PdfLatexCmd pdflatex -#endif -#ifndef GhostScriptCmd -#define GhostScriptCmd gs -#endif -#ifndef HasGhostPCL -#define HasGhostPCL NO -#endif -#ifndef HasGhostScript -#define HasGhostScript NO -#endif -#ifndef BuildPDFdocs -#define BuildPDFdocs (HasGhostScript) -#endif -#if BuildPDFdocs -#define PsToPdfCmd GhostScriptCmd -q -sOutputFile=- -sDEVICE=pdfwrite -dSAFER -dNOPAUSE - -#endif -#if HasSentinel -#ifndef SentinelCmd -#define SentinelCmd sentinel -#endif -#ifndef SentinelOptions -#define SentinelOptions /**/ -#endif -#endif -#if HasPurify -#ifndef PurifyCmd -#define PurifyCmd purify -#endif -#ifndef PurifyOptions -#define PurifyOptions /**/ -#endif -#endif -#if HasTestCenter -#ifndef ProofCmd -#define ProofCmd proof -#endif -#ifndef ProofOptions -#define ProofOptions /**/ -#endif -#endif -#ifndef PathSeparator -#define PathSeparator / -#endif -#ifndef Osuf -#define Osuf o -#endif -#ifndef CCsuf -#define CCsuf cc -#endif -#ifndef SHsuf -#define SHsuf sh -#endif -#ifndef ManSuffix -#define ManSuffix n /* use just one tab or cpp will die */ -#endif -#ifndef LibManSuffix -#define LibManSuffix 3 /* use just one tab or cpp will die */ -#endif -#ifndef FileManSuffix -#if SystemV || SystemV4 -#define FileManSuffix 4 /* use just one tab or cpp will die */ -#else -#define FileManSuffix 5 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef MiscManSuffix -#if SystemV || SystemV4 -#define MiscManSuffix 5 /* use just one tab or cpp will die */ -#else -#define MiscManSuffix 7 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef DriverManSuffix -#if SystemV || SystemV4 -#define DriverManSuffix 7 /* use just one tab or cpp will die */ -#else -#define DriverManSuffix 4 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef AdminManSuffix -#if SystemV || SystemV4 -#define AdminManSuffix 1m /* use just one tab or cpp will die */ -#else -#define AdminManSuffix 8 /* use just one tab or cpp will die */ -#endif -#endif -#ifndef ExpandManNames -#if SystemV -#define ExpandManNames NO -#else -#define ExpandManNames YES -#endif -#endif -#ifndef ManSrcSuffix -#define ManSrcSuffix man -#endif -#ifndef ManNewSuffix -#define ManNewSuffix _man -#endif -#ifndef TOPDIR -#define TOPDIR . -#endif -#ifndef CURDIR -#define CURDIR . -#endif -#ifndef SiteIConfigFiles -#define SiteIConfigFiles /**/ -#endif -#ifndef OtherIConfigFiles -#define OtherIConfigFiles /**/ -#endif -#ifndef ExtraFilesToClean -#define ExtraFilesToClean /**/ -#endif -#ifndef DocFilesToClean -#define DocFilesToClean /**/ -#endif -#ifndef FilesToClean -#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut -#endif - -#ifdef CrossCompileDir -# ifndef StripPath -# define StripPath(x) `echo x|sed "s%.*/%%"` -# endif -# ifndef CrossArCmd -# define CrossArCmd Concat3(CrossCompileDir,/,StripPath(ArCmd)) -# endif -# ifndef CrossCcCmd -# define CrossCcCmd Concat3(CrossCompileDir,/,StripPath(CcCmd)) -# endif -# ifndef CrossAsCmd -# define CrossAsCmd Concat3(CrossCompileDir,/,StripPath(AsCmd)) -# endif -# ifdef HasFortran -# ifndef CrossFortranCmd -# define CrossFortranCmd Concat3(CrossCompileDir,/,StripPath(FortranCmd)) -# endif -# endif -# ifndef CrossCplusplusCmd -# define CrossCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd)) -# endif -# ifndef CrossCppCmd -# define CrossCppCmd Concat3(CrossCompileDir,/,StripPath(CppCmd)) -# endif -# ifndef CrossRawCppCmdCmd -# define CrossRawCppCmd Concat3(CrossCompileDir,/,StripPath(RawCppCmd)) -# endif -# ifndef CrossPreProcessCmd -# define CrossPreProcessCmd Concat3(CrossCompileDir,/,StripPath(PreProcessCmd)) -# endif -# ifndef CrossAsCmd -# define CrossAsCmd Concat3(CrossCompileDir,/,StripPath(AsCmd)) -# endif -# ifndef CrossLdCmd -# define CrossLdCmd Concat3(CrossCompileDir,/,StripPath(LdCmd)) -# endif -# ifndef CrossModuleLdCmd -# define CrossModuleLdCmd CrossLdCmd -# endif -# ifndef CrossLintCmd -# define CrossLintCmd Concat3(CrossCompileDir,/,StripPath(LintCmd)) -# endif -# ifndef CrossRanlibCmd -# define CrossRanlibCmd Concat3(CrossCompileDir,/,StripPath(RanlibCmd)) -# endif -# ifndef CrossModuleCcCmd -# define CrossModuleCcCmd Concat3(CrossCompileDir,/,StripPath(ModuleCcCmd)) -# endif -# ifndef CrossAsCmd -# define CrossAsCmd Concat3(CrossCompileDir,/,StripPath(AsCmd)) -# endif -# ifndef CrossStripCmd -# define CrossStripCmd Concat3(CrossCompileDir,/,StripPath(StripCmd)) -# endif -#endif - - PATHSEP = PathSeparator - SHELL = BourneShell - - TOP = TOPDIR - CURRENT_DIR = CURDIR - - IMAKE = ImakeCmd - DEPEND = DependCmd - MKDIRHIER = MkdirHierCmd - REVPATH = RevPathCmd - EXPORTLISTGEN = ExportListCmd - RMAN = RmanCmd - RMANBASENAME = HostProgramTargetName(rman) - RMANOPTIONS = RmanOptions - CONFIGSRC = ConfigSrc - IMAKESRC = $(CONFIGSRC)/imake - DEPENDSRC = DependDir - - INCROOT = IncRoot /* base of where to put header files */ - USRLIBDIR = UsrLibDir /* nonshared libraries */ - USRDATADIR = UsrDataDir /* arch-indep files (XErrorDB, etc.) */ - VARDIR = VarDirectory /* usually /var */ - VARLIBDIR = VarLibDir /* xdm runtime files */ - SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */ - SYSTEMUSRINCDIR = SystemUsrIncDir /* system's "/usr/include" */ - SYSTEMXKBCONFDIR = SystemXkbConfigDir /* system's "/usr/share/xkb" */ - SYSTEMXKBBINDIR = SystemXkbBinDir /* system's "/usr/bin" */ - SYSTEMFONTDIR = SystemFontDir /* system's "/usr/share/fonts/X11" */ - SHLIBDIR = ShLibDir /* shared libraries */ - LINTLIBDIR = LintlibDir /* lint libraries */ - MANPATH = ManPath /* top of manual page tree */ - MANSOURCEPATH = ManSourcePath /* prefix for man page sources */ - MANDIR = ManDir /* man pages for commands */ - LIBMANDIR = LibmanDir /* man pages for library routines */ - FILEMANDIR = FileManDir /* man pages for config files */ - MISCMANDIR = MiscManDir /* man pages for miscellaneous files */ - DRIVERMANDIR = DriverManDir /* man pages for drivers */ - LOGDIRECTORY = LogDirectory /* OS location of log files */ -#ifdef VarRunDirectory - VARRUNDIR = VarRunDirectory /* OS location of PID files */ -#endif -#ifdef VarDbDirectory - VARDBDIR = VarDbDirectory /* OS location of db/state files */ -#endif -#ifdef CrossCompileDir - AR = CrossArCmd -#else - AR = ArCmd -#endif -XCOMM Nice try but useless: make will inherit BOOTSTRAPCFLAGS -XCOMM from top Makefile - BOOTSTRAPCFLAGS = BootstrapCFlags /* set if cpp does not have uniq sym */ -#ifdef CrossCompileDir - CC = CrossCcCmd - AS = CrossAsCmd -#else - CC = CcCmd - AS = AsCmd -#endif -#if HasFortran -# ifdef CrossCompileDir - FC = CrossFortranCmd -# else - FC = FortranCmd -# endif - FDEBUGFLAGS = FortranDebugFlags - FCFLAGS = FortranFlags $(FDEBUGFLAGS) -#endif -#if HasCplusplus - -.SUFFIXES: Concat(.,CCsuf) - -#ifdef CrossCompileDir - CXX = CrossCplusplusCmd -#else - CXX = CplusplusCmd -#endif - CXXFILT = CplusplusFilt -#ifdef CplusplusLibCDir - CXXLIBDIR = CplusplusLibCDir - CXXLIB = -L$(CXXLIBDIR) CplusplusLibC -#else - CXXLIB = CplusplusLibC -#endif - - CXXDEBUGFLAGS = DefaultCplusplusDebugFlags -CXXDEPENDINCLUDES = CplusplusDependIncludes - CXXEXTRA_DEFINES = CplusplusExtraDefines -CXXEXTRA_INCLUDES = CplusplusExtraIncludes - CXXSTD_DEFINES = CplusplusStandardDefines $(CXXPROJECT_DEFINES) - CXXOPTIONS = CplusplusOptions - CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) - CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -#endif - COMPRESS = CompressCmd - GZIPCMD = GzipCmd -#ifdef CrossCompileDir - CPP = CrossCppCmd $(STD_CPP_DEFINES) - RAWCPP = CrossRawCppCmd $(STD_CPP_OPTIONS) - PREPROCESSCMD = CrossPreProcessCmd $(STD_CPP_DEFINES) -#else - CPP = CppCmd $(STD_CPP_DEFINES) /* simple filters */ - RAWCPP = RawCppCmd $(STD_CPP_OPTIONS) - PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES) /* preferred; mdep */ -#endif - INSTALL = InstallCmd - INSTALLFLAGS = InstallFlags -#ifdef CrossCompileDir - LD = CrossLdCmd -#else - LD = LdCmd -#endif - LEX = LexCmd - M4 = M4Cmd - M4FLAGS = M4Flags - LEXLIB = LexLib - YACC = YaccCmd - CCYACC = CplusplusYaccCmd -#ifdef CrossCompileDir - LINT = CrossLintCmd -#else - LINT = LintCmd -#endif - LINTLIBFLAG = LintLibFlag - LINTOPTS = LintOpts - LN = LnCmd - MAKE = MakeCmd - MV = MvCmd - CP = CpCmd -#if DoRanlibCmd -#ifdef CrossCompileDir - RANLIB = CrossCompileDir/RanlibCmd -#else - RANLIB = RanlibCmd -#endif - RANLIBINSTFLAGS = RanlibInstFlags -#endif - RM = RmCmd - PERL = PerlCmd - PERLOPTS = PerlOptions - PERLENVSETUP = PerlEnvSetup - MANSUFFIX = ManSuffix /* suffix for command man pages */ - LIBMANSUFFIX = LibManSuffix /* suffix for library man pages */ - FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */ - MISCMANSUFFIX = MiscManSuffix /* suffix for misc man pages */ - DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ - ADMINMANSUFFIX = AdminManSuffix /* suffix for admin command man pages */ - MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ - MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ - MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS) - - COMPRESSMANCMD = CompressManCmd - - TROFF = TroffCmd - NROFF = NroffCmd -#ifdef HTMLroffCmd - HTMLROFF = HTMLroffCmd -#endif -#ifdef PsToPdfCmd - PSTOPDFCMD = PsToPdfCmd -#endif - MSMACROS = MsMacros - MANMACROS = ManMacros - TBL = TblCmd - EQN = EqnCmd - NEQN = NeqnCmd - COL = ColCmd - COLFLAGS = ColFlags -#ifdef CrossCompileDir - MODCC = CrossModuleCcCmd -#else - MODCC = ModuleCcCmd -#endif - MODCPP = ModuleCppCmd - MODCFLAGS = ModuleCFlags - MODAS = ModuleAsCmd - MODASFLAGS = ModuleAsFlags -#ifdef CrossCompileDir - MODLD = CrossModuleLdCmd -#else - MODLD = ModuleLdCmd -#endif - MODLDFLAGS = ModuleLdFlags -MODLDCOMBINEFLAGS = ModuleLdCombineFlags - MODAR = ModuleArCmd -#ifdef CrossCompileDir - MODRANLIB = CrossCompileDir/ModuleRanlibCmd -#else - MODRANLIB = ModuleRanlibCmd -#endif -#if HasLatex - DVIPS = DvipsCmd - LATEX = LatexCmd -#endif -#if HasPdfLatex - PDFLATEXCMD = PdfLatexCmd -#endif -#if HasSentinel - SENTINEL = SentinelCmd - SENTINELOPTIONS = SentinelOptions -#endif -#if HasPurify - PURIFY = PurifyCmd - PURIFYOPTIONS = PurifyOptions -#endif -#if HasTestCenter - PROOF = ProofCmd - PROOFOPTIONS = ProofOptions -#endif -#if CrossCompiling - HOST_CC = HostCcCmd -#endif - STD_INCLUDES = StandardIncludes - STD_CPP_OPTIONS = StandardCppOptions - STD_CPP_DEFINES = StandardCppOptions StandardCppDefines $(PROJECT_DEFINES) - STD_DEFINES = StandardDefines $(PROJECT_DEFINES) -SETITIMER_DEFINES = HasSetitimerDefines - EXTRA_LOAD_FLAGS = ExtraLoadFlags -EXTRA_INSTALL_LOAD_FLAGS = ExtraInstallLoadFlags - EXTRA_LDOPTIONS = ExtraLoadOptions - EXTRA_LIBRARIES = MallocLibraries ExtraLibraries - TAGS = TagsCmd -#if ConstructMFLAGS - MFLAGS = -$(MAKEFLAGS) -#endif -#if ConstructMAKEFLAGS - MAKEFLAGS = $(MFLAGS) -#endif - PARALLELMFLAGS = ParallelMakeFlags -#if HasSharedLibraries - SHAREDCODEDEF = SharedCodeDef - SHLIBDEF = SharedLibraryDef -#ifdef SharedLibraryLoadFlags - SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS) -#if HasGcc - NOSTDLIB = -nostdlib - POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic -#elif HasIntelC - NOSTDLIB = -nostdlib - POSTNOSTDLIB = -#elif HasSunC - NOSTDLIB = -xnolib - POSTNOSTDLIB = -#endif -#endif - -#if HasXfont2 -FONT_DEFINES = -DHAS_XFONT2 - XFONTLIB = -lXfont2 -#else -#if HasLegacyXfont1 -FONT_DEFINES = -DLEGACY_XFONT1 -#else -FONT_DEFINES = -#endif - XFONTLIB = -lXfont -#endif - -#if HasLegacyXextProto -XEXT_EXTRA_DEFINES = -DLEGACY_XEXT_PROTO -#else -XEXT_EXTRA_DEFINES = -#endif - -/* - * Here we set up flags needed to produce position-independent code - * when doing C and C++ compilation. The default if you specify C - * PIC flags without also specifying C++ PIC flags is to assume that - * the C flags work for both. If your C++ compiler requires different - * flags, specify them explicitly in PositionIndependentCplusplusFlags. - */ -#ifdef PositionIndependentCFlags - PICFLAGS = PositionIndependentCFlags -#endif -#ifdef PositionIndependentCplusplusFlags - CXXPICFLAGS = PositionIndependentCplusplusFlags -#else -#ifdef PositionIndependentCFlags - CXXPICFLAGS = PositionIndependentCFlags -#endif -#endif -#endif -#if !HasVoidSignalReturn - SIGNAL_DEFINES = -DSIGNALRETURNSINT -#endif -/* - * The following supports forcing of function prototypes - */ -#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedConstPrototypes && NeedNestedPrototypes -#define _funcprotodef -DFUNCPROTO=15 -#else -#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedNestedPrototypes -#define _funcprotodef -DFUNCPROTO=11 -#else -#if NeedFunctionPrototypes && NeedNestedPrototypes -#define _funcprotodef -DFUNCPROTO=9 -#else -#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedConstPrototypes -#define _funcprotodef -DFUNCPROTO=7 -#else -#if NeedFunctionPrototypes && NeedConstPrototypes -#define _funcprotodef -DFUNCPROTO=5 -#else -#if NeedFunctionPrototypes && NeedVarargsPrototypes -#define _funcprotodef -DFUNCPROTO=3 -#else -#if NeedFunctionPrototypes -#define _funcprotodef -DFUNCPROTO -#else -#define _funcprotodef /**/ -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#if NeedWidePrototypes -#define _wideprotodef /**/ -#else -#define _wideprotodef -DNARROWPROTO -#endif - PROTO_DEFINES = _funcprotodef _wideprotodef -#undef _funcprotodef -#undef _wideprotodef - -#if StripInstalledPrograms - INSTPGMFLAGS = InstPgmFlags /* install flags for stripping */ -#else - INSTPGMFLAGS = -#endif - INSTBINFLAGS = InstBinFlags /* install flags for programs */ - INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */ - INSTLIBFLAGS = InstLibFlags /* install flags for libraries */ - INSTINCFLAGS = InstIncFlags /* install flags for headers */ - INSTMANFLAGS = InstManFlags /* install flags for man pages */ - INSTDATFLAGS = InstDatFlags /* install flags for data files */ - INSTKMEMFLAGS = InstKmemFlags /* install flags for /dev/kmem progs */ - -#ifdef ProjectRoot - PROJECTROOT = ProjectRoot -#endif -#ifdef UseInstalled -# if AlternateIncRoot -# define TopInclude -I$(INCROOT) -# else -# define TopInclude /**/ -# endif -#else -# define TopInclude -I$(TOP) -#endif - - CDEBUGFLAGS = DefaultCDebugFlags - CCOPTIONS = DefaultCCOptions /* to distinguish from param flags */ -/* - * STD_INCLUDES contains system-specific includes - * TOP_INCLUDES specifies how to get to /usr/include or its build substitute - * EXTRA_INCLUDES contains project-specific includes set in project incfiles - * INCLUDES contains client-specific includes set in Imakefile - * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(XEXT_EXTRA_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib $(INSTALLED_LIBS) - LDPOSTLIB = LdPostLib - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - SERVERLDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) - CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -#if HasBrokenCCForLink - CCLINK = LdCmd -#else -#if AlternateUsrLibDir && HasLdRunPath - CCENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH) - CCLINK = $(CCENVSETUP) $(CC) -#else - CCLINK = $(CC) -#endif -#endif -#if AlternateUsrLibDir && HasLdRunPath - CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH) - CXXLINK = $(CXXENVSETUP) $(CXX) -#else - CXXLINK = $(CXX) -#endif - LDSTRIPFLAGS = LdStripFlags - LDCOMBINEFLAGS = LdCombineFlags - DEPENDFLAGS = DependFlags - DEPEND_DEFINES = DependDefines - -XCOMM Not sure this belongs here - TKLIBDIR = TkLibDir - TKINCDIR = TkIncDir - TKLIBNAME = TkLibName - TKLIBRARY = TkLibrary - TCLLIBDIR = TclLibDir - TCLINCDIR = TclIncDir - TCLLIBNAME = TclLibName - TCLLIBRARY = TclLibrary - - MACROFILE = MacroFile - RM_CMD = $(RM) - - IMAKE_DEFINES = /* leave blank, for command line use only */ - IMAKE_WARNINGS = ImakeWarningFlags -#ifdef UseInstalled - IRULESRC = $(CONFIGDIR) /* used in rules file */ - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) \ - $(IMAKE_WARNINGS) -#else - IRULESRC = $(CONFIGSRC)/cf - IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#endif -#if !HasClearmake - /* clearmake records relevant defines and flags in the build script, - so it knows when they change and we don't need this coarser-level - dependency. We also don't want it, since it prevents sharing if - even one config file, say site.def or host.def, changes. */ - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl \ - $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \ - OtherIConfigFiles SiteIConfigFiles $(EXTRA_ICONFIGFILES) -#endif - -#ifndef TopLevelProject -# define TopLevelProject X11 -#endif -#ifndef ProjectRulesFile -# define ProjectRulesFile Concat3(<,TopLevelProject,.rules>) -#endif -#include ProjectRulesFile -#ifndef LocalRulesFile -/* need this to make ANSI-style preprocessors happy */ -#define LocalRulesFile -#endif -#include LocalRulesFile - -/* - * get project-specific configuration and rules - */ -#ifndef ProjectTmplFile -#define ProjectTmplFile Concat3(<,TopLevelProject,.tmpl>) -#endif -#include ProjectTmplFile -#ifndef LocalTmplFile -/* need this to make ANSI-style preprocessors happy */ -#define LocalTmplFile -#endif -#include LocalTmplFile - -#if !BuildLibraries && AlternateIncRoot && !defined(CrossCompileDir) -INSTALLED_INCLUDES = -I$(INCROOT) -#endif - -#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir && !defined(CrossCompileDir) -INSTALLED_LIBS = -L$(USRLIBDIR) -#endif - -#ifdef FixupLibReferences -FixupLibReferences() -#endif - -/* ConfigDir comes from X11.tmpl */ - CONFIGDIR = ConfigDir /* build configuration information */ -#if HasClearmake - OSNAME = OSName -#endif - USRLIBDIRPATH = UsrLibDirPath - LDPRELIBS = LdPreLibs $(INSTALLED_LIBS) - LDPOSTLIBS = LdPostLibs - TOP_INCLUDES = TopIncludes - PROJECT_DEFINES = ProjectDefines - VENDOR_DEFINES = VendorDefines -#if HasCplusplus -CXXPROJECT_DEFINES = CplusplusProjectDefines -#endif - -XCOMM ---------------------------------------------------------------------- -XCOMM start of Imakefile -#include INCLUDE_IMAKEFILE - -XCOMM ---------------------------------------------------------------------- -XCOMM common rules for all Makefiles - do not edit - -.c.i: - CPPOnlyCompile($*.c,$(_NOOP_)) - -.SUFFIXES: .ii - -.cc.ii: - CPPOnlyCompile($*.cc,$(_NOOP_)) - -.SUFFIXES: .s - -.c.s: - CompileCToAsm($(_NOOP_)) - -.cc.s: - CompileCplusplusToAsm($(_NOOP_)) - -/* - * These need to be here so that rules in Imakefile occur first; the blank - * emptyrule is to make sure that an empty Imakefile does not default to make - * clean. - */ -emptyrule:: - -CleanTarget() - -#ifndef IHaveSpecialMakefileTarget -MakefileTarget() -#endif - -#if BuildHtmlManPages -RmanDependency() -#endif - -TagsTarget() -#ifdef MakefileAdditions -MakefileAdditions() -#endif - -CenterLoadTarget(debug_src,$(SRCS),NullParameter,$(ALLDEFINES)) - -CenterLoadTarget(debug_obj,$(OBJS),NullParameter,$(ALLDEFINES)) - -ManKeywordsTarget($(MANPATH)) - -HtmlManIndex - -/* Generate the "real" clean rules */ -#undef clean - -clean:: cleandir - -distclean:: cleandir - -#ifdef IHaveSubdirs -XCOMM ---------------------------------------------------------------------- -XCOMM rules for building in SUBDIRS - do not edit - -InstallSubdirs($(SUBDIRS)) -InstallManSubdirs($(SUBDIRS)) -InstallDriverSDKSubdirs($(SUBDIRS)) -CleanSubdirs($(SUBDIRS)) -TagSubdirs($(SUBDIRS)) -MakefileSubdirs($(SUBDIRS)) -IncludesSubdirs($(SUBDIRS)) - -/* "distclean" subdirectories */ -#undef BootstrapCleanSubdirs -#define BootstrapCleanSubdirs /**/ -#define clean distclean -CleanSubdirs($(SUBDIRS)) -#undef clean - -#endif - -#if !DontPreprocessManPages || defined(PreprocessManPages) - PREPROCESSMANPAGES = true -#endif -/* must be after all install.man rules that install anything */ -#ifndef MakeManKeywords -#define MakeManKeywords NO -#endif -#if MakeManKeywords /* typically only at top level */ -install.man:: man_keywords -#endif - -/* must be after all install.man rules that install anything */ -#ifndef MakeHtmlManIndex -#define MakeHtmlManIndex NO -#endif -#if MakeHtmlManIndex /* typically only at top level */ -install.man:: html_index -#endif - -#ifndef IHaveSubdirs -XCOMM ---------------------------------------------------------------------- -XCOMM empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -install.sdk:: - @echo "install.sdk in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -depend:: - -#endif /* if subdirectory rules are needed */ - -#ifndef IHaveSpecialMakefileTarget -/* "distclean" also removes the Makefile and the depend file */ -distclean:: - RemoveFiles(Makefile DependFileName) -#endif - -XCOMM ---------------------------------------------------------------------- -XCOMM dependencies generated by makedepend -IncludeMakefile(DependFileName) diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile deleted file mode 100644 index 714a865c93..0000000000 --- a/nx-X11/config/cf/Imakefile +++ /dev/null @@ -1,74 +0,0 @@ -XCOMM Some compilers generate fatal errors if an -L directory does -XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. - LDPRELIB = - LDPRELIBS = - -#ifdef LocalConfigFiles -LOCALFILES = LocalConfigFiles -#endif - -#ifndef InstallEmptyHostDef -HOSTDEFFILES = \ -host.def -#endif - -#if defined(XorgVersion) -VERSIONDEFFILES = -#endif - -DEFFILES = \ -xorgsite.def \ -$(VERSIONDEFFILES) \ -$(HOSTDEFFILES) \ -site.def \ -xorgversion.def \ -nxversion.def - -RULEFILES = \ -X11.rules \ -lnxLib.rules \ -noop.rules \ -xf86.rules - -TMPLFILES = \ -Library.tmpl \ -Server.tmpl \ -ServerLib.tmpl \ -Threads.tmpl \ -X11.tmpl \ -lnxLib.tmpl \ -xorg.tmpl - -CFFILES = \ -linux.cf \ -xorg.cf - -INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) - -all:: - -#if BuildLibraries -InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS)) -#endif - -InstallDriverSDKMultipleDestFlags($(INSTFILES),$(DRIVERSDKDIR)/config/cf,$(INSTDATFLAGS)) - -#ifdef InstallEmptyHostDef -install:: - @(TMP=/tmp/tmp.$$$$; \ - RemoveFile($${TMP}); \ - echo "" > $${TMP}; \ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $${TMP} \ - $(DESTDIR)$(CONFIGDIR)/host.def; \ - RemoveFile($${TMP})) - -#if defined(XorgVersion) -install.sdk:: - @(TMP=/tmp/tmp.$$$$; \ - RemoveFile($${TMP}); \ - echo "" > $${TMP}; \ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $${TMP} \ - $(DESTDIR)$(DRIVERSDKDIR)/config/cf/host.def; \ - RemoveFile($${TMP})) -#endif -#endif diff --git a/nx-X11/config/cf/Library.tmpl b/nx-X11/config/cf/Library.tmpl deleted file mode 100644 index a5c9dc2a3e..0000000000 --- a/nx-X11/config/cf/Library.tmpl +++ /dev/null @@ -1,575 +0,0 @@ -/* - * Library imakefile info - this contains any special redefinitions, etc. - * that Imakefiles in the various library subtrees will need. - * - * Before including this, you must set the following boolean variables: - * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib - * - * To get automatic generation of standard rules, also set the variables: - * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir. - * - * To suppress installation of the library define LibInstall NO. - * To suppress creating (and installing) the library define LibCreate NO. - * To suppress installing headers define LibHeaders NO. - * Define LargePICTable YES if large (32-bit) PIC tables are needed. - */ - -#ifndef DoNormalLib -#define DoNormalLib NO -#endif -#ifndef DoSharedLib -#define DoSharedLib NO -#endif -#ifndef DoDebugLib -#define DoDebugLib NO -#endif -#ifndef DoProfileLib -#define DoProfileLib NO -#endif -#ifndef DoExtraLib -#define DoExtraLib NO -#endif - -#ifndef HasSharedData -#define HasSharedData NO -#endif -#ifndef HugeLibrary -#define HugeLibrary NO -#endif - -#ifndef ShlibBindGlobals -#define ShlibBindGlobals NO -#endif - -#if ShlibBindGlobals && defined(ShlibGlobalsFlags) -SHLIBGLOBALSFLAGS = ShlibGlobalsFlags -#endif - -#ifndef LibraryCplusplusOptions -# if DoSharedLib && defined(SharedLibraryCplusplusOptions) -# define LibraryCplusplusOptions SharedLibraryCplusplusOptions -# else -# define LibraryCplusplusOptions DefaultCplusplusOptions -# endif -#endif -#ifndef LibraryDefines -# define LibraryDefines StandardDefines -#endif -#ifndef LibraryDebugOpt -# define LibraryDebugOpt /**/ -#endif -/* Note: Changing LibraryCDebugFlags has no effect because CDEBUGFLAGS is over- - ridden by PassCDebugFlags in the parent Makefile or toplevel xmakefile. */ -#ifndef LibraryCDebugFlags -# define LibraryCDebugFlags DefaultCDebugFlags -#endif -#ifndef LibraryCplusplusDebugFlags -# define LibraryCplusplusDebugFlags DefaultCplusplusDebugFlags -#endif -#ifndef SeparateSharedCompile -# define SeparateSharedCompile YES -#endif - -#ifdef CrossCompileDir -# ifndef StripPath -# define StripPath(x) `echo x|sed "s%.*/%%"` -# endif -#endif - -#ifndef CplusplusSource -# ifndef LibraryCcCmd -# if DoSharedLib && defined(SharedLibraryCcCmd) -# define LibraryCcCmd SharedLibraryCcCmd -# else -# define LibraryCcCmd CcCmd -# endif -# endif -# ifndef LibraryCCOptions -# if DoSharedLib && defined(SharedLibraryCCOptions) -# define LibraryCCOptions SharedLibraryCCOptions -# else -# define LibraryCCOptions DefaultCCOptions -# endif -# endif - -#ifdef CrossCompileDir -# ifndef CrossLibraryCcCmd -# define CrossLibraryCcCmd Concat3(CrossCompileDir,/,StripPath(LibraryCcCmd)) -# endif -#endif - -#ifdef CrossCompileDir - CC = CrossLibraryCcCmd -#else - CC = LibraryCcCmd -#endif - CCOPTIONS = LibraryCCOptions -STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) -CDEBUGFLAGS = LibraryCDebugFlags -CLIBDEBUGFLAGS = LibraryDebugOpt - CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -# if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags -# endif -#else -# ifndef CrossCompileDir -# ifndef LibraryCplusplusCmd -# if DoSharedLib && defined(SharedLibraryCplusplusCmd) -# define LibraryCplusplusCmd SharedLibraryCplusplusCmd -# else -# define LibraryCplusplusCmd CplusplusCmd -# endif -# endif -# else -# ifndef CrossLibraryCplusplusCmd -# if DoSharedLib && defined(SharedLibraryCplusplusCmd) -# define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd)) -# else -# define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd)) -# endif -# endif -# endif - -# ifndef LibraryCplusplusOptions -# if DoSharedLib && defined(SharedLibraryCplusplusOptions) -# define LibraryCplusplusOptions SharedLibraryCplusplusOptions -# else -# define LibraryCplusplusOptions DefaultCplusplusOptions -# endif -# endif - -#ifdef CrossCompileDir - CXX = CrossLibraryCplusplusCmd -#else - CXX = LibraryCplusplusCmd -#endif - CXXOPTIONS = LibraryCplusplusOptions - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) -CXXDEBUGFLAGS = LibraryCplusplusDebugFlags -CXXLIBDEBUGFLAGS = LibraryDebugOpt - CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -# if defined(LargePICTable) && LargePICTable -# ifdef LargePositionIndependentCplusplusFlags - CXXPICFLAGS = LargePositionIndependentCplusplusFlags -# elif defined(LargePositionIndependentCFlags) - CXXPICFLAGS = LargePositionIndependentCFlags -# endif -# endif -#endif - -#ifdef LibraryMTDefines -LIB_MT_DEFINES = LibraryMTDefines -#endif - -#if defined(IHaveSubdirs) && HasSymLinks && !defined(NoLibSubdirs) -#define _LibMkdir LibMkdirLinkSubdirs -#else -#define _LibMkdir LibMkdir -#endif - -#if DoDebugLib -# define _DebuggedLibMkdir() _LibMkdir(debugger) -# define _DebuggedObjCompile(options) DebuggedLibObjCompile(options) -# define _DebuggedObjCplusplusCompile(options) DebuggedLibObjCplusplusCompile(options) -# define _DebuggedCleanDir() LibCleanDir(debugger) -#else -# define _DebuggedLibMkdir() $(_NULLCMD_) -# define _DebuggedObjCompile(options) $(_NULLCMD_) -# define _DebuggedObjCplusplusCompile(options) $(_NULLCMD_) -# define _DebuggedCleanDir() $(_NULLCMD_) -#endif - -#if DoProfileLib -# define _ProfiledLibMkdir() _LibMkdir(profiled) -# define _ProfiledObjCompile(options) ProfiledLibObjCompile(options) -# define _ProfiledObjCplusplusCompile(options) ProfiledLibObjCplusplusCompile(options) -# define _ProfiledCleanDir() LibCleanDir(profiled) -#else -# define _ProfiledLibMkdir() $(_NULLCMD_) -# define _ProfiledObjCompile(options) $(_NULLCMD_) -# define _ProfiledObjCplusplusCompile(options) $(_NULLCMD_) -# define _ProfiledCleanDir() $(_NULLCMD_) -#endif - -#if !DoNormalLib -# define _NormalLibMkdir() $(_NULLCMD_) -# define _NormalObjCompile(options) $(_NULLCMD_) -# define _NormalObjCplusplusCompile(options) $(_NULLCMD_) -# define _NormalCleanDir() $(_NULLCMD_) -#else -# if DoSharedLib && SeparateSharedCompile -# define _NormalLibMkdir() _LibMkdir(unshared) -# define _NormalObjCompile(options) UnsharedLibObjCompile(options) -# define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options) -# define _NormalCleanDir() LibCleanDir(unshared) -# else -# define _NormalLibMkdir() $(_NULLCMD_) -# if !DoSharedLib && defined(IncludeSharedObjectInNormalLib) -# define _NormalObjCompile(options) NormalRelocLibObjCompile(options) -# else -# define _NormalObjCompile(options) NormalLibObjCompile(options) -# endif -# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) -# define _NormalCleanDir() $(_NULLCMD_) -# endif -#endif - -#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile) -# define _SharedObjCompile(options) $(_NULLCMD_) -# define _SharedObjCplusplusCompile(options) $(_NULLCMD_) -#else -# if SeparateSharedCompile -# define _SharedObjCompile(options) NormalSharedLibObjCompile(options) -# define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options) -#else -# define _SharedObjCompile(options) NormalLibObjCompile(options) -# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) -#endif -#endif - -#ifndef LibInstallBuild -#define LibInstallBuild NO -#endif - -#if DoExtraLib && defined(ExtraLibRules) -# define _ExtraLibMkdir() ExtraLibMkdir() -# define _ExtraObjCompile(options) ExtraObjCompile(options) -# define _ExtraObjCplusplusCompile(options) ExtraObjCplusplusCompile(options) -# define _ExtraCleanDir() ExtraCleanDir() -#else -# define _ExtraLibMkdir() $(_NULLCMD_) -# define _ExtraObjCompile(options) $(_NULLCMD_) -# define _ExtraObjCplusplusCompile(options) $(_NULLCMD_) -# define _ExtraCleanDir() $(_NULLCMD_) -#endif - -#ifndef CplusplusSource -# define SRCsuf c -# define Isuf i -#else -# define SRCsuf CCsuf -# define Isuf ii -# ifdef SunArchitecture -.SUFFIXES: Concat(.,CCsuf) -# endif -#endif - -#define _CompileObj(target, options) @@\ -target @@\ - _DebuggedObjCompile(options) @@\ - _ProfiledObjCompile(options) @@\ - _NormalObjCompile(options) @@\ - _ExtraObjCompile(options) @@\ - _SharedObjCompile(options) - -#ifndef SeparateSharedCompile -# define _CompileObjSeparateOpts(target,staticopts,sharedopts) \ - _CompileObj(target,sharedopts) -#else -# define _CompileObjSeparateOpts(target,staticopts,sharedopts) @@\ -target @@\ - _DebuggedObjCompile(staticopts) @@\ - _ProfiledObjCompile(staticopts) @@\ - _NormalObjCompile(staticopts) @@\ - _ExtraObjCompile(staticopts) @@\ - _SharedObjCompile(sharedopts) -#endif - -#ifdef CplusplusSource -# define _CompileObjCplusplus(target, options) @@\ -target @@\ - _DebuggedObjCplusplusCompile(options) @@\ - _ProfiledObjCplusplusCompile(options) @@\ - _NormalObjCplusplusCompile(options) @@\ - _ExtraObjCplusplusCompile(options) @@\ - _SharedObjCplusplusCompile(options) -#else -# define _CompileObjCplusplus(target, options) -#endif - -#ifndef LibraryObjectRule -# define LibraryObjectRule() @@\ -all:: @@\ - _DebuggedLibMkdir() @@\ - _ProfiledLibMkdir() @@\ - _NormalLibMkdir() @@\ - _ExtraLibMkdir() @@\ - @@\ -includes:: @@\ - _DebuggedLibMkdir() @@\ - _ProfiledLibMkdir() @@\ - _NormalLibMkdir() @@\ - _ExtraLibMkdir() @@\ - @@\ -_CompileObj(.c.Osuf:,$(_NOOP_)) @@\ -_CompileObjCplusplus(.SRCsuf.Osuf:,$(_NOOP_)) @@\ - @@\ -clean:: @@\ - _DebuggedCleanDir() @@\ - _ProfiledCleanDir() @@\ - _NormalCleanDir() @@\ - _ExtraCleanDir() @@\ - -#endif /* LibraryObjectRule */ - -#ifndef SpecialLibObjectRule -# define SpecialLibObjectRule(objs,depends,options) @@\ -_CompileObj(objs: depends,options) -#endif /* SpecialLibObjectRule */ - -#ifndef SpecialCLibObjectRule -# define SpecialCLibObjectRule(basename,depends,options) @@\ -_CompileObj(basename.Osuf: basename.SRCsuf depends,options) @@\ - @@\ -basename.Isuf: basename.SRCsuf depends @@\ - CPPOnlyCompile(basename.SRCsuf,options) @@\ - @@\ -CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options) -#endif /* SpecialCLibObjectRule */ - -#ifndef SpecialCLibObjectRuleSeparateOpts -# define SpecialCLibObjectRuleSeparateOpts(basename,depends,staticopts,shopts) @@\ -_CompileObjSeparateOpts(basename.Osuf: basename.SRCsuf depends,staticopts,shopts) @@\ - @@\ -basename.Isuf: basename.SRCsuf depends @@\ - CPPOnlyCompile(basename.SRCsuf,sharedopts) @@\ - @@\ -CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options) -#endif /* SpecialCLibObjectRuleSepareateOpts */ - -#ifndef SpecialCplusplusLibObjectRule -# define SpecialCplusplusLibObjectRule(basename,depends,options) @@\ -_CompileObjCplusplus(basename.Osuf: basename.SRCsuf depends,options) @@\ - @@\ -CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options) -#endif /* SpecialCplusplusLibObjectRule */ - -/* - * ToolkitMakeStrings generates a string-table, i.e., a C source - * file and the matching header(s), e.g., Xt's StringDefs.c, StringDefs.h, - * and Shell.h files; or Motif's XmStrDefs.c and XmStrDefs.h files. - * - * The 'files' argument is the list of files that will be produced by - * this rule, e.g., for Xt they would be "Shell.h StringDefs.c StringDefs.h" - * and for Motif they would be "XmStrDefs.c XmStrDefs.h". - * - * The 'source' argument is the string-list file to be parsed, e.g., in - * Xt that would be "util/string.list". For Motif 2.0 it would be - * "../../tools/makestr/xmstring.list", and for Motif-CDE1 it would be - * "util/xmstring.list". - * - * The 'options' argument is passed by the library's Imakefile, see the - * Xt Imakefile for an example. Typically this would be nothing, -intelabi, - * or -sparcabi; there are other choices, but these are typical. - * - * The 'depends' argument names additional files the target files - * depend on. It should name the #ctmpl and #htmpl files from the - * 'source' file. - * - * The 'dest' argument is the C source output file. For Xt this should - * be "StringDefs.c", and for all versions of Motif it would be "XmStrDefs.c" - * - * Headers are generated and named according to data in the 'source' - * file. - */ -/* - * The NoCmpScript - * prevents clearmake from trying to remake makestrs if it exists. - * Including both $(MAKESTRS) and $(MAKESTRS).o as primary targets - * prevents clearmake from trying to recompile makestrs from here. - * We have includes, not files, depend on makestrs to try to get - * clearmake to wink in the files. Bug in clearmake 2.0.2? - */ - -#ifndef MakeStringsDependency -# ifndef UseInstalled -# define MakeStringsDependency @@\ -MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ -NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ - @@\ -HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf: @@\ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ - @@\ -includes:: HostProgramTargetName($(MAKESTRS)) -# else -# define MakeStringsDependency /**/ -# endif -#endif - -#ifndef ToolkitMakeStrings -# if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency -# define ToolkitMakeStrings(files,source,options,depends,dest) @@\ -files: source depends @@\ - RemoveFiles(files) @@\ - RunProgram(MAKESTRS,options < source > dest) @@\ - @@\ -AllTarget(files) @@\ - @@\ -includes:: files @@\ - @@\ -depend:: files @@\ - @@\ -clean:: @@\ - RemoveFiles(files) -# else -# define ToolkitMakeStrings(files,source,options,depends,dest) @@\ -MakeStringsDependency @@\ - @@\ -files: source depends @@\ - RemoveFiles(files) @@\ - RunProgram(MAKESTRS,options < source > dest) @@\ - @@\ -AllTarget(files) @@\ - @@\ -includes:: files @@\ - @@\ -depend:: files @@\ - @@\ -clean:: @@\ - RemoveFiles(files) -# endif -#endif /* ToolkitMakeStrings */ - -#ifdef LibName - -LIBNAME = LibName - -# if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency -/* - * Do ToolkitMakeStrings() before BuildIncludes so makestrs is still - * built first, even if the generated header will be installed. - */ -MakeStringsDependency -# endif - -LibraryObjectRule() - -# undef _LinkBuildLibrary -# if !defined(LibInstall) || LibInstall || LibInstallBuild -# define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) -# else -# define _LinkBuildLibrary(lib) $(_NULLCMD_) -# endif - -# if defined(LibBuild) && !LibBuild -# define LibCreate NO -# endif - -# if !defined(LibCreate) || LibCreate -# if DoSharedLib -# if HugeLibrary && defined(SharedLibraryTarget3) -SharedLibraryTarget3($(LIBNAME),$(SoRev),$(OBJS1),$(OBJS2),$(OBJS3) $(EXTRASHAREDOBJS),.,.) -# else -# if defined(SharedLibtoolRev) && defined(SharedLibtoolLibraryTarget) -SharedLibtoolLibraryTarget($(LIBNAME),SharedLibtoolRev,$(OBJS) $(EXTRASHAREDOBJS),.,.) -# else -SharedLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRASHAREDOBJS),.,.) -# endif -# endif -# if !defined(LibInstall) || LibInstall -# if defined(SharedLibtoolRev) && defined(InstallSharedLibtoolLibrary) -InstallSharedLibtoolLibrary($(LIBNAME),SharedLibtoolRev,$(SHLIBDIR)) -# else -InstallSharedLibrary($(LIBNAME),$(SoRev),$(SHLIBDIR)) -# endif -# endif -# if HasSharedData -SharedLibraryDataTarget($(LIBNAME),$(SoRev),$(UNSHAREDOBJS)) -# if !defined(LibInstall) || LibInstall -InstallSharedLibraryData($(LIBNAME),$(SoRev),$(SHLIBDIR)) -# endif -# endif -# endif -# if DoNormalLib -# if HugeLibrary -# if DoSharedLib && SeparateSharedCompile -UnsharedLibraryTarget3($(LIBNAME),$(OBJS1),$(OBJS2),$(OBJS3) $(EXTRAUNSHAREDOBJS),unshared,..) -# else -NormalLibraryTarget3($(LIBNAME),$(OBJS1),$(OBJS2),$(OBJS3) $(EXTRAUNSHAREDOBJS)) -# endif -# else -# if DoSharedLib && SeparateSharedCompile -UnsharedLibraryTarget($(LIBNAME),$(OBJS) $(EXTRAUNSHAREDOBJS),unshared,..) -# else -NormalLibraryTarget($(LIBNAME),$(OBJS) $(EXTRAUNSHAREDOBJS)) -# endif -# endif -# if !defined(LibInstall) || LibInstall -InstallLibrary($(LIBNAME),$(USRLIBDIR)) -# endif -# endif -# if DoProfileLib -ProfiledLibraryTarget($(LIBNAME),$(OBJS) $(EXTRAUNSHAREDOBJS)) -# if !defined(LibInstall) || LibInstall -InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -# endif -# endif -# if DoDebugLib -DebuggedLibraryTarget($(LIBNAME),$(OBJS) $(EXTRAUNSHAREDOBJS)) -# if !defined(LibInstall) || LibInstall -InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) -# endif -# endif -# if DoExtraLib && defined(ExtraLibRules) -ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS)) -# if !defined(LibInstall) || LibInstall -ExtraInstallLibrary($(LIBNAME),$(SoRev)) -# endif -# endif - -LintLibraryTarget($(LIBNAME),$(SRCS)) -# if !defined(LibInstall) || LibInstall -InstallLintLibrary($(LIBNAME),$(LINTLIBDIR)) -# endif -# else /* not LibCreate */ -# if LibBuild -# if HugeLibrary -AllTarget($(OBJS1)) -AllTarget($(OBJS2)) -AllTarget($(OBJS3)) -# else -AllTarget($(OBJS)) -# endif -# if DoSharedLib -AllTarget($(EXTRASHAREDOBJS)) -# endif -# if DoNormalLib -AllTarget($(EXTRAUNSHAREDOBJS)) -# endif -# endif /* LibBuild */ -# endif /* LibCreate */ -# ifdef IncSubdir -# ifdef IncSubSubdir -# if !defined(LibHeaders) || LibHeaders -BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..) -# if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS)) -# endif -# endif -# else -# if !defined(LibHeaders) || LibHeaders -BuildIncludes($(HEADERS),IncSubdir,..) -# if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS)) -# endif -# endif -# endif -# else -# ifndef CplusplusSource -# if !defined(LibHeaders) || LibHeaders -BuildIncludesTop($(HEADERS)) -# if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS)) -# endif -# endif -# endif -# endif - -NormalLintTarget($(SRCS)) -#endif /* defined(LibName) */ - -#ifdef NoSoSymlink -SOSYMLINK = false -#else -SOSYMLINK = true -#endif diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README deleted file mode 100644 index 24ac7f52ce..0000000000 --- a/nx-X11/config/cf/README +++ /dev/null @@ -1,544 +0,0 @@ -The easiest way to write an Imakefile is to find another one that does -something similar and copy/modify it! - -To change any of these variables, edit the site.def file. - -Imake.tmpl provides defaults for the following variables: - - AlternateIncRoot compiler needs -I to find project includes - AlternateUsrLibDir linker needs -L to find project libraries - ArCmd command used to create libraries - ArCmdBase program name part of ArCmd - ArAddCmd flags to have ArCmdBase add files to a library - ArExtCmd flags to have ArCmdBase extract files - AsCmd command used to run assembler - BootstrapCFlags missing cpp symbols needed to get started - BourneShell command used to run Bourne Shell - CCsuf suffix that C++ source files have - CURDIR current directory relative to top of sources - CcCmd command to run C compiler - CompressCmd command to run compress program - ConstructMFLAGS System V option to set MFLAGS make variable - CpCmd command to copy one file to another - CplusplusCmd command to run C++ compiler - CplusplusFilt command to run C++ name demangler - CplusplusYaccCmd command to produce C++ source from yacc source - CppCmd command to run C preprocessor - CrossCompiling cross compiling? (not fully supported) - DebuggableCDebugFlags C compiler -I's and -D's to turn on debug info - DefaultCCOptions default special C compiler options - DefaultCDebugFlags debug/optimize flags for programs - DefaultUsrBin program directory used even if PATH not set - DependFlags extra makedepend flags - DoRanlibCmd boolean for system uses ranlib - EqnCmd command used for eqn - ExecableScripts boolean for systems that can exec() #!/bin/sh - ExpandManNames boolean to expand man pages names to long form - ExtraFilesToClean extra files to remove on make clean - ExtraLibraries system-specific libraries need to link - ExtraLoadFlags system-specific loader flags - ExtraInstallLoadFlags system-specific loader flags for later installation - FileManSuffix man suffix for file format pages - FilesToClean files to delete in make clean - FortranCmd command to run Fortran compiler - FortranDebugFlags flags for Fortran debug info - FortranFlags Fortran compiler flags - GzipCmd command to run gzip program - HasBSD44Sockets boolean for system has BSD4.4 sockets - HasBsdMake use the 4.4BSD variant of the make program? - HasBsearch boolean for libc has bsearch() - HasBrokenCCForLink boolean for brain damaged cc driver - HasCenterLineC boolean for system has CenterLine C compiler - HasCenterLineCplusplus boolean for system has CenterLine C++ compiler - HasClearmake use Clearcase's clearmake make program? - HasCodeCenter boolean for system has CodeCenter - HasCookieMaker boolean for system has xauth cookie generator - HasCplusplus system has a C++ compiler? - HasFortran boolean for system has Fortran compiler - HasGcc boolean for system has GNU gcc compiler - HasGcc2 boolean for system has GNU gcc 2.x compiler - HasGcc2ForCplusplus use gcc 2 for C++ programs? - HasGnuMake use the GNU make program? - HasGhostPCL boolean for system has GhostPCL - HasGhostScript boolean for system has GhostScript - HasLargeTmp boolean for system has /tmp space - HasLatex system has LaTeX document preparation software - HasLibCrypt boolean for system has libcrypt - HasMotif boolean for system has Motif - HasMotif2 boolean for system has Motif2 or OpenMotif - HasPoll use poll() syscall? - HasPurify boolean for system has Purify - HasPutenv boolean for libc has putenv() - HasSecureRPC boolean for Sun Secure RPC - HasSetProcTitle boolean for setproctitle() - HasSetUserContext boolean for setusercontext() - HasSentinel boolean for system has Sentinel available - HasSharedLibraries boolean for system has shared libraries - HasShm boolean for System V shared memory - HasSockets boolean for system has BSD sockets - HasStrcasecmp boolean for system implements str[n]casecmp - HasSymLinks boolean for system has symbolic links - HasTestCenter boolean for system has TestCenter - HasVarDirectory boolean for system has /var - HasVFork boolean for system has vfork() - HasVoidSignalReturn boolean for POSIX signal() procs - IncludeSharedObjectInNormalLib define for static libs to include - -fPIC objects on relevant archs - IncRoot parent of X11 include directory - InstBinFlags install flags for binaries - InstDatFlags install flags for data files - InstIncFlags install flags for header files - InstKmemFlags install flags for xload to get at /dev/kmem - InstLibFlags install flags for libraries - InstManFlags install flags for manual pages - InstPgmFlags install flags for normal programs - InstUidFlags install flags for xterm to chown /dev/ptys - InstallCmd command to install files - LdCmd command to run loader - LdCombineFlags flags for incremental loading - LexCmd command to run lex - LexLib library for programs using lex output - LintCmd command to run lint - LintLibFlag flags to generate lint libraries - LintOpts lint options to control strictness - LnCmd command to link two files - LoaderLibPrefix loader flags before libraries - LocalRulesFile site-specific file with additional imake rules - LocalTmplFile file with additional imake variables - MacroFile name of machine-dependent config params file - MacroIncludeFile - MakeCmd command to run make - Malloc0ReturnsNull boolean for malloc(0) == NULL - Malloc0ReturnsNullDefines -D's to build libX11/libXt - MathLibrary library for programs using C math functions - MkCookieCmd command to generate an xauth cookie - MsMacros macro flag for TroffCmd, normally "-ms" - MvCmd command to rename a file - NeedConstPrototoypes whether const is supported - NeedFunctionPrototypes whether or not to force function prototypes - NeedNestedPrototypes whether nested prototypes are supported - NeedVarargsPrototypes whether varargs prototypes are supported - NeedWidePrototypes whether or not to widen function prototypes - NoOpCDebugFlags C compiler flags to not debug or optimize - NoRConst YES if const for structs of funcs is bad - OSMajorVersion major version number of operating system - OSMinorVersion minor version number of operating system - OSName operating system name - OSTeenyVersion maintenance version number of operating system - OptimizedCDebugFlags C compiler flags to turn on optimization - XtPopdownConformance XtPopdown conformans to the specification - PreProcessCmd command to run /lib/cpp on scripts - RanlibCmd command to clean up libraries - RanlibInstFlags flags to ranlib after copying - ResourceConfigurationManagement boolean for Xt's Resource Configuration - Management - RmCmd command to delete files - ShLibDir directory in which to install shared libraries - StandardCppDefines -D's for running cpp - StandardDefines -D's for running C compiler - StandardIncludes -I's for running C compiler - StripInstalledPrograms boolean for sites that want to install -s - SystemV boolean for systems that are at least SVR2 - SystemV4 boolean for SVR4 systems - TOPDIR relative path to top of sources - TagsCmd command to run tags - TblCmd command to run tbl - TroffCmd command to run troff to get PostScript - UNCOMPRESSPATH command to run uncompress (obsolete) - UnalignedReferencesAllowed boolean for unaligned copies ok - UsrLibDir directory in which to install libraries - YaccCmd command to run yacc - UseTIRPC force usage of libtirpc - -X11.tmpl provides defaults for the following variables: - - AdmDir directory containing system log files - AllocateLocalDefines -D's to turn on alloca() (should be in Imake.tmpl) - BDFTOSNFFILT command to run bdftosnf - BaseExtensionDefines universal extensions to use - BinDir directory in which to install programs - BuildDBE build DOUBLE-BUFFER extension - BuildDPMS build Display Power Management Signaling extension - BuildIncRoot relative path to location of headers in build - BuildIncTop path from build includes directory to top - BuildPlugin build xrx plug-in for web browsers - BuildRECORD Build RECORD extension - BuildServer build X server - BuildXCSecurity Build Security Extension - BuildXInputExt build X Input extension (requires ddx support, - which exists only in Xhp and XFree86) - BuildXKB build X Keyboard Extension? - BuildXKBlib build X Keyboard Extension into Xlib? - UseXKBInClients Use XKB functions in normal clients? - ConfigDir install directory for config files - ConnectionFlags -D's for supported transports - ContribDir location of user-contributed sources - DebugLibX11 build libX11_d.a - DefaultCursorTheme name of default cursor theme - DefaultFontPath default server font path - DefaultSystemPath default system xdm PATH environment variable - DefaultSystemShell default /bin/sh - DefaultUserPath default user xdm PATH environment variable - DependCmd command to run makedepend - DependDir build directory containing makedepend program - DriverManDir directory in which to install driver man pages - DriverManSuffix man suffix for driver pages - ExtensionDefines -D's for universal extensions - ExtensionOSDefines -D's for additional extensions - ForceNormalLib force building of .a in addition to shared lib - HasXdmAuth boolean for using XDM-AUTHORIZATION-1; - needs Wraphelp.c, see Release Notes - InstallLibManPages boolean for installing library man pages - InstallSecurityConfig install server security policy file over old? - LibDir directory in which to install X11 support files - LibManSuffix man suffix for library pages - LibmanDir directory in which to install library man pages - LintlibDir directory in which to install lint libs - ManDir directory in which to install program man pages - ManDirectoryRoot parent of man directories relative to root - ManPath full path of parent directory - ManSourcePath common prefix of man page directories - ManSuffix man suffix for programs - MiscManSuffix man suffix for miscellaneous pages - MiscManDir directory in which to install misc man pages - NeedDefaultDepLibs boolean for enabling default DEPLIBS - NlsDir directory in which to install nls files - NormalLibX11 build libX11.a - OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName - PrimaryScreenResolution resolution of default server screen - ProfileLibX11 build libX11_p.a - ProjectX version indicating this is the X Window System - RemoveTargetProgramByMoving boolean for rm -f that doesn't - SHELLPATH -D for /bin/sh - ServerConfigDir directory for server security config files - ServerDefines complete -D's for server - ServerExtraDefines special -D's for server - ServerOSDefines OS -D's for server - ServerAssertDefines -DNDEBUG for no assertions, /**/ for assertions - SharedLibX11 boolean for making sharable libX11.so - ShmDefines MIT-SHM define - TwmDir directory in which to install twm config files - UseCCMakeDepend boolean for using alternate makedepend script - VarDirectory directory in /var for logs, etc., and config - VendorHasX11R6_3libXext don't need Security & AppGroup in xrx plug-in - XAppLoadDir directory in which to install app defaults - XFileSearchPathBase base file search path - XFileSearchPathDefault default path to search for app defaults files - XInputDefines XINPUT define - XMalloc0ReturnsNullDefines -D's specifically for libX11 - XdmConfigurationSubdirectory name of default xdm configuration - XdmDir directory in which to install xdm files - XinitDir directory in which to install xinit files - XmanLocalSearchPath non-standard path for man pages - XtErrorPrefix leading text in XtError() msg; eg. 'X Toolkit ' - XtWarningPrefix leading text in XtWarning()msg, same as above - XtMalloc0ReturnsNullDefines -D's specifically for libXt - ZBDFTOSNFFILT -D to run uncompress and bdftosnf (obsolete) - - -Library.tmpl provides defaults for the following variables: - - AvoidNullMakeCommand for makes that spout about $(_NULLCMD_) - LibraryCCOptions special C compiler options for libraries - LibraryCDebugFlags library debug/optimize flags to override defs - LibraryCcCmd command to run C compiler in libraries - LibraryCplusplusOptions special C++ options for libraries - LibraryCplusplusDebugFlags library debug/optimize flags for C++ - LibraryCplusplusCmd command to run C++ compiler in libraries - LibraryDefines -D's for libraries - SeparateSharedCompile shared and unshared libs use same binaries? - - -Server.tmpl provides defaults for the following variables: - - ServerCCOptions server C compiler options to override defaults - ServerCcCmd command to run C compiler in server - ServerCDebugFlags server debug/opt compiler flags - ServerDefines server standard -D's - InstallServerSetUID does this system need X server suid to root? - - -Threads.tmpl provides defaults for the following variables: - - LocalThreads whether to enable multi-threading support - LocalThreadsDefines -D flags needed in this directory - - -An Lib.rules file provides defaults for the following variables: - - HasSharedLibraries boolean for using shared libraries - SharedDataSeparation boolean indicating separate data/code - SharedCodeDef -D's for compiling shared library files - SharedLibraryDef -D's for defining which kind of shared lib - ShLibIncludeFile location of the Lib.tmpl file - SharedLibraryLoadFlags loader flags when making the library - UseExportLists boolean for using an export list - PositionIndependentCFlags PIC compiler flags for C - PositionIndependentCplusplusFlags PIC compiler flags for C++ - - Note: PositionIndependentCplusplusFlags is only required if the - C and C++ compilers use different flags to build PIC code. The - default configuration will try to use PositionIndependentCFlags - for both C and C++ compiles. - -An Lib.tmpl file provides defaults for the following variables: - - SharedX11Reqs required libs for libX11.so - SharedX11Rev version number for libX11.so - -Vendor.cf files and/or site/host specific .def files may define the -following variables: - - ProjectRoot The directory under which the installation - will operate. This value will be hard coded - into some programs. As a result do not use it - to specify the installation directory for a - cross compiled system, use DESTDIR to - accomplish that task. - -The following variables are used by some part of the tree: - - AckToolset programs/Xserver/hw/xfree86 - BuildChooser build the xdm chooser program? - SharedLibXdmGreet use xdm shared dynamic greeter library? - LatexCmd command to run LaTeX on a document - DvipsCmd command to turn .dvi file into PostScript - MotifBC using Motif 1.1.1, 1.1.2, or 1.1.3? - GetValuesBC compat GetValues behavior for broken apps? - SvgaConfig default SVGA configuration - HasGetReturnAddress util/memleak - HasShadowPasswd system has getspnam() function - WebServer host:port of your Web server (see programs/xrx) - HtmlDir path used by Web server for HTML and RX docs - CgiBinDir path used by Web server for CGI programs - ProxyManager ICE network ID to contact a running proxymngr - - -Make Variables - -The following make variables are used by imake rules and may be set in -an individual Imakefile. - -DEFINES program-specific -D flags and other arguments - to pass to the C compiler, lint, and makedepend. -DEPEND_DEFINES program-specific flags in addition to - $(DEFINES) to pass to lint and makedepend. - This is usually used when there are special - compilation rules for individual files, and - the defines passed to those files affect - makedepend results. If they can be passed to - all files during the makedepend step without - affecting the results for other files, - DEPEND_DEFINES is used to do that. Example is - the Xlib Imakefile. -INCLUDES program-specific -I flags. -HEADERS .h files to install with "make includes" and - "make install". If this Imakefile includes - Library.tmpl there are no headers, include - this line instead of a HEADERS definition: - #define LibHeaders NO -REQUIREDLIBS when building a shared library, other libraries used - by this library that should be referenced at - link time. -LINTLIBS program-specific libraries for lint. -LOCAL_LDFLAGS program-specific flags for the linker. -LOCAL_LIBRARIES project libraries (usually specified - as -lname) needed by this program. - For example, "-lXt -lXext -lX11". - Used by SimpleProgramTarget and - ComplexProgramTarget* rules. - Do not include any system-specific libraries here. -SYS_LIBRARIES system libraries (usually specified - as -lname) needed by this program. - For example "MathLibrary". - Do not include any system-specific libraries - such as "-lnsl" here; they are automatically - added to the link command by the - vendor-specific .cf file. -SUBDIRS for an Imakefile in a directory containing - subdirectories, this names the subdirectories. - Such an Imakefile also needs to #define IHaveSubdirs - and call MakeSubdirs() and DependSubdirs(). -MANSUFFIX suffix used by InstallManPage* rules. - May be set to $(LIBMANSUFFIX), $(FILEMANSUFFIX), or - $(MISCMANSUFFIX) in directories for libraries or data - files. - - -Rule-specific variables that may be set in an individual Imakefile. -If you aren't using these rules, you may need variables with a similar -function, but you need not use these names. However, following these -conventions may make your Imakefile easier to read and maintain. - -DEPLIBS library dependencies for ComplexProgramTarget -SRCS source files used by ComplexProgramTarget and - DependTarget. -OBJS object files used by ComplexProgramTarget -PROGRAMS default target used with ComplexProgramTarget_(n) -SRCS1 source files used by ComplexProgramTarget_1 -OBJS1 object files used by ComplexProgramTarget_1 -DEPLIBS1 library dependencies for ComplexProgramTarget_1 -SRCS2 source files used by ComplexProgramTarget_2 -OBJS2 object files used by ComplexProgramTarget_2 -DEPLIBS2 library dependencies for ComplexProgramTarget_2 -SRCS3 source files used by ComplexProgramTarget_3 -OBJS3 object files used by ComplexProgramTarget_3 -DEPLIBS3 library dependencies for ComplexProgramTarget_3 - -Variables that can be set on the make command line: - -DESTDIR directory under which "make install" should - install instead of "/"; used only for testing - "make install" rules, binary package building, - and specifying alternative installation directories - for cross compiles. -FILE file for "lint1" target to run lint on. -CDEBUGFLAGS -g and/or -O flag to control C compiler optimization. -CXXDEBUGFLAGS -g and/or -O flag to control C++ optimization. -LDSTRIPFLAGS flag to have linker strip objects (typically -x). - Typically set to the empty string to prevent - the linker from stripping objects; use this - way when setting CDEBUGFLAGS to "-g". - -These variables are set in project-specific files such as X11.tmpl. -They should NOT be set in an Imakefile. These variables are sometimes -misused; they are included here to remind Imakefile writers NOT to use -them: - -EXTRA_DEFINES project-specific -D flags -EXTRA_INCLUDES project-specific -I flags -EXTRA_ICONFIGFILES Additional project-specific imake config files - to add to ICONFIGFILES. - This is a list of files that define variables - that might affect compilation of some files. - -Many other make variables are set up by the imake config files and can -be used in an Imakefile. The easiest way to discover them is to look -at the Makefile generated by an empty Imakefile. - - -Comments - -Use C comment syntax in an Imakefile for comments that should not -appear in the resulting Makefile. -Use "XCOMM" at the start of each -line to produce a comment that will appear in the Makefile. -(The "XCOMM" will -be translated into the Makefile comment character "#" by imake.) -Do NOT use "#" as a comment character in Imakefiles; it confuses the C -preprocessor used by imake on some systems. - - -Imake variables - -Don't abuse the variables in X11.tmpl that describe -particular pieces of X by using them to describe your own subsystems. -Instead, create new variables that are defaulted using -Imake.tmpl variables. - - -Examples - -Since the easiest way to write an Imakefile is to start with one that -works, here are some short, easy-to-read Imakefile examples in the X -distribution: - -with subdirs: config/Imakefile -library: lib/Xau/Imakefile -simple program: programs/xdpyinfo/Imakefile -complex progs: programs/xclipboard/Imakefile -complex prog: programs/xmodmap/Imakefile - -Common Rules - -Here are some of the common rules for building programs. How to use -them is described in Imake.rules and in the O'Reilly book "Software -Portability with imake." - -Basic program-building rules - -All of these except NormalProgramTarget also generate rules to install -the program and its manual page, and to generate dependencies. - -SimpleProgramTarget Use if there is only one program to be made - and it has only one source file. - -ComplexProgramTarget Use if there is only one program to be made - and it has multiple source files. Set SRCS to - the names of the source files, set OBJS to - the names of the object files, and set DEPLIBS - to the libraries that this program depends on. - -ComplexProgramTarget_1 Like ComplexProgramTarget, but uses SRCS1, - OBJS1, and DEPLIBS1 and can be used with - ComplexProgramTarget_2 and ComplexProgramTarget_3 - to build up to three programs in the same directory. - Set PROGRAMS to the programs built by all of - these rules. For more than 3 programs, use - NormalProgramTarget for each. -ComplexProgramTarget_2 Use after ComplexProgramTarget_1 for the - second program in a directory. Uses SRCS2, - OBJS2, and DEPLIBS2. -ComplexProgramTarget_3 Use after ComplexProgramTarget_2 for the - third program in a directory. Uses SRCS3, - OBJS3, and DEPLIBS3. - -NormalProgramTarget Build a program. Can be used multiple times - with different arguments in the same Imakefile. - -Lower level rules, often used with NormalProgramTarget - -InstallProgram install a program. - -InstallManPage install a manual page. - -InstallDirectory install a directory. - -DependTarget() include once at end of Imakefile with - NormalProgramTarget rules or that uses Library.tmpl. - Generates dependencies for files named in SRCS. - -Manual page rules, commonly used only in special documentation directories: - -InstallManPage -InstallManPageLong -InstallManPageAliases - -Other rules: - -SpecialCObjectRule Compile a C file with special flags. -AllTarget Declare additional targets to build. -InstallAppDefaults Install X application defaults file. - -Imakefile for directory with subdirectories - -XCOMM this is a sample Imakefile for a directory containing subdirectories -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -SUBDIRS = list of subdirs ... -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - - -Common Targets - -These targets are typically NOT defined explicitly by the Imakefile -writer; rather they are generated automatically by imake rules. -They are listed here for the convenience of people using the resulting -Makefile, not people writing the original Imakefile. - -all Default rule; builds whatever is in this directory. -Makefile Remake the Makefile (use after changing Imakefile). - Run "make depend" after. -Makefiles Remake all Makefiles in subdirectories. (Does - nothing if no subdirectories.) - Run "make depend" after. -includes Generate and install in the tree any necessary - header files. -depend Update dependencies in the Makefile calculated - by examining the source files. -install Install what "make all" built on the system. -install.man Install manual pages. -clean Remove built objects and other derived files. -lint Run lint. -tags Create a tags file. diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl deleted file mode 100644 index ffdca68113..0000000000 --- a/nx-X11/config/cf/Server.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Server imakefile info - this contains any special redefinitions, etc. - * that Imakefiles in the server subtree will need. - */ - -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" - -#ifndef ServerCcCmd -#define ServerCcCmd CcCmd -#endif -#ifndef ServerCCOptions -#define ServerCCOptions DefaultCCOptions -#endif -#ifndef ServerDefines -#define ServerDefines StandardDefines -#endif -/* Note: Changing ServerCDebugFlags has no effect because CDEBUGFLAGS is over- - ridden by PassCDebugFlags in the parent Makefile or toplevel xmakefile. */ -#ifndef ServerCDebugFlags -#define ServerCDebugFlags DefaultCDebugFlags -#endif -#ifndef DoThreadedServer -#define DoThreadedServer NO -#endif -#ifndef InstallServerSetUID -#define InstallServerSetUID NO -#endif - -#ifdef CrossCompileDir -# ifndef StripPath -# define StripPath(x) `echo x|sed "s%.*/%%"` -# endif -# ifndef CrossServerCcCmd -# define CrossServerCcCmd Concat3(CrossCompileDir,/,StripPath(ServerCcCmd)) -# endif -#endif - -/* - * SetUIDServerTarget - compile, link, and relink a setuid server - */ -#ifndef SetUIDServerTarget -#if InstallServerSetUID -#define SetUIDServerTarget(server,subdirs,objects,libs,syslibs) @@\ -ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS)) -#else -#define SetUIDServerTarget ServerTarget -#endif -#endif /* SetUIDServerTarget */ - -#ifdef CrossCompileDir - CC = CrossServerCcCmd -#else - CC = ServerCcCmd -#endif - CCOPTIONS = ServerCCOptions -#if DoThreadedServer -SERVER_THREAD_DEFINES = XThreadsDefines ThreadTypeDefines -#endif -STD_DEFINES = ServerDefines $(SERVER_THREAD_DEFINES) -CDEBUGFLAGS = ServerCDebugFlags -EXT_DEFINES = ExtensionDefines -OS_DEFINES = ServerOSDefines - -GLX_DEFINES = GlxDefines - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#ifdef XorgVersion -#include -#endif diff --git a/nx-X11/config/cf/ServerLib.tmpl b/nx-X11/config/cf/ServerLib.tmpl deleted file mode 100644 index 66c83b83d7..0000000000 --- a/nx-X11/config/cf/ServerLib.tmpl +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Server Library imakefile info - this contains any special - * redefinitions, etc. that Imakefiles in the various server library - * subtrees will need. - * - * Before including this, you must set the following boolean variables: - * DoSharedLib, DoNormalLib, DoDebugLib, DoProfileLib - * - */ - -#ifndef DoNormalLib -#define DoNormalLib YES -#endif - -#ifndef LibraryDefines -#define LibraryDefines StandardDefines -#endif -#ifndef LibraryCDebugFlags -#define LibraryCDebugFlags DefaultCDebugFlags -#endif -#ifndef SeparateSharedCompile -#define SeparateSharedCompile YES -#endif -#ifndef SharedServerLibraryDef -#define SharedServerLibraryDef $(__NOOP__) -#endif - -#ifndef LibraryCcCmd -#if DoSharedLib && defined(SharedLibraryCcCmd) -#define LibraryCcCmd SharedLibraryCcCmd -#else -#define LibraryCcCmd CcCmd -#endif -#endif -#ifndef LibraryCCOptions -#if DoSharedLib && defined(SharedLibraryCCOptions) -#define LibraryCCOptions SharedLibraryCCOptions -#else -#define LibraryCCOptions DefaultCCOptions -#endif -#endif - -#if DoDebugLib -#define _DebuggedLibMkdir() LibMkdir(debugger) -#define _DebuggedObjCompile(options) DebuggedLibObjCompile(options) -#define _DebuggedCleanDir() LibCleanDir(debugger) -#else -#define _DebuggedLibMkdir() $(_NULLCMD_) -#define _DebuggedObjCompile(options) $(_NULLCMD_) -#define _DebuggedCleanDir() $(_NULLCMD_) -#endif - -#if DoProfileLib -#define _ProfiledLibMkdir() LibMkdir(profiled) -#define _ProfiledObjCompile(options) ProfiledLibObjCompile(options) -#define _ProfiledCleanDir() LibCleanDir(profiled) -#else -#define _ProfiledLibMkdir() $(_NULLCMD_) -#define _ProfiledObjCompile(options) $(_NULLCMD_) -#define _ProfiledCleanDir() $(_NULLCMD_) -#endif - -#if !DoNormalLib -#define _NormalLibMkdir() $(_NULLCMD_) -#define _NormalObjCompile(options) $(_NULLCMD_) -#define _NormalCleanDir() $(_NULLCMD_) -#else -#if DoSharedLib && SeparateSharedCompile -#define _NormalLibMkdir() LibMkdir(unshared) -#define _NormalObjCompile(options) UnsharedLibObjCompile(options) -#define _NormalCleanDir() LibCleanDir(unshared) -#else -#define _NormalLibMkdir() $(_NULLCMD_) -#define _NormalObjCompile(options) NormalLibObjCompile(options) -#define _NormalCleanDir() $(_NULLCMD_) -#endif -#endif - -#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile) -#define _SharedObjCompile(options) $(_NULLCMD_) -#else -#if SeparateSharedCompile -#define _SharedObjCompile(options) NormalSharedLibObjCompile(options) -#else -#define _SharedObjCompile(options) NormalLibObjCompile(options) -#endif -#endif - -#define SRCsuf c -#define Isuf i - -#ifndef LibraryObjectRule -#define LibraryObjectRule() @@\ -all:: @@\ - _DebuggedLibMkdir() @@\ - _ProfiledLibMkdir() @@\ - _NormalLibMkdir() @@\ - @@\ -includes:: @@\ - _DebuggedLibMkdir() @@\ - _ProfiledLibMkdir() @@\ - _NormalLibMkdir() @@\ - @@\ -.SRCsuf.Osuf: @@\ - _DebuggedObjCompile($(_NOOP_)) @@\ - _ProfiledObjCompile($(_NOOP_)) @@\ - _NormalObjCompile($(_NOOP_)) @@\ - _SharedObjCompile(SharedServerLibraryDef) @@\ - @@\ -clean:: @@\ - _DebuggedCleanDir() @@\ - _ProfiledCleanDir() @@\ - _NormalCleanDir() @@\ - -#endif /* LibraryObjectRule */ - -#ifndef SpecialLibObjectRule -#define SpecialLibObjectRule(objs,depends,options) @@\ -objs: depends @@\ - _DebuggedObjCompile(options) @@\ - _ProfiledObjCompile(options) @@\ - _NormalObjCompile(options) @@\ - _SharedObjCompile(options) @@\ - -#endif /* SpecialLibObjectRule */ - -#ifndef SpecialCLibObjectRule -#define SpecialCLibObjectRule(basename,depends,options) @@\ -SpecialLibObjectRule(basename.Osuf,basename.SRCsuf depends,options) @@\ - @@\ -basename.Isuf: basename.SRCsuf depends @@\ - CPPOnlyCompile(basename.SRCsuf,options) @@\ - @@\ -CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options) -#endif /* SpecialCLibObjectRule */ - -#if DoSharedLib -LibraryObjectRule() -#else -NormalLibraryObjectRule() -#endif diff --git a/nx-X11/config/cf/Threads.tmpl b/nx-X11/config/cf/Threads.tmpl deleted file mode 100644 index d2d6f6d1ce..0000000000 --- a/nx-X11/config/cf/Threads.tmpl +++ /dev/null @@ -1,99 +0,0 @@ -/* - * For a multi-threaded application or library, - * Define LocalThreadsDefines in your Imakefile (unless you like the - * project default), then include this file. - * Everything else should be automatic. - */ - -#ifndef LocalThreadsDefines -#ifdef ProjectThreadsDefines -#define LocalThreadsDefines ProjectThreadsDefines -#else -#define LocalThreadsDefines /**/ -#endif -#endif - -#ifndef LocalThreads -#ifdef ThreadedProject -#define LocalThreads ThreadedProject -#else -#define LocalThreads YES -#endif -#endif - -#ifndef HasCThreads -#define HasCThreads NO -#endif - -#ifndef ThreadTypeDefines -#if HasCThreads -#define ThreadTypeDefines -DCTHREADS -#else -#define ThreadTypeDefines /**/ -#endif -#endif -#ifndef SystemMTDefines -#define SystemMTDefines /**/ -#endif -#ifndef LibraryMTDefines -#define LibraryMTDefines /**/ -#endif -#ifndef HasThreadSafeAPI /* does it have getpwnam_r, etc. */ -#define HasThreadSafeAPI YES -#endif -#ifndef MTSafeAPIDefines -#if HasThreadSafeAPI -#define MTSafeAPIDefines -DXUSE_MTSAFE_API -#else -#define MTSafeAPIDefines /**/ -#endif -#endif -#ifndef ThreadPreStdAPIDefines -#define ThreadPreStdAPIDefines /* nominally for POSIX P1003.4a (Draft 4) API */ -#endif -#ifndef CplusplusSystemMTDefines -# ifdef SystemMTDefines -# define CplusplusSystemMTDefines SystemMTDefines -# else -# define CplusplusSystemMTDefines /**/ -# endif -#endif -#ifndef ThreadsCompileFlags -#define ThreadsCompileFlags /**/ -#endif -#ifndef ThreadsCplusplusCompileFlags -# ifdef ThreadsCompileFlags -# define ThreadsCplusplusCompileFlags ThreadsCompileFlags -# else -# define ThreadsCplusplusCompileFlags /**/ -# endif -#endif - -#ifndef ThreadsLibraries -#define ThreadsLibraries /**/ -#endif -#ifndef ThreadsCplusplusLibraries -# ifdef ThreadsLibraries -# define ThreadsCplusplusLibraries ThreadsLibraries -# else -# define ThreadsCplusplusLibraries /**/ -# endif -#endif -#ifndef ThreadsLoadFlags -#define ThreadsLoadFlags ThreadsCompileFlags -#endif -#ifndef ThreadsCplusplusLoadFlags -#define ThreadsCplusplusLoadFlags ThreadsCplusplusCompileFlags -#endif - -#if LocalThreads - THREADS_CFLAGS = ThreadsCompileFlags - THREADS_DEFINES = LocalThreadsDefines ThreadTypeDefines SystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines $(LIB_MT_DEFINES) - THREADS_LDFLAGS = ThreadsLoadFlags - THREADS_LIBS = ThreadsLibraries - - THREADS_CXXFLAGS = ThreadsCplusplusCompileFlags -THREADS_CXXDEFINES = LocalThreadsDefines ThreadTypeDefines CplusplusSystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines $(LIB_MT_DEFINES) -THREADS_CXXLDFLAGS = ThreadsCplusplusLoadFlags - THREADS_CXXLIBS = ThreadsCplusplusLibraries -#endif diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules deleted file mode 100644 index af3473c3af..0000000000 --- a/nx-X11/config/cf/X11.rules +++ /dev/null @@ -1,131 +0,0 @@ -/* Note whether we are the top level project. */ -#ifndef SeenTopLevelProject -# define SeenTopLevelProject YES -# define X11IsTopLevelProject YES -#else -# define X11IsTopLevelProject NO -#endif - -/* - * If no clues are given assume X11 is in the tree, otherwise - * UseInstalled overrides UseImports. Do not do both. - */ -#ifndef UseInstalledX11 -# define UseInstalledX11 NO -#endif -#ifdef UseInstalled -# undef UseInstalledX11 -# define UseInstalledX11 YES -#endif - -#ifndef ImportX11 -# ifdef UseImports -# define ImportX11 YES -# else -# define ImportX11 NO -# endif -#endif -#if UseInstalledX11 -# undef ImportX11 -# define ImportX11 NO -#endif - -#if defined(X11ProjectRoot) -# define XBinDir $(XPROJECTROOT)/lib/nx/bin -#elif defined(ProjectRoot) -# define XBinDir $(PROJECTROOT)/lib/nx/bin -#else -# define XBinDir $(BINDIR) -#endif - -#ifdef X11ProjectRoot -# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT) -#else -# define XUsrLibDirPath $(USRLIBDIR) -#endif -#ifdef UsrLibDirPath -# undef UsrLibDirPath -#endif -#ifdef ExtraLibDirPath -#define UsrLibDirPath XUsrLibDirPath:ExtraLibDirPath -#else -#define UsrLibDirPath XUsrLibDirPath -#endif - -#if ImportX11 -# define XLdPreLibs -L$(LIBSRC) -#elif defined(UseInstalledX11) && defined(X11ProjectRoot) -# define XLdPreLibs -L$(XPROJECTROOT) -#else -# define XLdPreLibs /**/ -#endif -#ifdef LdPreLibs -# undef LdPreLibs -#endif -#define LdPreLibs LdPreLib XLdPreLibs - -#ifdef X11ProjectRoot -# define XLdPostLibs -L$(XPROJECTROOT) -#else -# define XLdPostLibs /**/ -#endif -#ifdef LdPostLibs -# undef LdPostLibs -#endif -#define LdPostLibs LdPostLib XLdPostLibs - -#ifndef TopXInclude -# if ImportX11 -# define TopXInclude -I$(TOP)/imports/x11/include -# elif !UseInstalledX11 -# define TopXInclude -I$(TOP)/exports/include -#else -# ifdef X11ProjectRoot -# define TopXInclude -I$(XPROJECTROOT)/../../include/nx -# else -# define TopXInclude /**/ -# endif -# endif -#endif -#ifdef TopIncludes -# undef TopIncludes -#endif -#define TopIncludes TopInclude $(TOP_X_INCLUDES) - -#if UseInstalledX11 && defined(X11ProjectRoot) -# define X11BuildLibPath $(XPROJECTROOT) -#elif UseInstalledX11 -# define X11BuildLibPath $(USRLIBDIR) -#elif ImportX11 -# define X11BuildLibPath $(XTOP)/lib -#else -# define X11BuildLibPath $(TOP)/exports/lib -#endif - -#ifndef BuildLibPath -#ifdef SystemBuildLibPath -# define BuildLibPath $(XENVLIBDIR):$(SYSTEMENVLIBDIR) -#else -# define BuildLibPath $(XENVLIBDIR) -#endif -#endif - -#ifndef X11ProjectDefines -# define X11ProjectDefines /**/ -#endif -#define ProjectDefines X11ProjectDefines - -#ifndef X11CplusplusProjectDefines -# define X11CplusplusProjectDefines X11ProjectDefines -#endif -#define CplusplusProjectDefines X11CplusplusProjectDefines - -#ifndef XtransFailSoft -# define XtransFailSoft NO -#endif - -#if XtransFailSoft -# define XtransFailDefine /**/ -#else -# define XtransFailDefine -DFAIL_HARD -#endif diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl deleted file mode 100644 index a5349e0eb3..0000000000 --- a/nx-X11/config/cf/X11.tmpl +++ /dev/null @@ -1,1562 +0,0 @@ -XCOMM ---------------------------------------------------------------------- -XCOMM X Window System Build Parameters and Rules -XCOMM ---------------------------------------------------------------------- - -/*************************************************************************** - * * - * DEFAULT DEFINITIONS * - * * - * The following section contains defaults for things that can * - * overridden in the various *.cf and site.def files. DO NOT EDIT! * - * * - **************************************************************************/ - -#define ProjectX 604 /* do *not* change this line */ - -/* The following project-specific rules are defined at the end of this file: - * - * InstallAppDefaults (class) - */ - -/* X.Org release string */ -#ifndef XOrgReleaseString -# if defined XorgVersionString -# define XOrgReleaseString Release XorgVersionString -# else -# define XOrgReleaseString Release 6.9 -# endif -#endif - -#ifndef XOrgManNameString -#define XOrgManNameString X Version 11 -#endif -#ifndef XOrgNameString -# define XOrgNameString The X.Org Foundation -#endif -#ifndef XOrgNameStringShort -# define XOrgNameStringShort X.Org -#endif -#ifndef XOrgStdFilePrefix -# define XOrgStdFilePrefix xorg -#endif -#ifndef XOrgWebSupportAddress -# define XOrgWebSupportAddress http://wiki.X.Org -#endif - -XORGRELSTRING = XorgManVersionString - XORGMANNAME = XOrgManNameString - -#ifndef XOrgManDefs -#define XOrgManDefs -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" -#endif - -#ifndef XVendorManNameString -#define XVendorManNameString XOrgManNameString -#endif -#ifndef XVendorManVersionString -#define XVendorManVersionString XOrgReleaseString -#endif -#ifndef XVendorNameString -# define XVendorNameString XOrgNameString -#endif -#ifndef XVendorNameStringShort -# define XVendorNameStringShort XOrgNameStringShort -#endif -#ifndef XVendorWebSupport -# define XVendorWebSupport XOrgWebSupportAddress -#endif -#ifndef XVendorStdFilePrefix -# define XVendorStdFilePrefix XOrgStdFilePrefix -#endif - -#ifndef VendorManDefs -#define VendorManDefs -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" -#endif - -#ifndef VendorDefines -#define VendorDefines -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' -#endif - -#ifndef VendorSupportDefines -# if defined XVendorWebSupport -# define VendorSupportDefines -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' -# endif -#endif -/* - * X-specific things - */ -#if CrossCompiling && !defined(UseInstalledOnCrossCompile) -# if defined(UseInstalled) -# define UseInstalledOnCrossCompile YES -# else -# define UseInstalledOnCrossCompile NO -# endif -#else -# define UseInstalledOnCrossCompile NO -#endif - -#ifndef HasXServer -#define HasXServer YES -#endif -/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf - * from the .cf file for your platform. - */ -#ifndef XorgServer -#define XorgServer NO -#endif -#ifndef BuildServer -#define BuildServer HasXServer -#endif -#ifndef BuildServersOnly -#define BuildServersOnly NO -#endif -#ifndef BuildClients -#define BuildClients !BuildServersOnly -#endif -#ifndef BuildDocs -#define BuildDocs !BuildServersOnly -#endif -#ifndef BuildLibraries -#define BuildLibraries (!BuildServersOnly || BuildClients) -#endif -#ifndef BuildLibrariesForXServers -#define BuildLibrariesForXServers BuildServer -#endif -#ifndef BuildX11Lib -#define BuildX11Lib BuildLibraries -#endif - -#ifndef InstallXcmsTxt -#define InstallXcmsTxt YES -#endif -/* - * This disables XLOCALEDIR. - */ -#ifndef DisableXLocaleDirEnv -#define DisableXLocaleDirEnv NO -#endif -#ifndef BuildLoadableXlibXcursor -#define BuildLoadableXlibXcursor (HasDlopen && SharedLibX11) -#endif -#ifndef BuildTestExt -#define BuildTestExt YES -#endif -#ifndef BuildSyncExt -#define BuildSyncExt YES -#endif -#ifndef BuildXCMiscExt -#define BuildXCMiscExt YES -#endif -#ifndef BuildShapeExt -#define BuildShapeExt YES -#endif -#ifndef BuildBigReqsExt -#define BuildBigReqsExt YES -#endif -#ifndef BuildXInputExt -#define BuildXInputExt NO -#endif -#ifndef BuildDBE -#define BuildDBE YES -#endif -#ifndef BuildDPMS -#define BuildDPMS YES -#endif -#ifndef BuildXKB -#define BuildXKB YES -#endif -#ifndef BuildXKBlib -#define BuildXKBlib (BuildXKB && !BuildServersOnly) -#endif - - /* - * WARNING: Setting UseXKBInClients to YES cause incompatibilities - * between many clients (such as xterm) and pre-XKB shared - * libraries. - */ -#ifndef UseXKBInClients -#define UseXKBInClients NO /* use XKB in "normal" clients? */ -#endif -#ifndef BuildRECORD -#define BuildRECORD YES -#endif -#ifndef BuildRECORDlib -#define BuildRECORDlib BuildRECORD -#endif -#ifndef BuildXinerama -#define BuildXinerama NO -#endif -#ifndef BuildXCSecurity -#define BuildXCSecurity YES -#endif -#ifndef HasPlugin -/* Browser plugins are shared libraries - only build them if the OS - * supports shared libs. - */ -#define HasPlugin HasSharedLibraries -#endif -#ifndef BuildPlugin -#define BuildPlugin HasPlugin -#endif - -#ifndef BuildScreenSaverExt -#define BuildScreenSaverExt NO -#endif -#ifndef BuildXF86BigfontExt -#define BuildXF86BigfontExt NO -#endif -#ifndef BuildXResExt -#define BuildXResExt NO -#endif -#ifndef BuildXvExt -#define BuildXvExt NO -#endif -#ifndef BuildXvMCExt -#define BuildXvMCExt NO -#endif -#ifndef BuildGlxExt -#define BuildGlxExt NO -#endif -#ifndef BuildOSMesaLib -#define BuildOSMesaLib BuildGlxExt -#endif -#ifndef BuildRender -#define BuildRender YES -#endif - -#ifndef BuildRandR -#define BuildRandR YES -#endif - -#ifndef BuildXfixes -#define BuildXfixes YES -#endif - -#ifndef BuildDamage -#define BuildDamage BuildXfixes -#endif - -#ifndef BuildComposite -#define BuildComposite (BuildXfixes && BuildDamage) -#endif -#ifndef BuildCompositeLibrary -#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary -#endif - -#ifndef BuildRootless -#define BuildRootless NO -#endif - -#ifndef DefaultCursorTheme -#define DefaultCursorTheme core -#endif - -#ifndef BuildMiscDocs -#define BuildMiscDocs NO -#endif -#ifndef BuildSpecsDocs -#define BuildSpecsDocs NO -#endif -#ifndef BuildAllSpecsDocs -#define BuildAllSpecsDocs NO -#endif - -#ifndef InstallHardcopyDocs -#define InstallHardcopyDocs YES -#endif - -#ifndef InstallMiscManPages -#define InstallMiscManPages YES -#endif - -#ifndef FSUseSyslog -#define FSUseSyslog NO -#endif - -#ifndef InstallLibManPages -#define InstallLibManPages YES -#endif - -#ifndef UseConfDirForXkb -#define UseConfDirForXkb YES -#endif -#ifndef ThreadedX -#if HasPosixThreads || HasCThreads -#define ThreadedX YES /* multi-threaded libraries */ -#else -#define ThreadedX NO -#endif -#endif -#ifndef ThreadedProject -#define ThreadedProject ThreadedX -#endif -#ifndef NeedUIThrStubs -#define NeedUIThrStubs NO -#endif -#ifndef HasWChar32 -#define HasWChar32 SystemV4 -#endif -#ifndef HasXdmAuth -#define HasXdmAuth NO /* if you can not use XDM-AUTH* */ -#endif -#ifndef PrimaryScreenResolution -#define PrimaryScreenResolution 72 /* a common resolution */ -#endif -#ifndef DefaultFontPath -# if PrimaryScreenResolution < 88 /* (75 + 100) / 2 */ -# define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ -# else -# define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ -# endif -#endif -#ifndef DefaultFSFontPath -# define DefaultFSFontPath DefaultFontPath -#endif -#ifndef UseMemLeak -#define UseMemLeak NO -#endif -#ifndef ServerErrorDefines -#define ServerErrorDefines /**/ -#endif -/* - * NOTE: IPv6Flags could be tacked on to either ConnectionFlags or - * ExtraConnectionDefs. Here, we choose the later in order to - * maximise exposure of the IPv6 code (a number of .def files - * contain ConnectionFlags overrides). - */ -#ifndef BuildIPv6 /* If the OS also #define's AF_INET6 */ -#define BuildIPv6 YES -#endif -#ifndef IPv6Flags -#if BuildIPv6 -#define IPv6Flags -DIPv6 -#else -#define IPv6Flags /**/ -#endif -#endif -/* - * Assume by default that IPv6 sockets also listen for IPv4 connections. - * XDMCP support currently only works for both IPv4 and IPv6 when this is - * true. - */ -#ifndef IPv6SocketsAlsoIPv4 -#define IPv6SocketsAlsoIPv4 YES -#endif -#ifndef ConnectionFlags -#define ConnectionFlags -DTCPCONN -DUNIXCONN -#endif -#if HasStickyDirBit -STICKY_DEFINES = -DHAS_STICKY_DIR_BIT -#endif -#if HasFchown -FCHOWN_DEFINES = -DHAS_FCHOWN -#endif -#ifndef ExtraConnectionDefs -#define ExtraConnectionDefs $(STICKY_DEFINES) $(FCHOWN_DEFINES) IPv6Flags -#endif -#ifndef ProjectThreadsDefines -#define ProjectThreadsDefines -DXTHREADS -#endif -#if Malloc0ReturnsNull -#ifndef XMalloc0ReturnsNullDefines -#define XMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -#endif -#ifndef XtMalloc0ReturnsNullDefines -#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC -#endif -#endif -#ifndef ExtensionOSDefines -#define ExtensionOSDefines /**/ -#endif - -#ifndef ExtensionDefines -#ifndef XTestDefines -#if BuildTestExt -#define XTestDefines -DXTEST -#else -#define XTestDefines /**/ -#endif -#endif -#ifndef XSyncDefines -#if BuildSyncExt -#define XSyncDefines -DXSYNC -#else -#define XSyncDefines /**/ -#endif -#endif -#ifndef XCMiscDefines -#if BuildXCMiscExt -#define XCMiscDefines -DXCMISC -#else -#define XCMiscDefines /**/ -#endif -#endif -#ifndef ShapeDefines -#if BuildShapeExt -#define ShapeDefines -DSHAPE -#else -#define ShapeDefines /**/ -#endif -#endif -#ifndef GlxDefines -#if BuildGlxExt -#ifdef GlxExtraDefines -#define GlxDefines -DGLXEXT GlxExtraDefines -#else -#define GlxDefines -DGLXEXT -#endif -#else -#define GlxDefines /**/ -#endif -#endif -#ifndef DRMSrcDir -#define DRMSrcDir $(TOP)/extras/drm -#endif -#ifndef MesaSrcDir -#define MesaSrcDir $(TOP)/extras/Mesa -#endif -#ifndef OglSampleSrcDir -#define OglSampleSrcDir $(TOP)/extras/ogl-sample -#endif -#ifndef ShmDefines -#if HasShm -#define ShmDefines -DMITSHM -#else -#define ShmDefines /**/ -#endif -#endif -#ifndef XInputDefines -#if BuildXInputExt -#define XInputDefines -DXINPUT -#else -#define XInputDefines /**/ -#endif -#endif -#ifndef XineramaDefines -#if BuildXinerama -#define XineramaDefines -DPANORAMIX -#else -#define XineramaDefines /**/ -#endif -#endif -#ifndef XkbDefines -#if BuildXKB -#define XkbDefines -DXKB -#else -#define XkbDefines /**/ -#endif -#endif -#ifndef XkbClientDefines -#if UseXKBInClients -#define XkbClientDefines -DXKB -#else -#define XkbClientDefines /**/ -#endif -#endif -#ifndef XkbServerDefines -#define XkbServerDefines /**/ -#endif -#ifndef XkbDefRulesDefines -#define XkbDefRulesDefines -D__XKBDEFRULES__='"$(XKBDEFRULES)"' -#endif -# ifndef XkbDefaultRulesFile -# define XkbDefaultRulesFile XVendorStdFilePrefix -#endif -#ifndef BigReqDefines -#if BuildBigReqsExt -#define BigReqDefines -DBIGREQS -#else -#define BigReqDefines /**/ -#endif -#endif - -#ifndef DBEDefines -#if BuildDBE -#define DBEDefines -DDBE -#else -#define DBEDefines /**/ -#endif -#endif - -#ifndef PervasiveDBEDefines -#define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */ -#endif - -#ifndef ScreenSaverExtensionDefines -#if BuildScreenSaverExt -#define ScreenSaverExtensionDefines -DSCREENSAVER -#else -#define ScreenSaverExtensionDefines /**/ -#endif -#endif - -#ifndef XF86BigfontExtensionDefines -#if BuildXF86BigfontExt -#define XF86BigfontExtensionDefines -DXF86BIGFONT -#else -#define XF86BigfontExtensionDefines /**/ -#endif -#endif - -#ifndef XvExtensionDefines -#if BuildXvExt -#define XvExtensionDefines -DXV -#else -#define XvExtensionDefines /**/ -#endif -#endif - -#ifndef XvMCExtensionDefines -#if BuildXvMCExt -#define XvMCExtensionDefines -DXVMC -#else -#define XvMCExtensionDefines /**/ -#endif -#endif - -#ifndef XResExtensionDefines -#if BuildXResExt -#define XResExtensionDefines -DRES -#else -#define XResExtensionDefines /**/ -#endif -#endif - -#ifndef RECORDDefines -#if BuildRECORD -#define RECORDDefines -DXRECORD -#else -#define RECORDDefines /**/ -#endif -#endif - -#ifndef XCSecurityDefines -#if BuildXCSecurity -#define XCSecurityDefines -DXCSECURITY -#else -#define XCSecurityDefines /**/ -#endif -#endif - -#ifndef DPMSDefines -#if BuildDPMS -#define DPMSDefines -DDPMSExtension -#else -#define DPMSDefines /**/ -#endif -#endif - -#ifndef RenderDefines -#if BuildRender -#define RenderDefines -DRENDER -#else -#define RenderDefines /**/ -#endif -#endif - -#ifndef RandRDefines -#if BuildRandR -#define RandRDefines -DRANDR -#else -#define RandRDefines /**/ -#endif -#endif - -#ifndef XfixesDefines -#if BuildXfixes -#define XfixesDefines -DXFIXES -#else -#define XfixesDefines /**/ -#endif -#endif - -#ifndef XDamageDefines -#if BuildDamage -#define XDamageDefines -DDAMAGE -#else -#define XDamageDefines /**/ -#endif -#endif - -#ifndef CompositeDefines -#if BuildComposite -#define CompositeDefines -DCOMPOSITE -#else -#define CompositeDefines /**/ -#endif -#endif - -#ifndef RootlessDefines -#if BuildRootless -#define RootlessDefines -DROOTLESS -#else -#define RootlessDefines /**/ -#endif -#endif - -#ifndef SitePervasiveExtensionDefines -#define SitePervasiveExtensionDefines /**/ -#endif -#ifndef PervasiveExtensionDefines -#define PervasiveExtensionDefines \ - PervasiveDBEDefines \ - ShapeDefines \ - XInputDefines \ - XkbDefines \ - XCSecurityDefines \ - XF86BigfontExtensionDefines \ - DPMSDefines \ - SitePervasiveExtensionDefines \ - RenderDefines \ - RandRDefines \ - XineramaDefines \ - XfixesDefines \ - XDamageDefines \ - CompositeDefines \ - RootlessDefines -#endif -#ifndef SiteExtensionDefines -#define SiteExtensionDefines /**/ -#endif -#ifndef BaseExtensionDefines -#define BaseExtensionDefines \ - DBEDefines \ - XTestDefines \ - XSyncDefines \ - XCMiscDefines \ - RECORDDefines \ - ShmDefines \ - BigReqDefines \ - DPMSDefines \ - ScreenSaverExtensionDefines \ - XvExtensionDefines \ - XvMCExtensionDefines \ - GlxDefines \ - SiteExtensionDefines \ - XResExtensionDefines -#endif -#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines -#endif /* ExtensionDefines */ - -#ifndef HasStrcasecmp -#define HasStrcasecmp YES -#endif - -#ifndef StrcasecmpDefines -# if HasStrcasecmp -# define StrcasecmpDefines /**/ -# else -# define StrcasecmpDefines -DNEED_STRCASECMP -# endif -#endif - -#ifndef HasDevRandom -#define HasDevRandom NO -#endif - -#ifndef HasArc4Random -#define HasArc4Random NO -#endif - -#ifndef RandomDefines -# if HasDevRandom -# ifndef RandomDeviceFile -# define RandomDeviceFile /dev/random -# endif -# ifndef ExtraRandomDefines -# ifdef PollDevRandom /* Set if can poll() /dev/random to avoid blocking */ -# define ExtraRandomDefines -DPOLL_DEV_RANDOM -# else -# define ExtraRandomDefines /**/ -# endif -# endif -# define RandomDefines -DDEV_RANDOM=\"RandomDeviceFile\" ExtraRandomDefines -# elif HasArc4Random -# define RandomDefines -DARC4_RANDOM -# else -# define RandomDefines /**/ -# endif -#endif - -#ifndef PreferXdmcpIPv6 -#define PreferXdmcpIPv6 NO -#endif -#ifndef ServerXdmcpIPv6Defines -#if BuildIPv6 && !IPv6SocketsAlsoIPv4 && !PreferXdmcpIPv6 -#define ServerXdmcpIPv6Defines -DXDMCP_NO_IPV6 -#else -#define ServerXdmcpIPv6Defines /**/ -#endif -#endif - -#ifndef ServerXdmcpDefines -#define ServerXdmcpDefines -DXDMCP ServerXdmcpIPv6Defines -#endif -#ifndef ServerOSDefines -#define ServerOSDefines /**/ -#endif -#ifndef ServerExtraDefines -#define ServerExtraDefines /* -DPIXPRIV */ -#endif -#ifndef ServerAssertDefines -#define ServerAssertDefines -DNDEBUG -#endif -#ifndef ServerSnprintfDefines -#if !HasSnprintf -#define ServerSnprintfDefines -DNEED_SNPRINTF -#else -#define ServerSnprintfDefines /**/ -#endif -#endif -#ifndef ServerReallocarrayDefines -#if HasReallocarray -#define ServerReallocarrayDefines -DHAVE_REALLOCARRAY -#else -#define ServerReallocarrayDefines /**/ -#endif -#endif -#ifndef ServerDefines -#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines ServerReallocarrayDefines -#endif - -#ifndef MesaUseX86Asm -/* The current Mesa X86 ASM code doesn't work well with SVR4 shared libs. */ -# if HasX86Support && !SystemV4 -# define MesaUseX86Asm YES -# else -# define MesaUseX86Asm NO -# endif -#endif - -#ifndef MesaUseMMX -#ifdef HasMMXSupport -#define MesaUseMMX HasMMXSupport -#else -#define MesaUseMMX NO -#endif -#endif - -#ifndef MesaUse3DNow -#ifdef Has3DNowSupport -#define MesaUse3DNow Has3DNowSupport -#else -#define MesaUse3DNow NO -#endif -#endif - -#ifndef MesaUseSSE -#ifdef HasSSESupport -#define MesaUseSSE HasSSESupport -#else -#define MesaUseSSE NO -#endif -#endif - -/* For compatibility */ -#ifdef HasSSESupport -#undef HasKatmaiSupport -#define HasKatmaiSupport HasSSESupport -#endif -#undef MesaUseKatmai -#define MesaUseKatmai MesaUseSSE - -#ifndef UsbMouseSupport -# define UsbMouseSupport NO -#endif - -#ifndef DefaultFSConfigFile -#define DefaultFSConfigFile $(LIBDIR)/fs/config -#endif - -#ifndef BinDir -#ifdef ProjectRoot -#define BinDir Concat(ProjectRoot,/bin) -#else -#define BinDir /usr/bin/X11 -#endif -#endif -#ifndef BuildIncRoot -#define BuildIncRoot $(TOP)/exports -#endif -#ifndef BuildIncDir -#define BuildIncDir $(BUILDINCROOT)/include -#endif -#ifndef BuildIncTop -#define BuildIncTop ../.. /* relative to BuildIncDir */ -#endif -#ifndef XTop -# if ImportX11 -# define XTop $(TOP)/imports/x11 -# else -# define XTop $(TOP) -# endif -#endif -#ifndef XBuildIncRoot -# if ImportX11 -# define XBuildIncRoot $(XTOP) -# else -# define XBuildIncRoot $(XTOP)/exports -# endif -#endif -#ifndef XBuildIncDir -# define XBuildIncDir $(XBUILDINCROOT)/include/X11 -#endif -#ifndef XBuildIncTop -# define XBuildIncTop ../../.. -#endif -#ifndef XBuildBinDir -# define XBuildBinDir $(XBUILDINCROOT)/bin -#endif -#ifndef BuildBinDir -#define BuildBinDir $(TOP)/exports/bin -#endif -#ifndef BuildBinTop -#define BuildBinTop ../.. /* relative to BuildBinDir */ -#endif -#ifndef BuildLibDir -#define BuildLibDir $(TOP)/exports/lib -#endif -#ifndef BuildLibTop -#define BuildLibTop ../.. /* relative to BuildLibDir */ -#endif -#ifndef BuildModuleDir -#define BuildModuleDir $(BUILDLIBDIR)/modules -#endif -#ifndef BuildI18NDir -# define BuildI18NDir $(BUILDLIBDIR)/locale -#endif -#ifndef BuildModuleTop -#define BuildModuleTop $(BUILDLIBTOP)/.. -#endif -#ifndef LibDir -# ifdef ProjectRoot -# define LibDir Concat(ProjectRoot,/lib/nx/X11) -# else -# define LibDir /usr/lib/X11 -# endif -#endif -#ifndef ModuleDir -#define ModuleDir $(USRLIBDIR)/modules -#endif -#ifndef InstSrcDir -#define InstSrcDir Concat(ProjectRoot,/src) -#endif -#ifndef LibexecDir -#ifdef ProjectRoot -#define LibexecDir Concat(ProjectRoot,/libexec) -#else -#define LibexecDir /usr/X11/libexec -#endif -#endif -#ifndef ConfigDir -#define ConfigDir $(LIBDIR)/config -#endif -#ifndef DocDir -#define DocDir $(LIBDIR)/doc -#endif -#ifndef DocHtmlDir -#define DocHtmlDir $(DOCDIR)/html -#endif -#ifndef DocPsDir -#define DocPsDir $(DOCDIR)/PostScript -#endif -#ifndef DocPdfDir -#define DocPdfDir $(DOCDIR)/PDF -#endif -#ifndef FontDir -#define FontDir $(USRDATADIR)/fonts -#endif -#ifndef FontEncDir -#define FontEncDir $(USRDATADIR)/fonts/encodings -#endif -#ifndef AdmDir -#define AdmDir /usr/adm -#endif -#ifndef XinitDir -#define XinitDir $(LIBDIR)/xinit -#endif -#ifndef XdmDir -#define XdmDir $(LIBDIR)/xdm -#endif -#ifndef XdmVarDir -#define XdmVarDir $(VARLIBDIR)/xdm -#endif -#ifndef XdmAuthDir -#define XdmAuthDir $(LIBDIR)/xdm -#endif -#ifndef XdmConfigurationSubdirectory /* under xdm sources */ -#define XdmConfigurationSubdirectory config -#endif -#ifndef TwmDir -#define TwmDir $(LIBDIR)/twm -#endif -#ifndef XsmDir -#define XsmDir $(LIBDIR)/xsm -#endif -#ifndef NlsDir -#define NlsDir $(LIBDIR)/nls -#endif -#ifndef XLocaleDir -#define XLocaleDir $(LIBDIR)/locale -#endif -#ifndef ProxyManagerDir -#define ProxyManagerDir $(LIBDIR)/proxymngr -#endif -#ifndef ServerConfigDir -#define ServerConfigDir $(LIBDIR)/xserver -#endif -#ifndef EtcX11Directory -#define EtcX11Directory /etc/X11 -#endif -#ifndef InstallSecurityConfig -#define InstallSecurityConfig YES /* Install sample security policy */ -#endif -#ifndef XFileSearchPathBase -/* avoid SCCS keyword */ -#define XFileSearchPathBase Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) -#endif -#ifndef XFileSearchPathDefault -#ifdef XAppLoadDir -/* avoid SCCS keyword */ -#define XFileSearchPathDefault XAppLoadDir/Concat(%N%C,%S):XAppLoadDir/%N%S:XFileSearchPathBase -#else -#define XFileSearchPathDefault XFileSearchPathBase -#endif -#endif -#ifndef XAppLoadDir -#define XAppLoadDir $(LIBDIR)/app-defaults -#endif -#ifndef XtErrorPrefix -#define XtErrorPrefix /* as empty string */ -#endif -#ifndef XtExtraDefines -#define XtExtraDefines /* as empty string */ -#endif -#ifndef XtWarningPrefix -#define XtWarningPrefix /* as empty string */ -#endif -#ifndef OsNameDefines -#define OsNameDefines /* as nothing */ -#endif -#ifndef DefaultUserPath /* for xdm */ -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb -#endif -#ifndef DefaultSystemPath /* for xdm */ -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb -#endif -#ifndef DefaultSystemShell /* for xdm to set in SHELL */ -#define DefaultSystemShell BourneShell -#endif -#ifndef ContribDir -#define ContribDir $(XTOP)/../contrib /* contrib is outside core tree */ -#endif -#ifndef UnsupportedDir -#define UnsupportedDir $(XTOP)/unsupported -#endif -#ifndef AllocateLocalDefines -#define AllocateLocalDefines /**/ -#endif - -#ifndef ForceNormalLib -#define ForceNormalLib (HasGcc && !HasGcc2) -#endif - -#ifndef PsWrap -# ifndef UseInstalled -# define PsWrap $(PSWRAPSRC)/pswrap -# else -# define PsWrap pswrap -# endif -#endif - -#ifndef ResourceConfigurationManagement -#define ResourceConfigurationManagement YES -#endif - -#ifndef XtPopdownConformance -#define XtPopdownConformance YES -#endif - -XCOMM ----------------------------------------------------------------------- -XCOMM X Window System make variables; these need to be coordinated with rules - -/* - * This list must be reflected in the DIRS_TO_BUILD list in the top-level - * Makefile. - */ - XTOP = XTop - BINDIR = BinDir /* programs */ - BUILDINCROOT = BuildIncRoot /* base of build loc */ - BUILDINCDIR = BuildIncDir /* built headers */ - BUILDINCTOP = BuildIncTop /* top relative to BUILDINCDIR */ - BUILDLIBDIR = BuildLibDir /* built libraries */ - BUILDLIBTOP = BuildLibTop /* top relative to BUILDLIBDIR */ - BUILDBINDIR = BuildBinDir /* built binaries */ - BUILDBINTOP = BuildBinTop /* top relative to BUILDBINDIR */ - BUILDMODULEDIR = BuildModuleDir /* built server modules */ - BUILDI18NDIR = BuildI18NDir /* built i81n modules */ - BUILDMODULETOP = BuildModuleTop /* top relative to BUILDMODULEDIR */ - XBUILDINCROOT = XBuildIncRoot /* base of X build loc */ - XBUILDINCDIR = XBuildIncDir - XBUILDINCTOP = XBuildIncTop - XBUILDBINDIR = XBuildBinDir - INCDIR = $(INCROOT) /* header files */ - ADMDIR = AdmDir /* server log files */ - LIBDIR = LibDir /* rgb, XErrorDB, etc. */ - LIBEXECDIR = LibexecDir - MODULEDIR = ModuleDir - TOP_X_INCLUDES = TopXInclude - XBINDIR = XBinDir /* BINDIR for X11ProjectRoot */ - - INSTSRCDIR = InstSrcDir /* Installed source (kernel modules). */ - -#ifdef EtcX11Directory - ETCX11DIR = EtcX11Directory -#endif -#if UseEtcX11 - CONFDIR = $(ETCX11DIR) -#elif HasVarDirectory - CONFDIR = $(VARDIR) -#endif - DOCDIR = DocDir - DOCHTMLDIR = DocHtmlDir - DOCPSDIR = DocPsDir - DOCPDFDIR = DocPdfDir - FONTDIR = FontDir /* font directories */ - ENCODINGSDIR = FontEncDir /* font encodings directory */ - XINITDIR = XinitDir /* xinit config files */ - XDMDIR = XdmDir /* xdm config files */ - XDMVARDIR = XdmVarDir /* xdm config files */ - TWMDIR = TwmDir /* twm config files */ - XSMDIR = XsmDir /* xsm config files */ - NLSDIR = NlsDir /* nls files */ - XLOCALEDIR = XLocaleDir /* locale files */ - XLOCALELIBDIR = XlocaleDir /* FIXME: For now take XLOCALEDIR, unsure about the correct setting */ - PROXYMANAGERDIR = ProxyManagerDir /* proxy manager config files */ - XAPPLOADDIR = XAppLoadDir /* application default resource dir */ - - INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ - -#if UseInstalledX11 - RGB = $(XBINDIR)/rgb - MKHTMLINDEX = $(XBINDIR)/mkhtmlindex -#else - RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb -# if HasPerl - MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) -# else - MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh -# endif -#endif - HTMLINDEXCMD = HtmlIndexCmd - - DOCUTILSRC = $(XTOP)/doc/util - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - XDOCMACROS = $(DOCUTILSRC)/macros.t - XIDXMACROS = $(DOCUTILSRC)/indexmacros.t - PROGRAMSRC = $(TOP)/programs - LIBSRC = $(XTOP)/lib - INCLUDESRC = BuildIncDir - XINCLUDESRC = $(INCLUDESRC)/nx-X11 - SERVERSRC = $(XTOP)/programs/Xserver - CONTRIBSRC = ContribDir - UNSUPPORTEDSRC = UnsupportedDir - DOCSRC = $(XTOP)/doc - RGBSRC = $(XTOP)/programs/rgb - EXTINCSRC = $(XTOP)/include/extensions - DRMSRCDIR = DRMSrcDir - MESASRCDIR = MesaSrcDir - OGLSAMPLESRCDIR = OglSampleSrcDir - PSWRAPSRC = $(XTOP)/config/pswrap - TRANSCOMMSRC = $(LIBSRC)/xtrans - TRANS_INCLUDES = -I$(TRANSCOMMSRC) - CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs -XTRANS_FAILDEFINES = XtransFailDefine -#ifdef X11ProjectRoot - XPROJECTROOT = X11ProjectRoot -#endif - VENDORMANNAME = XVendorManNameString - VENDORMANVERSION = XVendorManVersionString - XORGMANDEFS = XOrgManDefs - VENDORMANDEFS = VendorManDefs - VENDORNAME = XVendorNameString - VENDORNAMESHORT = XVendorNameStringShort - -#if defined (XVendorWebSupport) - VENDORWEBSUPPORT = XVendorWebSupport -#endif -VENDORSUPPORTDEFS = VendorSupportDefines - - XKBDEFRULES = XkbDefaultRulesFile - XKBDEFRULESDEFS = XkbDefRulesDefines - - XCONFIGFILE = XConfigFile - XCONFIGDIR = XConfigDir - XLOGFILE = XLogFile - XSERVERNAME = XServerName - -#if HasSharedLibraries -#ifndef DontUseLibPathVar -#ifndef BuildLibPathVar -#define BuildLibPathVar LD_LIBRARY_PATH -#endif -#endif -#endif -#ifdef BuildLibPathVar -# ifdef SystemBuildLibPath - SYSTEMENVLIBDIR = SystemBuildLibPath -# endif -#define XlocaleClientSetup Concat3(XLOCALEDIR,=,BuildI18NDir) - Concat3(XLOCALELIBDIR,=,BuildI18NDir) - XENVLIBDIR = X11BuildLibPath - CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath) XlocaleClientSetup -#else - CLIENTENVSETUP = -#endif - -#ifdef PreloadSetup - PRELOADSETUP = PreloadSetup -#endif - -#ifndef ShLibIncludeFile -/* need this to make ANSI-style preprocessors happy */ -#define ShLibIncludeFile -#endif - -#include ShLibIncludeFile - -#ifndef XBuildLibDir -# define XBuildLibDir BuildLibDir -#endif - -#ifndef NeedLibInsideFlag -#define NeedLibInsideFlag NO -#endif - -#ifndef SharedLibX11 -#define SharedLibX11 HasSharedLibraries -#endif -#ifndef NormalLibX11 -#define NormalLibX11 (!SharedLibX11 | ForceNormalLib) -#endif -#ifndef DebugLibX11 -#define DebugLibX11 NO /* debugged X library */ -#endif -#ifndef ProfileLibX11 -#define ProfileLibX11 NO /* profiled X library */ -#endif - XLIBSRC = $(LIBSRC)/X11 -#if SharedLibX11 -#ifndef SharedX11Rev -#define SharedX11Rev 6.2 -#endif -SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) -#else -ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) -#endif - /* Common alternate spellings */ - DEPXLIBONLY = $(DEPXONLYLIB) - XLIBONLY = $(XONLYLIB) - LINTXONLYLIB = $(LINTXONLY) - -#if HasMotif - -#ifndef MotifDir -#define MotifDir /usr/X11R6 -#endif -#ifndef MotifDirStandard -#define MotifDirStandard NO -#endif - -#ifndef MotifLibDir -# define MotifLibDir MotifDir/LibDirName -# if MotifDirStandard -# define MotifLibDirStandard YES -# endif -#endif -#ifndef MotifLibDirStandard -# define MotifLibDirStandard NO -#endif - -#ifndef MotifIncDir -# define MotifIncDir MotifDir/include -# if MotifDirStandard -# define MotifIncDirStandard YES -# endif -#endif -#ifndef MotifIncDirStandard -# define MotifIncDirStandard NO -#endif - -MOTIFDIR = MotifDir -MOTIFLIBDIR = MotifLibDir -MOTIFINCDIR = MotifIncDir - -#if MotifLibDirStandard -MOTIFLIB = -lXm -#else -MOTIFLIB = -L$(MOTIFLIBDIR) LinkerRuntimeLibraryPathFlag($(MOTIFLIBDIR)) -lXm -#endif - -#if MotifIncDirStandard -MOTIFINCLUDES = -#else -MOTIFINCLUDES = -I$(MOTIFINCDIR) -#endif - -#endif /* HasMotif */ - -#ifndef LdLibraryPath -#define LdLibraryPath LD_LIBRARY_PATH -#endif - -#if BuildXKBlib -# ifndef XkbClientDepLibs -# define XkbClientDepLibs /**/ -# endif -# ifndef XkbClientLibs -# define XkbClientLibs /**/ -# endif - -#else /* !BuildXKBlib */ -# ifndef XkbClientDepLibs -# define XkbClientDepLibs -# endif -# ifndef XkbClientLibs -# define XkbClientLibs -# endif -#endif /* BuildXKBlib */ - -#ifndef NeedDefaultDepLibs -#define NeedDefaultDepLibs YES -#endif - -#if NeedDefaultDepLibs -/* - * Individual libraries should override this - */ -#if HasSharedLibraries || defined(UseInstalled) - DEPLIBS = $(DEPXLIB) -#else - DEPLIBS = $(LOCAL_LIBRARIES) -#endif - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - DEPLIBS4 = $(DEPLIBS) - DEPLIBS5 = $(DEPLIBS) - DEPLIBS6 = $(DEPLIBS) - DEPLIBS7 = $(DEPLIBS) - DEPLIBS8 = $(DEPLIBS) - DEPLIBS9 = $(DEPLIBS) - DEPLIBS10 = $(DEPLIBS) -#endif /* NeedDefaultDepLibs */ - - -/* - * InstallAppDefaults - simple rules to install application default file - */ -#ifndef InstallAppDefaults -#define InstallAppDefaults(class) InstallAppDefaultsLong(class,class) -#endif /* InstallAppDefaults */ - -/* - * PostProcessTroffPS - by default moves the working output into place, - * but can be a hook for more complicated post-processing. - */ -#ifndef PostProcessTroffPS -#define PostProcessTroffPS(temp,real) $(MV) temp real -#endif - -/* - * PostProcessTroffHTML - by default moves the working output into place, - * but can be a hook for more complicated post-processing. - */ -#ifndef PostProcessTroffHTML -#define PostProcessTroffHTML(temp,real) $(MV) temp real -#endif - -#ifdef HTMLroffCmd -#define HtmlTarget(file) file.html -#define HtmlClean(file) file.nhtml file.html file*.png -#else -#define HtmlTarget(file) /**/ -#define HtmlClean(file) /**/ -#endif - -#ifdef PsToPdfCmd -#define PdfTarget(file) file.pdf -#define PdfClean(file) file.pdf -#else -#define PdfTarget(file) /**/ -#define PdfClean(file) /**/ -#endif - -#ifndef ConvertPsToPdf -#ifdef PsToPdfCmd -#define ConvertPsToPdf(file) @@\ -file.pdf: file.ps @@\ - RemoveFile(file.pdf) @@\ - $(PSTOPDFCMD) < file.ps > file.pdf -#else -#define ConvertPsToPdf(file) /**/ -#endif -#endif - -#if HasPdfLatex -#define PdfLatexTarget(file) file.pdf -#define PdfLatexClean(file) file.pdf -#else -#define PdfLatexTarget(file) /**/ -#define PdfLatexClean(file) /**/ -#endif - -#ifndef LatexToPdf -#if HasPdfLatex && defined(PdfLatexCmd) -#define LatexToPdf(file) @@\ -file.pdf: file.tex @@\ - RemoveFile(file.pdf) @@\ - $(PDFLATEXCMD) file.tex -#else -#define LatexToPdf(file) /**/ -#endif -#endif - - -#ifndef MakeDepSimpleHtmlDoc -#ifdef HTMLroffCmd -#define MakeDepSimpleHtmlDoc(file,deps,srcs) @@\ -HtmlTarget(file): deps @@\ - $(HTMLROFF) $(MSMACROS) $(XDOCMACROS) Concat(-P-I,file) srcs \ @@\ - 2> index.raw > file.nhtml \ @@\ - && PostProcessTroffHTML(file.nhtml,$@) -#else -#define MakeDepSimpleHtmlDoc(file,deps,srcs) /**/ -#endif -#endif - -#ifndef MakeTblHtmlDoc -#ifdef HTMLroffCmd -#define MakeTblHtmlDoc(file,srcs) @@\ -file.html: srcs @@\ - $(TBL) $(XDOCMACROS) srcs | $(HTMLROFF) $(MSMACROS) Concat(-P-I,file) \ @@\ - 2> index.raw > file.nhtml \ @@\ - && PostProcessTroffHTML(file.nhtml,$@) -#else -#define MakeTblHtmlDoc(file,srcs) /**/ -#endif -#endif - -#ifndef MakeEqnHtmlDoc -#ifdef HTMLroffCmd -#define MakeEqnHtmlDoc(file,srcs) @@\ -file.html: srcs @@\ - $(TBL) $(XDOCMACROS) srcs | $(EQN) | $(HTMLROFF) $(MSMACROS) Concat(-P-I,file) \ @@\ - 2> index.raw > file.nhtml \ @@\ - && PostProcessTroffHTML(file.nhtml,$@) -#else -#define MakeEqnHtmlDoc(file,srcs) /**/ -#endif -#endif - - -#ifndef MakeDepSimpleDoc -#define MakeDepSimpleDoc(file,deps,srcs) @@\ -all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\ -.PRECIOUS: file.ps @@\ - @@\ -file.ps: deps @@\ - -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs \ @@\ - 2> index.raw > file.nps \ @@\ - && PostProcessTroffPS(file.nps,$@) @@\ - @if grep '^[^1-9.]' index.raw | grep -v warning; then exit 1; \ @@\ - else test $$? -le 1; fi @@\ - @@\ -file.txt: deps @@\ - $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | \ @@\ - $(COL) $(COLFLAGS) > $@ @@\ - @@\ -MakeDepSimpleHtmlDoc(file,deps,srcs) @@\ - @@\ -ConvertPsToPdf(file) @@\ - @@\ -clean:: @@\ - $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file) -#endif - -#ifndef MakeSimpleDoc -#define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs) -#endif - -#ifndef MakeTblDoc -#define MakeTblDoc(file,srcs) @@\ -all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\ -.PRECIOUS: file.ps @@\ - @@\ -file.ps: srcs @@\ - -$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) \ @@\ - 2> index.raw > file.nps \ @@\ - && PostProcessTroffPS(file.nps,$@) @@\ - @if grep '^[^1-9.]' index.raw | grep -v warning; then exit 1; \ @@\ - else test $$? -le 1; fi @@\ - @@\ -file.txt: srcs @@\ - $(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw \ @@\ - | $(COL) $(COLFLAGS) > $@ @@\ - @@\ -MakeTblHtmlDoc(file,srcs) @@\ - @@\ -ConvertPsToPdf(file) @@\ - @@\ -clean:: @@\ - $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file) -#endif - -#ifndef MakeEqnDoc -#define MakeEqnDoc(file,srcs) @@\ -all:: file.ps file.txt HtmlTarget(file) PdfTarget(file) @@\ -.PRECIOUS: file.ps @@\ - @@\ -file.ps: srcs @@\ - -$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) \ @@\ - 2> index.raw > file.nps \ @@\ - && PostProcessTroffPS(file.nps,$@) @@\ - @if grep '^[^1-9.]' index.raw | grep -v warning; then exit 1; \ @@\ - else test $$? -le 1; fi @@\ - @@\ -file.txt: srcs @@\ - $(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) \ @@\ - 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\ - @@\ -MakeEqnHtmlDoc(file,srcs) @@\ - @@\ -ConvertPsToPdf(file) @@\ - @@\ -clean:: @@\ - $(RM) index.raw file.nps file.ps file.txt HtmlClean(file) PdfClean(file) -#endif - -#ifndef MakeDocIndex -#define MakeDocIndex(file,srcs) @@\ -all:: file.idx.ps @@\ - @@\ -file.idx.ps: srcs index.raw @@\ - sed -n '$$p' index.raw > index.pageno @@\ - grep '^[1-9]' index.raw | \ @@\ - (sort -f '-t:' -k2,2 -k1,1n 2>/dev/null || \ @@\ - sort -f '-t:' +1 -3 +0n -1n) | \ @@\ - awk -f $(DOCUTILSRC)/fixindex.awk | \ @@\ - awk -f $(DOCUTILSRC)/block.awk > index.troff @@\ - cat srcs $(XIDXMACROS) index.troff | \ @@\ - $(TROFF) -me > file.idx.nps && \ @@\ - $(MV) file.idx.nps $@ @@\ - $(RM) index.troff index.pageno @@\ - @@\ -clean:: @@\ - $(RM) index.troff index.pageno file.idx.nps file.idx.ps -#endif - -#ifndef MakeLatexDoc -#if HasLatex -#define MakeLatexDoc(file,src) @@\ -all:: file.ps PdfLatexTarget(file) @@\ - @@\ -file.dvi: src @@\ - $(LATEX) src @@\ - @@\ -file.ps: file.dvi @@\ - $(DVIPS) -o file.nps file && $(MV) file.nps $@ @@\ - @@\ -LatexToPdf(file) @@\ - @@\ -clean:: @@\ - RemoveFiles(file.nps file.ps file.dvi file.log) @@\ - RemoveFiles(file.aux file.toc file.lof file.lot) @@\ - $(RM) PdfLatexClean(file) -#else /* HasLatex */ -#define MakeLatexDoc(file,src) @@\ -all:: @@\ -file.ps: src @@\ - @echo "cannot make file.ps: no latex on this system"; exit 1 -#endif /* HasLatex (else) */ -#endif /* MakeLatexDoc */ - -#ifndef InstallDoc -#define InstallDoc(name,deps) @@\ -install:: deps @@\ - MakeDir($(DESTDIR)$(DOCPSDIR)) @@\ - @if [ -f name.ps -a X$(NOPS) = X ]; then set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.ps \ @@\ - $(DESTDIR)$(DOCPSDIR); \ @@\ - fi ; RemoveOldFile(name.ps,name.PS,$(DOCPSDIR)) @@\ - MakeDir($(DESTDIR)$(DOCDIR)) @@\ - @if [ -f name.txt -a X$(NOTXT) = X ]; then set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.txt \ @@\ - $(DESTDIR)$(DOCDIR); \ @@\ - fi ; RemoveOldFile(name.txt,name.TXT,$(DOCDIR)) @@\ - MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ - @if [ -f name.html -a X$(NOHTML) = X ]; then (set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \ @@\ - $(DESTDIR)$(DOCHTMLDIR)); \ @@\ - for i in name*.png; do \ @@\ - if [ -f $$i ]; then (set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i \ @@\ - $(DESTDIR)$(DOCHTMLDIR)); \ @@\ - fi; \ @@\ - done; \ @@\ - fi @@\ - MakeDir($(DESTDIR)$(DOCPDFDIR)) @@\ - @if [ -f name.pdf -a X$(NOPDF) = X ]; then set -x; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.pdf \ @@\ - $(DESTDIR)$(DOCPDFDIR); \ @@\ - fi -#endif - -#ifndef InstallRoffDoc -#define InstallRoffDoc(name) InstallDoc(name,name.ps name.txt) -#endif - -#ifndef InstallLatexDoc -#if HasLatex -#define InstallLatexDoc(name) InstallDoc(name,name.ps) -#else -#define InstallLatexDoc(name) -#endif -#endif - -#ifndef LinkHardcopyPS -# if CaseSensitiveFileSystem -# define LinkHardcopyPS(name) \ - @if [ -f name.PS ]; then set -x; \ @@\ - RemoveFile(name.ps); \ @@\ - $(LN) name.PS name.ps; \ @@\ - fi -# else -# define LinkHardcopyPS(name) -# endif -#endif - - -#ifndef InstallHardcopyDoc -#define InstallHardcopyDoc(name,deps) @@\ -all:: name.ps PdfTarget(name) @@\ - @@\ -name.ps: deps @@\ - @if [ -f name.PS.gz ]; then set -x; \ @@\ - RemoveFile(name.ps); \ @@\ - gzip -d < name.PS.gz > name.ps; \ @@\ - fi @@\ - LinkHardcopyPS(name) @@\ - @@\ -ConvertPsToPdf(name) @@\ - @@\ -clean:: @@\ - $(RM) name.ps PdfClean(name) @@\ - @@\ -InstallDoc(name,deps) -#endif - - XRENDERPRELOADPATTERN = libXrender.so.? - XFONTPRELOADPATTERN = libXfont*.so.? - diff --git a/nx-X11/config/cf/cross.def b/nx-X11/config/cf/cross.def deleted file mode 100644 index d1b737fccb..0000000000 --- a/nx-X11/config/cf/cross.def +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file contains redefinitions of some symbols to enable - * cross compilation: e.g. paths for include files and paths to - * compiler images. It will have to be edited to reflect these - * given your local configuration. - */ -#if 0 -#undef i386Architecture -#define Arm32Architecture - -#undef OptimizedCDebugFlags -#define OptimizedCDebugFlags -O2 -#define ServerCDebugFlags -O2 -#undef StandardDefines -#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \ - -D_DEFAULT_SOURCE -D_GNU_SOURCE -DX_LOCALE -#undef CcCmd -#define StdIncDir /opt/Embedix/tools/arm-linux/include -#define PreIncDir -#undef PostIncDir -#define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include -#define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc -#undef CplusplusCmd -#define HasCplusplus YES -#define CplusplusCmd /opt/Embedix/tools/bin/arm-linux-g++ -#define DoRanlibCmd YES -#define RanlibCmd /opt/Embedix/tools/bin/arm-linux-ranlib -#undef ExtraLoadFlags -#define ExtraLoadFlags -#undef ExtraInstallLoadFlags -#define ExtraInstallLoadFlags -#define FbNoPixelAddrCode -#undef TermcapLibrary -#define TermcapLibrary -ltermcap - -#undef LdPostLib -#define LdPostLib -L/opt/Embedix/tools/arm-linux/lib - -#undef ExtensionOSDefines -#define ExtensionOSDefines - -#define ServerXdmcpDefines /**/ - -#define HostCcCmd cc -#endif -#include diff --git a/nx-X11/config/cf/cross.rules b/nx-X11/config/cf/cross.rules deleted file mode 100644 index fe8d119ab8..0000000000 --- a/nx-X11/config/cf/cross.rules +++ /dev/null @@ -1,145 +0,0 @@ -#ifndef HostCcCmd -#define HostCcCmd cc -#endif - -#define HostLinkRule(target,flags,objs,libs) HostCcCmd -I$(BUILDINCDIR) -o target flags objs libs - -/* ComplexHostProgramTarget - Compile a program such that we can run - * it on this host, i.e., don't use the default cross compiler. - */ -#ifndef ComplexHostProgramTarget -#define ComplexHostProgramTarget(program) @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): $(OBJS) $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -DependTarget() @@\ - @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* ComplexHostProgramTarget */ - - -#ifndef SimpleHostProgramTarget -#define SimpleHostProgramTarget(program) @@\ - SRCS = program.c @@\ - @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): program.o $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -DependTarget() @@\ - @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* SimpleHostProgramTarget */ - -#ifndef SimpleHostProgramTarget_1 -#define SimpleHostProgramTarget_1(program) @@\ - SRCS = program.c @@\ - @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): program.o $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* SimpleHostProgramTarget_1 */ - - -#ifndef SimpleHostProgramTarget_2 -#define SimpleHostProgramTarget_2(program) @@\ - SRCS = program.c @@\ - @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): program.o $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* SimpleHostProgramTarget_2 */ - -#ifndef SimpleHostProgramTarget_3 -#define SimpleHostProgramTarget_3(program) @@\ - SRCS = program.c @@\ - @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): program.o $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* SimpleHostProgramTarget_3 */ - -#ifndef SimpleHostProgramTarget_4 -#define SimpleHostProgramTarget_4(program) @@\ - SRCS = program.c @@\ - @@\ - CC=HostCcCmd @@\ - STD_INCLUDES= @@\ - CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)\ @@\ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) @@\ -EXTRA_LOAD_FLAGS= @@\ - PROGRAM = program @@\ - @@\ -AllTarget(HostProgramTargetName(program)) @@\ - @@\ -HostProgramTargetName(program): program.o $(DEPLIBS) @@\ - RemoveTargetProgram($@) @@\ - HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ - @@\ -clean:: @@\ - RemoveFile(HostProgramTargetName(program)) -#endif /* SimpleHostProgramTarget_4 */ diff --git a/nx-X11/config/cf/gnu.cf b/nx-X11/config/cf/gnu.cf deleted file mode 100644 index a1d564569c..0000000000 --- a/nx-X11/config/cf/gnu.cf +++ /dev/null @@ -1,183 +0,0 @@ -#ifndef OSName -#define OSName DefaultOSName -#endif - -#ifndef OSVendor -#define OSVendor /**/ -#endif -#ifndef OSMajorVersion -#define OSMajorVersion DefaultOSMajorVersion -#endif -#ifndef OSMinorVersion -#define OSMinorVersion DefaultOSMinorVersion -#endif -#ifndef OSTeenyVersion -#define OSTeenyVersion DefaultOSTeenyVersion -#endif -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - -#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ - -D_POSIX_SOURCE -D_XOPEN_SOURCE \ - -D_DEFAULT_SOURCE - -XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? - -#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H - -#define HasPosixThreads YES -#define ThreadedX YES -#define HasThreadSafeAPI YES -#define ThreadsLibraries -lpthread -#define SystemMTDefines -D_REENTRANT - -#ifndef HasLibCrypt -#define HasLibCrypt YES -#endif - -#ifndef BuildXF86RushExt -# define BuildXF86RushExt YES -#endif - -#define BuildLibPathVar LD_LIBRARY_PATH -#define GccUsesGas YES -#define UseGas YES -#define GnuCpp YES -#define HasDlopen YES -#ifndef HasShadowPasswd -# define HasShadowPasswd YES -#endif -#define HasPutenv YES - -XCOMM Not implemented and will always fail. -#ifndef HasShm -# define HasShm YES -#endif - -#define HasBSD44Sockets YES -#define HasSockets YES -#define HasSnprintf YES -#define HasMkstemp YES -#define HasUsableFileMmap YES -#ifndef HasNCurses -#define HasNCurses YES -#endif - -#define AvoidNullMakeCommand YES -#ifndef DebuggableLibraries -#define DebuggableLibraries NO -#endif -#define CompressAllFonts YES -#define Malloc0ReturnsNull YES -#define NeedConstPrototypes YES -#define NeedFunctionPrototypes YES -#define NeedNestedPrototypes YES -#define NeedVarargsPrototypes YES -#ifndef NeedWidePrototypes -#define NeedWidePrototypes NO -#endif -#define SetTtyGroup YES - -#ifndef UseStaticTermcapLib -#define UseStaticTermcapLib NO -#endif - -#define MkdirHierCmd mkdir -p -#ifndef CcCmd -#define CcCmd gcc -#endif -#ifndef AsCmd -#define AsCmd as -#endif -#ifndef LdCmd -#define LdCmd ld -#endif - -#define AsmDefines -D__ELF__ -#define CplusplusCmd c++ -#ifndef TermcapLibrary -#if UseStaticTermcapLib -#define TermcapLibrary StaticLibrary(/usr/lib,ncurses) -#else -#define TermcapLibrary -lncurses -#endif -#endif -#ifndef DoLoadableServer -#define DoLoadableServer YES -#endif -#ifndef CppCmd -#define CppCmd /lib/cpp -#endif -#define YaccCmd bison -y -#define LexCmd flex -l -#define HasFlex YES -#define LexLib -lfl -#define PreProcessCmd CcCmd -E -#define PostIncDir DefaultGccIncludeDir -#define LdCombineFlags -r -#ifndef LdPostLib -#define LdPostLib /* Never needed */ -#endif -#define HasWChar32 YES -#define StandardCppOptions -traditional -#define StandardCppDefines StandardDefines - -#define HasVarRun YES -#define VarDbDirectory $(VARDIR)/lib - -XCOMM i386Architecture -#define OptimizedCDebugFlags DefaultGcc2i386Opt -#define GNUMachineDefines -D__i386__ -#define ServerOSDefines XFree86ServerOSDefines -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#define HasPlugin YES -#define VendorHasX11R6_3libXext YES - -#ifndef StandardDefines -#define StandardDefines GNUMachineDefines GNUSourceDefines -#endif - -#define DlLibrary -rdynamic -ldl - -#define ServerExtraSysLibs /**/ - -#define ConnectionFlags -DUNIXCONN -DTCPCONN - -/* Some of these man page defaults are overridden in the above OS sections */ -#ifndef ManSuffix -# define ManSuffix 1x -#endif -#ifndef ManDir -# define ManDir $(MANSOURCEPATH)1 -#endif -#ifndef LibManSuffix -# define LibManSuffix 3x -#endif -#ifndef LibmanDir -# define LibmanDir $(MANSOURCEPATH)3 -#endif -#ifndef FileManSuffix -# define FileManSuffix 5x -#endif -#ifndef FileManDir -# define FileManDir $(MANSOURCEPATH)5 -#endif - -#ifndef StaticLibrary -#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic -#endif - -#define HasGnuMake YES - -#define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname - -#define ArchitectureDefines -DGNU_ARCHITECTURE - -#define XserverNeedsSetUID NO - -#include - -XCOMM XXX Might need this if they are not careful with slashes. -XCOMM #define DirFailPrefix - - -#include diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules deleted file mode 100644 index 0fc808b6e9..0000000000 --- a/nx-X11/config/cf/gnuLib.rules +++ /dev/null @@ -1,186 +0,0 @@ -/* - * GNU/Hurd shared library rules - * - */ - -/* - * GNU/Hurd shared library rules - * Cloned from Linux (ELF) shared library rules - * - */ - -#ifndef HasSharedLibraries -#define HasSharedLibraries YES -#endif -#ifndef ForceNormalLib -#define ForceNormalLib NO -#endif - -XCOMM XXX To rpath or not to rpath... -#ifndef UseRpath -#define UseRpath YES -#endif - -#undef SpecialMalloc -#define SpecialMalloc NO - -#define BaseShLibReqs -lc - -#ifndef SharedDataSeparation -#define SharedDataSeparation NO -#endif -#ifndef SharedCodeDef -#define SharedCodeDef /**/ -#endif -#ifndef SharedLibraryDef -#define SharedLibraryDef /**/ -#endif -#ifndef ShLibIncludeFile -#define ShLibIncludeFile -#endif -#ifndef RpathLoadFlags -#if UseRpath -#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -#else -#define RpathLoadFlags /**/ -#endif -#endif -#ifndef RpathInstallLoadFlags -#if UseRpath -#define RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH) -#else -#define RpathInstallLoadFlags /**/ -#endif -#endif -#ifndef LibraryRpathLoadFlags -#define LibraryRpathLoadFlags RpathLoadFlags -#endif -#ifndef SharedLibraryLoadFlags -#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags -#endif -#ifndef PositionIndependentCFlags -#define PositionIndependentCFlags -fPIC -#endif -#ifndef PositionIndependentCplusplusFlags -#define PositionIndependentCplusplusFlags -fPIC -#endif -#ifndef ExtraLoadFlags -#ifdef UseInstalled -XCOMM XXX Maybe superfluous. -#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) -#else -#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -#endif -#endif -#ifndef ExtraInstallLoadFlags -#ifdef UseInstalled -XCOMM XXX Maybe superfluous. -#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) -#else -#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -#endif -#endif - -/* - * InstallSharedLibrary - generate rules to install the shared library. - * NOTE: file must be executable, hence "INSTBINFLAGS" - */ -#ifndef InstallSharedLibrary -#define InstallSharedLibrary(libname,rev,dest) @@\ -install:: Concat(lib,libname.so.rev) @@\ - MakeDir($(DESTDIR)dest) @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ - @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ - set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\ - @if $(SOSYMLINK); then (set -x; \ - $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\ - $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi -#endif /* InstallSharedLibrary */ - -/* - * InstallSharedLibraryData - generate rules to install the shared library data - */ -#ifndef InstallSharedLibraryData -#define InstallSharedLibraryData(libname,rev,dest) -#endif /* InstallSharedLibraryData */ - - -/* - * SharedLibraryTarget - generate rules to create a shared library; - * build it into a different name so that we do not hose people by having - * the library gone for long periods. - */ -#ifndef SharedLibraryTarget -#define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ - (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ - $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ - LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @if $(SOSYMLINK); then (set -x; \ @@\ - $(RM) Concat(lib,libname.so); \ @@\ - $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ -clean:: @@\ - @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ - set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -#endif /* SharedLibraryTarget */ - -/* - * SharedDepLibraryTarget - generate rules to create a shared library. - */ -#ifndef SharedDepLibraryTarget -#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ - (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ - $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ - LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @if $(SOSYMLINK); then (set -x; \ @@\ - $(RM) Concat(lib,libname.so); \ @@\ - $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ -clean:: @@\ - @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ - set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -#endif /* SharedDepLibraryTarget */ - -#ifndef SharedDepModuleTarget -#define SharedDepModuleTarget(name,deps,solist) @@\ -AllTarget(name) @@\ - @@\ -name: deps @@\ - $(RM) $@~ @@\ - $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @@\ -clean:: @@\ - $(RM) name - -#endif /* SharedDepModuleTarget */ - -/* - * SharedLibraryDataTarget - generate rules to create shlib data file; - */ -#ifndef SharedLibraryDataTarget -#define SharedLibraryDataTarget(libname,rev,salist) -#endif /* SharedLibraryTarget */ diff --git a/nx-X11/config/cf/gnuLib.tmpl b/nx-X11/config/cf/gnuLib.tmpl deleted file mode 100644 index 97917ba5ab..0000000000 --- a/nx-X11/config/cf/gnuLib.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM -XCOMM GNU Hurd shared library template -XCOMM - -#define SharedX11Reqs -#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def deleted file mode 100644 index 2df1cd6727..0000000000 --- a/nx-X11/config/cf/host.def +++ /dev/null @@ -1,553 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/**************************************************************************/ - -/******************************************************************************/ -/* - * This file is to provide a quick method for most people to change the - * behaviour of their Xorg installation without having to fully - * understand the workings of site.def and all the various '.cf' files. - * - * In the vast majority of cases, it should not be necessary to use this - * file at all or change it in any way. - * - * This file is divided into two sections. The first contains settings - * that end-users might reasonably change. The second contains settings - * that developers might want to change. - * - * IMPORTANT NOTE: In all cases changing the defaults may cause problems - * and/or unexpected side-effects. If you don't understand what a setting - * does, then it's best to not change it. If you make changes and have - * problems, verify that those problems are also present when using an - * empty host.def file and unchanged version of this file before reporting - * them. - * - * A good way to use this file is to copy it to host.def, and make the - * changes there. That way, future patches to this file won't fail. - * The host.def file will never be patched. - * - * The distributed version of this file MUST contain no uncommented - * definitions. Default definitions belong in xorg.cf, or .cf - * files. - */ -/******************************************************************************/ - -#if defined(SunArchitecture) -#define ProjectRoot /usr/openwin -#endif - -/* - * Enable use the Cygwin IPC libraries to get MIT-SHM support. - */ -#if defined(cygwinArchitecture) -#define UseCygIPC YES -#endif - -/* - * If you have build-specific modifications in your host.def file, but - * want an empty host.def file installed when doing 'make install', - * uncomment the following - * -#define InstallEmptyHostDef - */ - -/* - * Which servers to build. There is only Xorg server. - * It can be disabled by the following. - * -#define XorgServer NO - */ -#define XorgServer NO - -/* - * Building libraries with NX enhancements is disabled - * by default. You should enable this in your host.def. - * -#define NXLibraries YES - */ -#define NXLibraries YES - -/* - * Building the NX agent nested server is disabled - * by default. Enable this in your host.def. - * -#define NXAgentServer YES - */ -#define NXAgentServer YES - -#ifdef NXAgentServer -#define BuildRenderLibrary YES -#endif - -/* - * Define this symbol to build the NX enhanced MS Windows - * X server for Cygnus environment. - * -#define NXWinServer YES - */ -#if defined(cygwinArchitecture) -#define NXWinServer NO -#endif - -/* - * Set the default server (ie the one that gets the sym-link to "X") - * -#define ServerToInstall Xorg - */ - -/* - * Force build of X libraries if any nested server is to be built. - * -#define BuildLibraries YES - * - * If you just want libraries for NXAgentServer, this should be - * enough (never tested, although). - * -#define BuildLibrariesForXServers YES - */ -#if NXAgentServer -#define BuildLibraries YES -#endif - -#define BuildDocs NO - -#define BuildComposite YES - -/* - * Server configuration parameters. The defaults are shown here: - */ - -/* - * Select the XInput devices you want by uncommenting this. - * -#define XInputDrivers mouse keyboard acecad calcomp citron \ - digitaledge dmc dynapro elographics \ - microtouch mutouch penmount spaceorb summa \ - wacom void magictouch aiptek - */ - -/* - * To use the deprecated, old keyboard driver, uncomment this. But - * even better, make the new keyboard driver (hw/xfree86/input/keyboard) - * work for your architecture. The old driver will be removed in the - * next release. - * -#define UseDeprecatedKeyboardDriver YES - */ - -/* - * Include True Type Fonts to default font path. It is safe to do - * this by default as NX intaller carries only misc and TTF in the - * basic set of fonts installed under Windows. - * -#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ - */ - -#if defined(LinuxArchitecture) || defined(SunArchitecture) || defined(FreeBSDArchitecture) -#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/,$(FONTDIR)/TTF/ -#endif /* #if defined(LinuxArchitecture) || defined(SunArchitecture) */ - -#if defined(cygwinArchitecture) -#define DefaultFontPath /mnt/NX/fonts/base/,/mnt/NX/fonts/misc/,/mnt/NX/fonts/Type1/,/mnt/NX/fonts/75dpi/,/mnt/NX/fonts/100dpi/,/mnt/NX/fonts/TTF/ -#endif /* #if defined(cygwinArchitecture) */ - -/* - * To build only the servers with a cut-down source tree, uncomment - * this. - * -#define BuildServersOnly YES - */ -#define BuildServersOnly YES - -/* - * Undefine the following if you don't want to have config files and - * app-defaults installed in a separate directory (i.e. /etc/X11). - * -#define UseSeparateConfDir NO - */ - -/* - * Unless you're a developer you shouldn't need to change anything - * beyond this point. - */ - -/* - * If you want to enable some developer settings, like more verbose - * compiler warnings, uncomment this. - * -#define XFree86Devel YES -*/ - -/* - * If using GCC 2.x on a system where it isn't the default, uncomment - * the following - * - */ -#if defined(SunArchitecture) -#define HasGcc2 YES -#define HasGcc YES -#endif - -/* - * The default optimisation flags for GCC 2.x. -fno-strength-reduce is - * here to work around a bug in -O2 for GCC 2.x on i386 platforms. - * If you are using a version that doesn't have this bug, you can - * uncomment the following line, and remove '-fno-strength-reduce' - * If you are building binaries for a 486, it may be beneficial to add - * -m486 - * -#define DefaultGcc2i386Opt -O2 -fno-strength-reduce - */ - -#if defined (LinuxArchitecture) -#define DefaultGcc2i386Opt -g -O3 -#endif - -/* - * Enable all the optimizations on AMD64. - */ - -#define DefaultGcc2AMD64Opt -g -O3 GccAliasingArgs - -/* - * This allows the GCC warning flags to be set. The default is shown here. - * -#define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs - */ - -/* - * Sun Compiler stuff.. - * -#define HasSunC YES -#define HasSunCplusplus YES -#define CplusplusCompilerMajorVersion 5 -#define CplusplusCompilerMinorVersion 0 -#define CCompilerMajorVersion 5 -#define CCompilerMinorVersion 0 - */ - -/* - * Optimized Sun Compiler Build. - * -#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro -#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro - */ - -/* - * Debuggable Sun Compiler Build. - * Note: This builds _EVERYTHING_ as debuggable - * -#define DefaultCDebugFlags -g -xs -#define OptimizedCDebugFlags -g -xs - */ - -/* - * For Linux, this should match the Binutils version you have. This example - * is for 2.6.0.7. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxBinUtilsMajorVersion 26 - */ - -/* - * For Linux, these should match the libc version you have. This example - * is for libc.5.4.x. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxCLibMajorVersion 5 -#define LinuxClibMinorVersion 4 - */ - -/* - * If you want to use the GNU malloc library, uncomment this - * -#define UseGnuMalloc YES - */ - -/* - * Set this to whatever is required to access the GNU malloc library. - * The default is '-lgmalloc' unless is specified in the OS's .cf file. - * -#define GnuMallocLibrary -L/usr/local/lib -lgmalloc - */ - -/* - * Some Linux releases don't have a libtermcap. In this case you may need - * to uncomment the following - * -#define TermcapLibrary -lncurses - */ - -/* - * Build XAA. This can be disabled with: - * -#define XF86XAA NO - */ - -/* - * Build vgahw. This can be disabled with: - * -#define XF86VgaHw NO - */ - -/* - * Build xf1bpp. This can be disabled with: - * -#define XF1Bpp NO - */ - -/* - * Build xf4bpp. This can be disabled with: - * -#define XF4Bpp NO - */ - - -/* - * BSD Console driver support (for FreeBSD and NetBSD). - * - * By default, support is included for pccons and pcvt for NetBSD, and - * pccons, syscons and pcvt for FreeBSD. - * - * To change the list of supported drivers, set the following parameter. - * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT. - * The following example includes support for syscons and pcvt only. - * -#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT - */ - -/* - * To disable building XInput support, uncomment this - * -#define BuildXInputExt NO - */ -#if defined(SunArchitecture) -#define BuildXInputExt YES -#endif - -/* - * Uncomment this for joystick support. - * - * Note: Joystick support is broken, so don't enable this. - * -#define JoystickSupport YES - */ - -/* - * To disable the ScreenSaver Extension, uncomment this line. - * -#define BuildScreenSaverExt NO - */ -#define BuildScreenSaverExt YES - -/* - * If you don't want to build Xinerama support, uncomment this. - * -#define BuildXinerama NO - */ -#define BuildXinerama YES - -/* - * If you don't want to build support for the GLX extension, uncomment this. - * -#define BuildGlxExt NO - */ -#define BuildGlxExt YES - -/* - * Taken from xorg.cf. - */ - -#if defined(SparcArchitecture) \ - || defined (Sparc64Architecture) \ - || defined(ia64Architecture) \ - || defined(s390xArchitecture) \ - || defined(AMD64Architecture) -#define GlxExtraDefines -D__GLX_ALIGN64 -#endif - -#define BuildXKB YES -#define BuildXKBlib YES - -/* - * If you want to build against libXfont2, rather than libXfont(1), uncomment this. - * -#define HasXfont2 YES - */ - -/* - * If building against libXfont(1) and using a legacy version (lower than 1.4.2), - * uncomment this. - * -#define HasLegacyXfont1 YES - */ - -/* - * If building with SHM support enabled and using a legacy Xext protocol - * version (lower than 7.1.0), uncomment this. - * -#define HasLegacyXextProto YES - */ - -/* - * If you are running NetBSD 0.9C or later, and have the aperture driver - * installed, uncomment this. - * -#define HasNetBSDApertureDriver YES - */ - -/* - * If you are running SVR3 and have the mmap driver installed (for linear - * framebuffer access) uncomment this. - * -#define HasSVR3mmapDrv YES - */ - -/* - * If you are using an SVR3 (like ISC 4.x) which supports long file names, - * you can uncomment this to have manual pages installed under their - * full names - * -#define ExpandManNames YES - */ - -/* - * For a POSIXized build on Interactive uncomment this - * Could be used with gcc 'till Version 2.6.3 - * Should be used with gcc 2.7.2. - * -#define UsePosix YES - */ - -/* - * If you don't want XDMAUTH support (if you don't have Wraphelp.c), - * comment this out. - * - */ -#if defined(LinuxArchitecture) -#define HasXdmAuth YES -#endif /* #if defined(LinuxArchitecture) */ - -/* - * To build static and shared libraries with debugging information, uncomment - * this. Assumes you have Gcc2. - * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables - * to build debugging versions of the libraries separately.) - * -#define DebuggableLibraries YES -*/ -#if defined(LinuxArchitecture) -#define DebuggableLibraries YES -#endif /* #if defined(LinuxArchitecture) */ -/* - * To forceably build static libraries in addition to shared libraries, - * uncomment this. - * -#define ForceNormalLib YES - */ - -/* - * Uncomment this if your default tools (eg, gcc, ld, as, etc) are - * not the Linux ELF versions. - * -#define LinuxElfDefault NO - */ - -/* - * To use ELF format shared libraries for supported OSs, uncomment this. - * - * For Linux the default setting of this is the same as the setting of - * LinuxElfDefault. - * - * For FreeBSD this should automatically be set correctly by imake. Only - * change it here if you need to override the automatic setting. - * -#define UseElfFormat YES - */ - -/* - * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install - * a.out compatibility libraries. To enable that, uncomment this. - * -#define BuildAoutLibraries YES - */ - -/* - * If you have trouble with make bombing out in Xlib, try uncommenting this. - * You will not get dependencies as a result, but better than nothing. - * -#define MakeHashTableBug YES - */ - -/* - * If you do not want your man pages compress under SVR3 systems that - * support it, uncomment this. - * -#define CompressManPages NO - */ - -/* - * If you have sgmlfmt (the XFree86 doctools package) and want to build - * formatted docs from the SGML source, uncomment this. - * -#define HasSgmlFmt YES - */ - -/* - * To disable building some document formats, uncomment some of these. - * -#define BuildLinuxDocText NO -#define BuildLinuxDocHtml NO -#define BuildLinuxDocPS NO - */ - -/* - * To install Japanese versions of the documentation uncomment this. - * Note: The Japanese documentation consists of a subset of the - * XFree86 3.1 docs. - * -#define InstallJapaneseDocs YES - */ - -/* - * To build/install X specs docs, uncomment the following. - * The SpecsDocDirs setting here is recommended because it covers - * the docs that XFree86 has changed or added. - * -#define BuildSpecsDocs YES -#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n - */ - -/* - * To build all specs docs, not just those listed in SpecsDocDirs, uncomment - * the following. - * -#define BuildAllSpecsDocs YES - */ - -/* - * If your system doesn't support vm86() mode and you have - * libx86emu set library path here - * -#define X86EMU_LIBPATH /usr/local/lib - */ diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf deleted file mode 100644 index c3e9eaafd5..0000000000 --- a/nx-X11/config/cf/linux.cf +++ /dev/null @@ -1,929 +0,0 @@ -#ifndef LinuxElfDefault -# define LinuxElfDefault YES -#endif - -#ifndef UseElfFormat -# define UseElfFormat LinuxElfDefault -#endif - -#ifndef OSBinaryType -# if UseElfFormat -# define OSBinaryType [ELF] -# else -# ifdef AlphaArchitecture -# define OSBinaryType [ECOFF] -# else -# define OSBinaryType [a.out] -# endif -# endif -#endif - -#ifndef OSName -# define OSName DefaultOSName OSBinaryType -#endif - -#ifndef OSVendor -# define OSVendor /**/ -#endif -#ifndef OSMajorVersion -# define OSMajorVersion DefaultOSMajorVersion -#endif -#ifndef OSMinorVersion -# define OSMinorVersion DefaultOSMinorVersion -#endif -#ifndef OSTeenyVersion -# define OSTeenyVersion DefaultOSTeenyVersion -#endif - -#ifndef LinuxDistribution -# define LinuxDistribution DefaultLinuxDistribution -/* - Add "#define LinuxDistribution Linux" to your site.def or host.def. - Currently only LinuxSuSE, LinuxRedHat and LinuxDebian will be figured out - automatically. - Valid values are (from the list at www.linux.org in Oct. '97): - LinuxUnknown (0) - LinuxSuSE (1) - LinuxCaldera (2) - LinuxCraftworks (3) - LinuxDebian (4) - LinuxInfoMagic (5) - LinuxKheops (6) - LinuxPro (7) - LinuxRedHat (8) - LinuxSlackware (9) - LinuxTurbo (10) - LinuxWare (11) - LinuxYggdrasil (12) -*/ -#endif -#ifndef LinuxDistName -# define LinuxDistName DefaultLinuxDistName -#endif -#ifndef LinuxCLibMajorVersion -# define LinuxCLibMajorVersion DefaultLinuxCLibMajorVersion -#endif -#ifndef LinuxCLibMinorVersion -# define LinuxCLibMinorVersion DefaultLinuxCLibMinorVersion -#endif -#ifndef LinuxCLibTeenyVersion -# define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion -#endif - -#ifndef HasGhostScript -# define HasGhostScript YES -#endif -#ifndef BuildPDFdocs -# define BuildPDFdocs NO -#endif - -#ifndef LinuxBinUtilsMajorVersion -# define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion -#endif - -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) -XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion) -XCOMM binutils: (LinuxBinUtilsMajorVersion) - -#if LinuxDistribution == LinuxDebian -# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot -# define SystemManDirectory /usr/share/man -# endif -# define HasPam YES -/* un-comment this when it is un-broken */ -/* # define JoystickSupport YES */ -# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot -# define XAppLoadDir EtcX11Directory/app-defaults -# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) -/* the relative symlink created by this rule causes problems for us */ -# endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */ -# define SharedLibXdmGreet NO -# define FSUseSyslog YES - -# define DriverManSuffix 4x -# define DriverManDir $(MANSOURCEPATH)4 - -# define MiscManSuffix 7x -# define MiscManDir $(MANSOURCEPATH)7 - -/* - * - * -# define DebianMaintainer YES - * - * - */ - -# ifdef DebianMaintainer -# ifndef XorgCustomVersion -# define XorgCustomVersion "Debian" -# endif -# ifndef BuilderEMailAddr -# define BuilderEMailAddr "debian-x@lists.debian.org" -# endif -# define XFree86Devel YES -# define BuildAllSpecsDocs YES -# define DebuggableLibraries YES -# define ForceNormalLib YES -# define BuildSpecsDocs YES -# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm -# define BuildHtmlManPages NO - -/* m68k has no 2.4 kernel yet */ -# ifndef Mc68020Architecture -# define HasLinuxInput YES -# endif -# define HasXdmAuth YES -# define HasLatex YES -/* extended instruction set support */ -# ifdef i386Architecture -# define HasX86Support YES -# define HasMMXSupport YES -# define Has3DNowSupport YES -/* 2.4 is not yet the official (or predominant) kernel in unstable */ -# define HasSSESupport NO -# endif /* i386Architecture */ -# endif /* DebianMaintainer */ -#endif /* LinuxDebian */ - -#if LinuxDistribution == LinuxRedHat -#define FSUseSyslog YES -#endif - -#ifndef HasDevRandom -# define HasDevRandom YES -# ifndef RandomDeviceName -# define RandomDeviceName /dev/urandom -# endif -#endif - -/* - * The Linux BinUtils major version. 25 => 2.5.x, which is what is included - * with Slackware 3.0 - * - * This remains for compatibility only. - * - */ -#ifndef BinUtilsMajorVersion -# define BinUtilsMajorVersion LinuxBinUtilsMajorVersion -#endif - -#if (LinuxCLibMajorVersion >= 6 || LinuxDistribution == LinuxSuSE) -# define LinuxLocaleDefines /**/ -#else -# define LinuxLocaleDefines -DX_LOCALE -#endif - -#ifndef LinuxAdditionalIncludes -# define LinuxAdditionalIncludes /**/ -#endif - -#ifndef LinuxGnuSourceDefines -# ifdef UseInstalled -# define LinuxGnuSourceDefines /**/ -# else -# define LinuxGnuSourceDefines -D_GNU_SOURCE -# endif -#endif - -#if LinuxCLibMajorVersion >= 6 -# define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ - -D_POSIX_SOURCE -D_XOPEN_SOURCE \ - -D_DEFAULT_SOURCE \ - -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ - LinuxAdditionalIncludes LinuxGnuSourceDefines \ - LinuxLocaleDefines -# define HasPosixThreads YES -# define ThreadedX YES -# define HasThreadSafeAPI YES -# define ThreadsLibraries -lpthread -# define SystemMTDefines -D_REENTRANT -# ifndef HasLibCrypt -# define HasLibCrypt YES -# endif -/* netscape wraps select but not poll as of communicator 4.72 */ -# ifndef HasPoll -# define HasPoll NO -# endif -#else -# define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ - -D_BSD_SOURCE -D_SVID_SOURCE \ - LinuxGnuSourceDefines LinuxLocaleDefines -# ifndef HasLibCrypt -# define HasLibCrypt NO -# endif -# ifndef HasBasename -# define HasBasename NO -# endif - /* Proliferation of C99isms makes -ansi unpalatable... */ -# if !defined(DefaultCCOptions) && !defined(UseInstalled) && HasGcc -# define DefaultCCOptions GccWarningOptions -# endif -#endif - -/* - * XXX Check which versions of Linux really have IPv6. glibc 2.0 on - * Red Hat 5.2 doesn't. - */ -#if LinuxCLibMajorVersion < 6 || \ - (LinuxCLibMajorVersion == 6 && LinuxCLibMinorVersion == 0) -#define BuildIPv6 NO -#endif - -/* support mainly for USB support */ -#ifndef HasLinuxInput -# if defined(__linux__) && (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 4)) -# define HasLinuxInput YES -# else -# define HasLinuxInput NO -# endif -#endif - -#ifndef JoystickSupport -# define JoystickSupport NO /* joystick driver is broken */ -#endif - -/* appeared in 2.1.45 (officially) */ -#ifndef HasLinuxSupport -# if defined(__linux__) && (JoystickSupport || \ - (OSMajorVersion > 2) || \ - ((OSMajorVersion == 2) && (OSMinorVersion > 1)) || \ - ((OSMajorVersion == 2) && (OSMinorVersion == 1) && (OSTeenyVersion >= 45))) -# define HasLinuxJoystick YES -# else -# define HasLinuxJoystick NO -# endif -#endif - -/* Libtool on linux always uses minor numbers */ -#define LibtoolMinorVersions YES - -/* On x86, determine whether to build with MTRR support */ -#ifndef HasMTRRSupport -# if defined (i386Architecture) || defined (AMD64Architecture) -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || \ - (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 99) -# define HasMTRRSupport YES -# else -# define HasMTRRSupport NO -# endif -# else -# define HasMTRRSupport NO /* no for non-ix86 */ -# endif -#endif - -#ifndef XF86INT10_BUILD -# if defined(__linux__) && defined(i386Architecture) -# define XF86INT10_BUILD X86VM -# elif defined(__linux__) && defined(AMD64Architecture) -# define XF86INT10_BUILD X86EMU_OS -# else -# define XF86INT10_BUILD X86EMU_GENERIC -# endif -#endif - -/* - * Let the OS restore console fonts instead of the generic VGA - * layer. This exists for Linux only at the moment so put it - * here. - */ -#ifndef DoOSFontRestore -# define DoOSFontRestore YES -#endif - -/* Should we check the OS version to determine if the kernel supports it? */ -#if DoOSFontRestore -# ifndef FontRestoreCheckOsVersion -# define FontRestoreCheckOsVersion YES -# endif -#endif - -#ifndef HasAgpGart -# if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture) - /* The AGPGART header file is included in os-support/linux, which - allows all drivers that depend on AGP to build properly. */ -# define HasAgpGart YES -# else -# define HasAgpGart NO -# endif -#endif - -/* - * Support for Intel's SSE Native Instructions, also known as the - * Streaming SIMD Extensions, was introduced in the 2.4.x kernels. - */ -#ifndef HasSSESupport -# if defined(i386Architecture) -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 4) -# define HasSSESupport YES -# else -# define HasSSESupport NO -# endif -# else -# define HasSSESupport NO -# endif -#endif - -/* - * Support for MMX isn't present in the Assembler used in Red Hat 4.2, so - * don't enable it for libc5 as a reasonable default. - */ -#ifndef HasMMXSupport -# if defined(i386Architecture) -# if (LinuxCLibMajorVersion > 5) -# define HasMMXSupport YES -# else -# define HasMMXSupport NO -# endif -# else -# define HasMMXSupport NO -# endif -#endif - -/* - * Support for 3DNow isn't present in the Assembler used in Red Hat 4.2, so - * don't enable it for libc5 as a reasonable default. - * - * XXX This is preliminary. - */ -#ifndef Has3DNowSupport -# if defined(i386Architecture) -# if (LinuxCLibMajorVersion > 5) -# define Has3DNowSupport YES -# else -# define Has3DNowSupport NO -# endif -# else -# define Has3DNowSupport NO -# endif -#endif - -#if defined(__linux__) && !defined(LinuxFBDevSupport) -# define LinuxFBDevSupport YES -#endif - -/* For compatibility */ -#define SourceDefines LinuxSourceDefines - -#define BuildLibPathVar LD_LIBRARY_PATH -#define GccUsesGas YES -#define UseGas YES -#define GnuCpp YES -#if UseElfFormat -# ifndef HasDlopen -# define HasDlopen YES -# endif -#endif -#define HasWeakSymbols UseElfFormat -#ifndef HasShadowPasswd -# if UseElfFormat -# define HasShadowPasswd YES -# else -# define HasShadowPasswd NO -# endif -#endif -#define HasPutenv YES -#ifndef HasShm -# define HasShm YES -#endif - -/* Use SecureRPC (used for SUN-DES-1 auth. and other goodies) when - * glibc has support for it */ -#ifndef HasSecureRPC -# if !(LinuxCLibMajorVersion < 6 || \ - (LinuxCLibMajorVersion == 6 && LinuxCLibMinorVersion < 3)) -# define HasSecureRPC YES -# endif -#endif - -#define HasSockets YES -#if UseElfFormat || defined(AlphaArchitecture) -#ifndef HasSnprintf -#define HasSnprintf YES -#endif -#ifndef HasReallocarray -#define HasReallocarray NO -#endif -#define HasMkstemp YES -#endif -/* getresuid() appeared in 2.1.4, and getresgid in 2.1.44 */ -#if !defined(HasGetresuid) && \ - (((OSMajorVersion*100000) + (OSMinorVersion*1000) + OSTeenyVersion) >= 201044) -#define HasGetresuid YES -#endif -#if OSMajorVersion >= 2 -#define HasUsableFileMmap YES -#endif -#ifndef HasNCurses -#define HasNCurses YES -#endif - -#ifndef HasGroff -#define HasGroff YES -#endif - -#define AvoidNullMakeCommand YES -#ifndef DebuggableLibraries -#define DebuggableLibraries NO -#endif -#define CompressAllFonts YES -#define Malloc0ReturnsNull YES -#define NeedConstPrototypes YES -#define NeedFunctionPrototypes YES -#define NeedNestedPrototypes YES -#define NeedVarargsPrototypes YES -#ifndef NeedWidePrototypes -#define NeedWidePrototypes NO -#endif -#define SetTtyGroup YES - -#ifndef UseStaticTermcapLib -#define UseStaticTermcapLib NO -#endif - -#ifndef HasCookieMaker -#define HasCookieMaker YES -#define MkCookieCmd mcookie -#endif - -#ifndef BourneShell -/* - * This will cause builds/installs to terminate on errors, as on other - * platforms. - */ -#define BourneShell /bin/sh -e -#endif - -#define MkdirHierCmd mkdir -p - -#ifndef HaveLib64 -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (Ppc64LeArchitecture) -# define HaveLib64 YES -# else -# define HaveLib64 NO -# endif -#endif - -#if LinuxElfDefault -# if UseElfFormat -# ifdef MipsArchitecture -# ifndef AsCmd -# define AsCmd gcc -c -x assembler-with-cpp -# endif -# endif /* MipsArchitecure */ -# if defined (i386Architecture) && ((GccMajorVersion >3) \ - || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) -# ifndef CcCmd -# define CcCmd gcc -m32 -# endif -# ifndef CplusplusCmd -# define CplusplusCmd c++ -m32 -# endif -# endif -# if defined (Ppc64Architecture) || defined (Ppc64LeArchitecture) -# ifndef CcCmd -# define CcCmd gcc -m64 -# endif -# ifndef CplusplusCmd -# define CplusplusCmd c++ -m64 -# endif -# endif -# ifndef CcCmd -# define CcCmd gcc -# define CplusplusCmd c++ -# endif -# ifndef AsCmd -# define AsCmd CcCmd -c -x assembler -# endif -# define AsmDefines -D__ELF__ -# ifndef LdCmd -# define LdCmd CcCmd -nostdlib -# endif -# ifndef LinuxUsesNcurses -# if LinuxCLibMajorVersion >= 6 || (LinuxDistribution == LinuxSuSE) -# define LinuxUsesNcurses YES -# else -# define LinuxUsesNcurses NO -# endif -# endif -# ifndef TermcapLibrary -# if UseStaticTermcapLib -# if LinuxUsesNcurses -# if !HaveLib64 -# define TermcapLibrary StaticLibrary(/usr/lib,ncurses) -# else -# define TermcapLibrary StaticLibrary(/usr/lib64,ncurses) -# endif -# else -# if !HaveLib64 -# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap) -# else -# define TermcapLibrary StaticLibrary(/usr/lib64/termcap,termcap) -# endif -# endif -# else -# if LinuxUsesNcurses -# define TermcapLibrary -lncurses -# else -# define TermcapLibrary -ltermcap -# endif -# endif -# endif -# else /* UseElfFormat */ -# ifdef AlphaArchitecture -# define CcCmd gcc -b alpha-linuxecoff -# define CplusplusCmd g++ -b alpha-linuxecoff -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -Wl,"-m alpha" -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* HPArchitecture */ -# ifdef i386Architecture -# define CcCmd gcc -b i486-linuxaout -# define CplusplusCmd g++ -b i486-linuxaout -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -Wl,"-m i386linux" -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* i386Architecture */ -# ifdef ia64Architecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* ia64Architecture */ -# ifdef Mc68020Architecture -# define CcCmd gcc -b m68k-linuxaout -# define CplusplusCmd g++ -b m68k-linuxaout -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -Wl,"-m m68klinux" -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* Mc68020Architecture */ -# ifdef AMD64Architecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -U__ELF__ -# endif /* AMD64Architecture */ -# endif /* UseElfFormat */ -#else -# if UseElfFormat -# ifdef AlphaArchitecture -# define CcCmd gcc -b alpha-linux -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -Wl,"-m elf64alpha" -# define AsmDefines -D__ELF__ -# define CplusplusCmd c++ -b alpha-linux -# endif /* AlphaArchitecture */ -# ifdef HPArchitecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -D__ELF__ -# endif /* HPArchitecture */ -# ifdef i386Architecture -# define CcCmd gcc -b i486-linux -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nosdlib -Wl,"-m elf_i386" -# define AsmDefines -D__ELF__ -# define CplusplusCmd c++ -b i486-linux -# endif /* i386Architecture */ -# ifdef ia64Architecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -D__ELF__ -# endif /* ia64Architecture */ -# ifdef Mc68020Architecture -# define CcCmd gcc -b m68k-linux -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -W,l"-m m68kelf" -# define AsmDefines -D__ELF__ -# define CplusplusCmd c++ -b m68k-linux -# endif /* Mc68020Architecture */ -# ifdef AMD64Architecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -D__ELF__ -# endif /* AMD64Architecture */ -# else -# define CcCmd gcc -# define AsCmd CcCmd -c -x assembler -# define LdCmd CcCmd -nostdlib -# define AsmDefines -DUSE_GAS -# endif -#endif - -/* - * Some older distros still need /lib/cpp. There's probably a better - * test, but this handles the older Red Hat releases at least. - */ -#ifndef CppCmd -# if (LinuxDistribution == LinuxRedHat) && \ - ((LinuxCLibMajorVersion < 6) || \ - (LinuxCLibMajorVersion == 6 && LinuxCLibMinorVersion < 1)) -# define CppCmd /lib/cpp -# else -# define CppCmd cpp -# endif -#endif - -/* Some Linux distributions have yacc, some don't. All have bison. */ -#define YaccCmd bison -y -#define LexCmd flex -l -#define HasFlex YES -#define LexLib -lfl -#define PreProcessCmd CcCmd -E -#define PostIncDir DefaultGccIncludeDir -#define LdCombineFlags -r -#ifndef LdPostLib -# define LdPostLib /* Never needed */ -#endif -#define HasWChar32 YES -#define StandardCppOptions -traditional -#define StandardCppDefines StandardDefines - -#define HasVarRun YES -#ifndef VarDbDirectory -# define VarDbDirectory $(VARDIR)/lib -#endif - -#ifndef OSXInputDrivers -# if HasLinuxJoystick -# define OSXInputDrivers1 ur98 -# else -# define OSXInputDrivers1 /**/ -# endif -# if HasLinuxInput -# define OSXInputDrivers2 aiptek evdev -# else -# define OSXInputDrivers2 /**/ -# endif -# define OSXInputDrivers OSXInputDrivers1 OSXInputDrivers2 -#endif - -#if UseElfFormat -# define HasPlugin YES -# define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ -#endif - -#ifdef AlphaArchitecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2AxpOpt -# endif -# define LinuxMachineDefines -D__alpha__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT -# ifdef UseCompaqMathLibrary -# define MathLibrary -lcpml -lm -# endif -#endif /* AlphaArchitecture */ - -#ifdef HPArchitecture -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# define LinuxMachineDefines -D__hppa__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* HPArchitecture */ - -#ifdef Arm32Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O3 -# endif -# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* Arm32Achitecture */ - -#ifdef Arm64Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O3 -# endif -# define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#endif /* Arm64Achitecture */ - -#ifdef i386Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2i386Opt -# endif -# define LinuxMachineDefines -D__i386__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* i386Architecture */ - -#ifdef ia64Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# endif -# define LinuxMachineDefines -D__ia64__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#endif /* ia64Architecture */ - -#ifdef Mc68020Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# endif -# define LinuxMachineDefines -D__mc68000__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* Mc68020Architecture */ - -#if defined(MipsArchitecture) && !defined(MipselArchitecture) -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2MipsOpt -# endif -# define LinuxMachineDefines -D__mips__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif - -#ifdef MipselArchitecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2MipsOpt -# endif -# define LinuxMachineDefines -D__MIPSEL__ -# define ServerOSDefines XFree86ServerOSDefines -# ifdef Mips64elArchitecture -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -# else -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -# endif -#endif - -#if defined (Ppc64Architecture) || defined (Ppc64LeArchitecture) -# define DefaultCCOptions -std=c99 GccWarningOptions -mminimal-toc -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt -# endif -# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__ -# define ServerOSDefines XFree86ServerOSDefines -DPART_NET -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#endif /* Ppc64Architecture */ - -#ifdef PpcArchitecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2PpcOpt -# endif -# define LinuxMachineDefines -D__powerpc__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* PpcArchitecture */ - -#ifdef s390Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs -# endif -# define LinuxMachineDefines -D__s390__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif /* s390Architecture */ - -#ifdef s390xArchitecture -/*#define DefaultCCOptions -fsigned-char */ -#define OptimizedCDebugFlags -O3 -fomit-frame-pointer -#define LinuxMachineDefines -D__s390x__ -#define ServerOSDefines XFree86ServerOSDefines -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#endif /* s390xArchitecture */ - -#ifdef SparcArchitecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O2 GccAliasingArgs -# endif -# define LinuxMachineDefines -D__sparc__ -# define ServerOSDefines XFree86ServerOSDefines -# define AsVISOption -Av9a -# ifdef Sparc64Architecture -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -# else -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -# endif -#endif - -#ifdef SuperHArchitecture -# ifndef SuperHArchOptFlags -# ifdef SuperH4Architecture -# define SuperHArchOptFlags -m4 -# elif defined(SuperH4NOFPUArchitecture) -# define SuperHArchOptFlags -m4-nofpu -# else -# define SuperHArchOptFlags -m3 -# endif -# endif -# ifndef SuperHebArchitecture -# ifdef SuperHebArchitecture -# define SuperHEndianFlags -mb -# else -# define SuperHEndianFlags -ml -# endif -# endif -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs -# endif -# define LinuxMachineDefines -D__sh__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#endif - -#ifdef AMD64Architecture -# ifndef OptimizedCDebugFlags -# define OptimizedCDebugFlags DefaultGcc2AMD64Opt -# endif -# define LinuxMachineDefines -D__amd64__ -# define ServerOSDefines XFree86ServerOSDefines -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#endif /* AMD64Architecture */ - -#ifndef StandardDefines -# ifdef __linux__ -# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines -# else -# define StandardDefines LinuxMachineDefines LinuxSourceDefines -# endif -#endif - -#if UseElfFormat -# define DlLibrary -rdynamic -ldl -#else -# define DlLibrary /**/ -#endif - -#define ServerExtraSysLibs /**/ - -#ifndef PamLibraries -#define PamLibraries -lpam DlLibrary -#endif - -#ifndef PamMiscLibraries -#define PamMiscLibraries -lpam_misc -#endif - -#define ConnectionFlags -DUNIXCONN -DTCPCONN - - -/* Some of these man page defaults are overridden in the above OS sections */ -#ifndef ManSuffix -# define ManSuffix 1x -#endif -#ifndef ManDir -# define ManDir $(MANSOURCEPATH)1 -#endif -#ifndef LibManSuffix -# define LibManSuffix 3x -#endif -#ifndef LibmanDir -# define LibmanDir $(MANSOURCEPATH)3 -#endif -#ifndef FileManSuffix -# define FileManSuffix 5x -#endif -#ifndef FileManDir -# define FileManDir $(MANSOURCEPATH)5 -#endif - -#ifndef StaticLibrary -# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic -#endif - -#define HasGnuMake YES - -#define MakeNamedTargetSubdir(dir,flags,subname)\ - $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname - -#define ArchitectureDefines -DLINUX_ARCHITECTURE - -#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) -#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -#if HaveLib64 -# ifndef LibDirName -# define LibDirName lib -# endif -# ifndef SystemUsrLibDir -# define SystemUsrLibDir /usr/lib64 -# endif -# ifndef TkLibDir -# define TkLibDir /usr/lib64 -# endif -#endif - -#include -# include - -#ifndef XFree86ServerOSDefines -# define XFree86ServerOSDefines -#endif diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules deleted file mode 100644 index 3db2181f13..0000000000 --- a/nx-X11/config/cf/lnxLib.rules +++ /dev/null @@ -1,610 +0,0 @@ -/* - * Linux shared library rules (DLL & ELF versions) - */ -#ifndef HasSharedLibraries -# define HasSharedLibraries YES -#endif -#ifndef ForceNormalLib -# define ForceNormalLib NO -#endif - -#ifndef UseRpath -#define UseRpath YES -#endif - -#if UseElfFormat - -# if LinuxCLibMajorVersion <= 5 -/* - * #define BaseShLibReqs -lc - * - * I don't want to use this since the normal ELF executables should - * be linked with libc.so. If it is not, i.e., static, the variables in - * libc.so which is loaded in because of the other shared libraries - * may have different values than the ones in the static ELF - * executables. That happens if the binaries are linked with libg.a - * or libc_p.a. - * - * If an ELF executable linked with libg.a or libc_p.a loads a shared - * object which needs libc.so via dlopen (), I think it should fail. - * It is a very bad idea. The moral story is DON'T USE dlopen () IN - * ELF EXECUTABLES LINKED WITH libg.a OR libc_p.a. H.J. - * - */ -# define BaseShLibReqs -# else -/* With GNU libc 2 this works fine. */ -# define BaseShLibReqs -lc -# endif - -# ifndef SharedDataSeparation -# define SharedDataSeparation NO -# endif -# ifndef SharedCodeDef -# define SharedCodeDef /**/ -# endif -# ifndef SharedLibraryDef -# define SharedLibraryDef /**/ -# endif -# ifndef ShLibIncludeFile -# define ShLibIncludeFile -# endif -#ifndef RpathLoadFlags -#if UseRpath -#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -#else -#define RpathLoadFlags /**/ -#endif -#endif -#ifndef RpathInstallLoadFlags -#if UseRpath -#define RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath,$(USRLIBDIRPATH) -#else -#define RpathInstallLoadFlags /**/ -#endif -#endif -#ifndef LibraryRpathLoadFlags -#define LibraryRpathLoadFlags RpathLoadFlags -#endif -# ifndef SharedLibraryLoadFlags -# define SharedLibraryLoadFlags -shared -# endif -# ifndef PositionIndependentCFlags -# define PositionIndependentCFlags -fPIC -# endif -# ifndef PositionIndependentCplusplusFlags -# define PositionIndependentCplusplusFlags -fPIC -# endif -# ifndef ExtraLoadFlags -# if LinuxBinUtilsMajorVersion >= 26 -# ifdef UseInstalled -# if LinuxBinUtilsMajorVersion < 27 -# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) -# endif -# else -# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -# endif -# else -# define ExtraLoadFlags RpathLoadFlags -# endif -# endif -# ifndef ExtraInstallLoadFlags -# if LinuxBinUtilsMajorVersion >= 26 -# ifdef UseInstalled -# if LinuxBinUtilsMajorVersion < 27 -# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) -# endif -# else -# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs -# endif -# else -# define ExtraInstallLoadFlags RpathInstallLoadFlags -# endif -# endif -# ifndef HardCodeLibdirFlag -# define HardCodeLibdirFlag RpathLoadFlags -# endif -# if !defined(ShlibGlobalsFlags) -# define ShlibGlobalsFlags -Wl,-Bsymbolic -# endif - -/* - * InstallSharedLibrary - generate rules to install the shared library. - * NOTE: file must be executable, hence "INSTBINFLAGS" - */ -# ifndef InstallSharedLibrary -# define InstallSharedLibrary(libname,rev,dest) @@\ -install:: Concat(lib,libname.so.rev) @@\ - MakeDir($(DESTDIR)dest) @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ - @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ - set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\ - @if $(SOSYMLINK); then (set -x; \ - $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\ - $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi -# endif /* InstallSharedLibrary */ - -# ifndef InstallSharedLibtoolLibrary - -# define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \ @@\ - R=`expr rev : '.*:\([^:]*\):'`; \ @@\ - A=`expr rev : '.*:\([^:]*\)'`; \ @@\ - MAJ=`expr $$V - $$A`; \ @@\ - MIN=$$A.$$R - -# define InstallSharedLibtoolLibrary(libname,rev,dest) @@\ -install:: Concat(lib,libname.so) @@\ - MakeDir($(DESTDIR)dest) @@\ - @set +e; SetRevisions(rev); \ @@\ - set -xe; \ @@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\ - $(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ - $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ - $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\ - $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so) -# endif /* InstallSharedLibrary */ - -/* - * InstallSharedLibraryData - generate rules to install the shared library data - */ -# ifndef InstallSharedLibraryData -# define InstallSharedLibraryData(libname,rev,dest) -# endif /* InstallSharedLibraryData */ - - -/* - * SharedLibraryTarget - generate rules to create a shared library; - * build it into a different name so that we do not hose people by having - * the library gone for long periods. - */ -# ifndef SharedLibraryTarget -# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \ @@\ - cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\ - (set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \ @@\ - LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @if $(SOSYMLINK); then (set -x; \ @@\ - $(RM) Concat(lib,libname.so); \ @@\ - $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ -clean:: @@\ - @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ - set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -# endif /* SharedLibraryTarget */ - - -# ifndef SharedLibtoolLibraryTarget -# define SharedLibtoolLibraryTarget(libname,rev,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so)) @@\ - @@\ -Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @set +e; SetRevisions(rev); set -e; \ @@\ - SONAME=$@.$$MAJ; \ @@\ - (set -x; \ @@\ - $(RM) $@.$$MAJ.$$MIN~; \ @@\ - cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\ - (set -x; \ @@\ - $(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \ @@\ - LinkBuildSonameLibrary($$SONAME); \ @@\ - (set -x; \ @@\ - $(RM) $@.$$MAJ.$$MIN; \ @@\ - $(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \ @@\ - $(RM) $@; \ @@\ - $(LN) $@.$$MAJ.$$MIN $@); \ @@\ - LinkBuildLibraryInline($@.$$MAJ.$$MIN); \ @@\ - LinkBuildLibraryInline($@) @@\ - @@\ -clean:: @@\ - @set +e; SetRevisions(rev); \ @@\ - set -xe; \ @@\ - $(RM) Concat(lib,libname.so.$$MAJ); \ @@\ - $(RM) Concat(lib,libname.so.$$MAJ.$$MIN) @@\ - $(RM) Concat(lib,libname.so) - -# endif /* SharedLibtoolLibraryTarget */ - -/* - * SharedDepLibraryTarget - generate rules to create a shared library. - */ -# ifndef SharedDepLibraryTarget -# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ - (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ - $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ - LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @if $(SOSYMLINK); then (set -x; \ @@\ - $(RM) Concat(lib,libname.so); \ @@\ - $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ -clean:: @@\ - @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ - set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -#endif /* SharedDepLibraryTarget */ - -/* - * SharedDepCplusplusLibraryTarget - generate rules to create a shared library. - */ -#ifndef SharedDepCplusplusLibraryTarget -#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ - (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ - $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ - LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @if $(SOSYMLINK); then (set -x; \ @@\ - $(RM) Concat(lib,libname.so); \ @@\ - $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ -clean:: @@\ - @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ - set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -#endif /* SharedDepCplusplusLibraryTarget */ - -# ifndef SharedDepModuleTarget -# define SharedDepModuleTarget(name,deps,solist) @@\ -AllTarget(name) @@\ - @@\ -name: deps @@\ - $(RM) $@~ @@\ - $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ - @@\ -clean:: @@\ - $(RM) name - -# endif /* SharedDepModuleTarget */ - -# ifndef SharedDriModuleTarget -# define SharedDriModuleTarget(name,deps,solist) @@\ -AllTarget(name) @@\ - @@\ -name: deps @@\ - $(RM) $@~ $@.map @@\ - @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ - $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ - $(RM) $@ $@.map @@\ - $(MV) $@~ $@ @@\ - @@\ -clean:: @@\ - $(RM) name @@\ - $(RM) name.map - -# endif /* SharedDriModuleTarget */ - -/* - * SharedLibraryDataTarget - generate rules to create shlib data file; - */ -# ifndef SharedLibraryDataTarget -# define SharedLibraryDataTarget(libname,rev,salist) -# endif /* SharedLibraryTarget */ - -#else /* UseElfFormat */ - -# ifndef SharedDataSeparation -# define SharedDataSeparation NO -# endif -# ifndef SharedCodeDef -# define SharedCodeDef /**/ -# endif -# ifndef SharedLibraryDef -# define SharedLibraryDef /**/ -# endif -# ifndef ShLibIncludeFile -# define ShLibIncludeFile -# endif -# ifndef SharedLibraryLoadFlags -# define SharedLibraryLoadFlags /**/ -# endif -# ifndef PositionIndependentCFlags -# define PositionIndependentCFlags -B/usr/bin/jump -# endif - -/* - * These definitions are now extended to work with the X sources and - * external sources wishing to build shared libs. - * - * A library can create it's own shlibs (.so) or can be incorporated into - * another "host" lib. All libraries generate stub (.sa) files. - * A "host" lib does all the work to generate the stubs for itself and its - * "guests", invoking the "guest" Makefiles to create the objects for - * inclusion into the "host" shlib. A "guest" lib will ask the "host" to - * create the stubfiles, then copy its own into its directory. - * Most external libs are "host" libs; the concept of "guest" is a holdover - * from older libs during the days of scarce shared library address space. - * - * To create a simple "host" shared lib, Xfoo, define: - * - * JUMP_ROOT_Xfoo = - * JUMP_IS_HOST_Xfoo = YES - * JUMP_STUBLIBS_Xfoo = libXfoo.sa - * JUMP_DIR_Xfoo = $(JUMP_ROOT_Xfoo)/shared - * JUMP_DEFS_Xfoo = -DFOO - * JUMP_VARS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_vars - * JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs - * JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore - * JUMP_EXPORT_Xfoo = $(JUMP_DIR_Xfoo)/jump.vars - * JUMP_IMPORT_Xfoo = $(JUMP_EXPORT_Xbar) - * JUMP_ADDRESS_Xfoo = 0xXXXXXXXX - * JUMP_JUMPTABLESIZE_Xfoo = 0x4000 - * JUMP_GOTSIZE_Xfoo = 4096 - * JUMP_STUBNAMES_Xfoo = libXfoo - * JUMP_STUBS_IMPORT_Xfoo = /usr/lib/libc.sa - * JUMP_LDLIBS_Xfoo = `$(CC) --print-libgcc-file-name` -lc - * - * To create a complex "host", you need to add - * JUMP_SIBARS_Xt = jump/libXbar.a~ - * These are the archives of the shared objects of the "guest" libs. They - * need to be added to the JUMP_LDLIBS_Xfoo lines. - * - * For further clarification, study the definitions of libXaw, a simple "host" - * lib, libXt, a complex "host" lib, and libXmu, one of libXts "guests". - * - * As a hint of how to start (with the DLL docs), touch jump_vars, jump_funcs - * and jump_ignore, then compile. Then massage the jump.vars and jump.funcs - * files in the shared subdirectory into jump_xxx files. - */ - -# ifndef UseInstalled -XCOMM These are only needed to build the server - -# if LinuxElfDefault -LIBC_SA = /usr/i486-linuxaout/lib/libc.sa -LIBM_SA = /usr/i486-linuxaout/lib/libm.sa -# else -LIBC_SA = /usr/lib/libc.sa -LIBM_SA = /usr/lib/libm.sa -# endif - -JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc - -XCOMM libX11.so (X11, SM, ICE) -JUMP_ROOT_X11 = $(XLIBSRC) -JUMP_IS_HOST_X11 = YES -JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa -JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) -JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared -JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) -JUMP_VARS_X11 = $(JUMP_ROOT_X11)/jump_vars -JUMP_FUNCS_X11 = $(JUMP_ROOT_X11)/jump_funcs -JUMP_IGNORE_X11 = $(JUMP_ROOT_X11)/jump_ignore -JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars -JUMP_ADDRESS_X11 = 0x60200000 -JUMP_JUMPTABLESIZE_X11 = 0x4000 -JUMP_GOTSIZE_X11 = 4096 -JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE -JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) -JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ -JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) - -XCOMM libXext (part of libXt.so) -JUMP_ROOT_Xext = $(XEXTLIBSRC) -JUMP_IS_HOST_Xext = NO -JUMP_HOST_Xext = $(JUMP_ROOT_Xt) -JUMP_DIR_Xext = $(JUMP_DIR_Xt) - -XCOMM libXtst (part of libXt.so) -JUMP_ROOT_Xtst = $(XTESTLIBSRC) -JUMP_IS_HOST_Xtst = NO -JUMP_HOST_Xtst = $(JUMP_ROOT_Xt) -JUMP_DIR_Xtst = $(JUMP_DIR_Xt) - -# endif /* !UseInstalled */ - -/* - * SharedLibraryDataTarget - generate rules to create shared data file - */ -# ifndef SharedLibraryDataTarget -# define SharedLibraryDataTarget(libname,rev,salist) -# endif - -/* - * SharedLibraryTarget - generate rules to create a shared library; - * There are two basic flavors of libs: self-generating, which create - * their own (and possibly other) libs, and hosted, which rely on another - * lib for all the work. - */ -# ifndef SharedLibraryTarget -# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -XCOMM This logic is such to compile the libs in their proper order, @@\ -XCOMM remain dependent on subsidiary libs, and yet minimize local work @@\ - @@\ -JUMP_DIR=./jump @@\ -JUMP_LIB=Concat(lib,libname) @@\ - @@\ -XCOMM this is needed for newer gnumake versions @@\ -export JUMP_DIR JUMP_LIB @@\ - @@\ -JUMP_IS_HOST=$(Concat(JUMP_IS_HOST_,libname)) @@\ -JUMP_AR=$(JUMP_DIR)/Concat(lib,libname.a~) @@\ -JUMP_SA=Concat(lib,libname.sa) @@\ -JUMP_SO=Concat(lib,libname.so.rev) @@\ - @@\ -JUMP_HOST=$(Concat(JUMP_HOST_,libname)) @@\ - @@\ -INSTSOLIBFLAGS=-m 0555 @@\ - @@\ -AllTarget($(BUILDLIBDIR)/$(JUMP_SA)) @@\ - @@\ -$(BUILDLIBDIR)/$(JUMP_SA): $(JUMP_SA) @@\ - LinkBuildLibrary($(JUMP_SA)) @@\ - @@\ -$(JUMP_SA) $(Concat(JUMP_STUBLIBS_,libname)) do_JUMP_SA: \ - down/mk_JUMP_SA_$(JUMP_IS_HOST) @@\ - @@\ -down/mk_JUMP_SA_0:: mk_JUMP_HOST @@\ - @@\ -down/mk_JUMP_SA_0:: $(JUMP_HOST)/$(JUMP_SA) @@\ - $(RM) $(JUMP_SA) @@\ - $(LN) $(JUMP_HOST)/$(JUMP_SA) $(JUMP_SA) @@\ - touch $@ @@\ - @@\ -down/mk_JUMP_SA_1:: $(JUMP_SO) @@\ - @@\ -down/mk_JUMP_SA_1:: down/mk_JUMP_SO_2 @@\ - $(RM) $(Concat(JUMP_STUBLIBS_,libname)) @@\ - mkstubs -v rev -l $(JUMP_LIB) \ - -a $(Concat(JUMP_ADDRESS_,libname)) \ - -j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \ - -g $(Concat(JUMP_GOTSIZE_,libname)) \ - -- $(Concat(JUMP_STUBNAMES_,libname)) @@\ - verify-shlib -l $(JUMP_SO) \ - $(Concat(JUMP_STUBLIBS_,libname)) @@\ - $(MV) verify.out $(JUMP_DIR) @@\ - touch $@ @@\ - @@\ -mk_JUMP_HOST: @@\ - @echo checking stub library $(JUMP_SA) in $(JUMP_HOST)... @@\ - @(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) $(JUMP_SA)) || exit 1 @@\ - @echo ok. continuing in $(Concat(JUMP_ROOT_,libname))... @@\ - @@\ -$(JUMP_SO): down/mk_JUMP_SO_$(JUMP_IS_HOST) @@\ - @@\ -down/mk_JUMP_SO_0: @@\ - @@\ -down/mk_JUMP_SO_1:: $(JUMP_AR) mk_JUMP_SIBDIRS down/mk_JUMP_SO_2 @@\ - @@\ -down/mk_JUMP_SO_2: down/mk_JUMP_AR $(Concat(JUMP_SIBARS_,libname)) @@\ - $(RM) $(JUMP_SO) @@\ - mkimage -f -v rev -l $(JUMP_LIB) \ - -a $(Concat(JUMP_ADDRESS_,libname)) \ - -j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \ - -g $(Concat(JUMP_GOTSIZE_,libname)) \ - -- $(JUMP_AR) $(Concat(JUMP_LDLIBS_,libname)) @@\ - $(RM) $(JUMP_DIR)/__jump.s $(JUMP_DIR)/__jump.o @@\ - LinkBuildLibrary($(JUMP_SO)) @@\ - touch $@ @@\ - @@\ -mk_JUMP_SIBDIRS: @@\ - @for d in $(Concat(JUMP_SIBDIRS_,libname)); do \ - echo checking ar library in $$d...; \ - (cd $$d ; $(MAKE) $(MFLAGS) fastdo_JUMP_AR) || exit 1; \ - echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\ - @@\ -fastdo_JUMP_AR: $(JUMP_DIR) down/mk_JUMP_AR @@\ - @@\ -$(JUMP_AR) do_JUMP_AR:: jumpsetup down/mk_JUMP_AR @@\ - @@\ -jumpsetup: $(JUMP_DIR) jumpsetup_$(JUMP_IS_HOST) @@\ - @@\ -$(JUMP_DIR): @@\ - $(RM) jump @@\ - LibMkdir($(Concat(JUMP_DIR_,libname))) @@\ - $(LN) $(Concat(JUMP_DIR_,libname)) jump @@\ - @@\ -jumpsetup_0: @@\ - @echo doing jump setup in host $(JUMP_HOST)... @@\ - @(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) jumpsetup) || exit 1 @@\ - @echo ok. continuing in $(Concat(JUMP_ROOT_,libname))... @@\ - @@\ -jumpsetup_1:: @@\ - @for d in $(Concat(JUMP_SUBDIRS_,libname)); do \ - echo checking stub library in $$d...; \ - (cd $$d ; $(MAKE) $(MFLAGS) do_JUMP_SA) || exit 1; \ - echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\ - @@\ -jumpsetup_1:: $(JUMP_DIR)/jump.funcs $(JUMP_DIR)/jump.vars \ - $(JUMP_DIR)/jump.ignore $(JUMP_DIR)/jump.import @@\ - @@\ -$(JUMP_DIR)/jump.funcs: $(Concat(JUMP_FUNCS_,libname)) @@\ - $(RM) $(JUMP_DIR)/jump.funcs @@\ - cat $(Concat(JUMP_FUNCS_,libname)) | \ - $(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@ @@\ - @@\ -$(JUMP_DIR)/jump.vars: $(Concat(JUMP_VARS_,libname)) @@\ - $(RM) $(JUMP_DIR)/jump.vars @@\ - cat $(Concat(JUMP_VARS_,libname)) | \ - $(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@ @@\ - @@\ -$(JUMP_DIR)/jump.ignore: $(Concat(JUMP_IGNORE_,libname)) @@\ - $(RM) $(JUMP_DIR)/jump.ignore @@\ - cat $(Concat(JUMP_IGNORE_,libname)) | \ - $(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@ @@\ - @@\ -$(JUMP_DIR)/jump.import: $(JUMP_DIR)/stubs.import \ - $(Concat(JUMP_IMPORT_,libname)) @@\ - $(RM) $(JUMP_DIR)/jump.import @@\ - cat $(JUMP_DIR)/stubs.import $(Concat(JUMP_IMPORT_,libname)) > $@ @@\ - @@\ -$(JUMP_DIR)/stubs.import: $(Concat(JUMP_STUBS_IMPORT_,libname)) @@\ - $(RM) $(JUMP_DIR)/stubs.import @@\ - nm --no-cplus $(Concat(JUMP_STUBS_IMPORT_,libname)) | grep '__GOT__' | \ - sed 's/__GOT__/_/' > $@ @@\ - @@\ -down/mk_JUMP_AR: solist @@\ - $(RM) $(JUMP_AR) @@\ - @if [ -s $(JUMP_DIR)/jump.log ]; then \ - echo "Error: Leftover globals for shared lib"; \ - exit 1; fi @@\ - (cd down; $(AR) up/$(JUMP_AR) solist) || exit 1 @@\ - $(RANLIB) $(JUMP_AR) @@\ - touch $@ @@\ - @@\ -clean:: jumpclean @@\ - @@\ -jumpclean: jumpclean_$(JUMP_IS_HOST) @@\ - $(RM) $(JUMP_SA) down/mk_JUMP_AR @@\ - $(RM) -r $(JUMP_DIR) @@\ - @@\ -jumpclean_0: @@\ - $(RM) down/mk_JUMP_SA_0 @@\ - $(RM) $(JUMP_HOST)/$(JUMP_SA) @@\ - @@\ -jumpclean_1: @@\ - $(RM) -r $(JUMP_SO) $(Concat(JUMP_DIR_,libname)) \ @@\ - down/mk_JUMP_SA_1 down/mk_JUMP_SO_1 down/mk_JUMP_SO_2 -# endif /* SharedLibraryTarget */ - -/* - * InstallSharedLibrary - generate rules to install the shared library. - */ -# ifndef InstallSharedLibrary -# define InstallSharedLibrary(libname,rev,dest) @@\ -install:: $(JUMP_SA) $(JUMP_SO) @@\ - MakeDir($(DESTDIR)dest) @@\ - @if [ "$(JUMP_IS_HOST)" = YES ]; then \ - (T=$(DESTDIR)dest/`echo $(JUMP_SO)|sed '/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/`;\ - set -x; \ - $(INSTALL) -s -c $(INSTSOLIBFLAGS) $(JUMP_SO) $(DESTDIR)dest; \ - $(RM) $$T && $(LN) $(JUMP_SO) $$T); fi @@\ - $(INSTALL) -c $(INSTLIBFLAGS) $(JUMP_SA) $(DESTDIR)dest -# endif /* InstallSharedLibrary */ - -/* - * InstallSharedLibraryData - generate rules to install the shared library data - */ -# ifndef InstallSharedLibraryData -# define InstallSharedLibraryData(libname,rev,dest) -# endif /* InstallSharedLibraryData */ - -#endif /* UseElfFormat */ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl deleted file mode 100644 index 2e10151dfd..0000000000 --- a/nx-X11/config/cf/lnxLib.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Linux shared library template - */ - -#define SharedX11Reqs $(LDPRELIB) -ldl -lXdmcp - -#define NoMessageCatalog diff --git a/nx-X11/config/cf/noop.rules b/nx-X11/config/cf/noop.rules deleted file mode 100644 index 8b13789179..0000000000 --- a/nx-X11/config/cf/noop.rules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nx-X11/config/cf/nxcompile.def b/nx-X11/config/cf/nxcompile.def deleted file mode 100644 index ff11b5962a..0000000000 --- a/nx-X11/config/cf/nxcompile.def +++ /dev/null @@ -1,30 +0,0 @@ -/* - Rules to have a much cleaner compilation output - - derived from Imake.rules -*/ - -#define RemoveFileQuiet(file) @$(RM) -f file \&>/dev/null - -#define RunPrintIfFailed(cmd) @cmd || { echo failed command: cmd; exit 1; } - -#define ObjectCompile(options) RemoveFileQuiet($@) @@\ - ClearmakeOSName \ - @echo \ \ CC $*.c @@\ - RunPrintIfFailed($(CC) -c $(CFLAGS) options $*.c) - -#define NormalLibraryTarget(libname,objlist) @@\ -AllTarget(LibraryTargetName(libname)) @@\ - @@\ -LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS) @@\ - @echo \ \ CCLD $@ @@\ - RemoveFileQuiet($@) @@\ - RunPrintIfFailed(MakeLibrary($@,objlist)) @@\ - RunPrintIfFailed(RanLibrary($@)) @@\ - RunPrintIfFailed(_LinkBuildLibrary($@)) - -#define DependTarget() @@\ -DependDependency() @@\ - @@\ -depend:: @@\ - RunPrintIfFailed($(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def deleted file mode 100644 index da4c137932..0000000000 --- a/nx-X11/config/cf/site.def +++ /dev/null @@ -1,126 +0,0 @@ -/*************************************************************************** - * * - * SITE-SPECIFIC DEFINITIONS * - * * - * This file contains two halves, one included before the vendor-specific * - * configuration file (.cf file), and one included after the .cf file. * - * The before-half should be protected by #ifdef BeforeVendorCF, and the * - * after-half should be protected by #ifdef AfterVendorCF. * - * * - * The before-half should only set things that the .cf file depends on. * - * For the .cf files shipped in this release, the main variables in this * - * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * - * OSMinorVersion, and OSTeenyVersion. * - * * - * The after-half should contain all other definitions. For example, * - * place your ProjectRoot definition here. * - * * - * OS Major and Minor version numbers should be changed directly in the * - * .cf file, not overridden in site.def. * - * * - ***************************************************************************/ - -/* if you want host-specific customization, this is one way to do it */ -/* -#ifndef SiteIConfigFiles -#define SiteIConfigFiles $(IRULESRC)/host.def -#define LocalConfigFiles host.def -#endif -*/ - - -#ifdef BeforeVendorCF - -/* - * Include this for easy XFree86 customisations - */ -#ifndef SiteIConfigFiles -#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def -#endif - -#include - -#include - -/* On systems where cpp doesn't correctly expand macros in include directives - * the two following macros need to be defined directly (where "X11" is - * really whatever the TopLevelProject macro is defined to be). - */ -# if defined(SVR4Architecture) || \ - defined(SCOArchitecture) || defined(Win32Architecture) || \ - defined(UXPArchitecture) || defined(SunArchitecture) || \ - defined(DynixPtxArchitecture) || defined(i386IscArchitecture) -# ifndef ProjectRulesFile -# define ProjectRulesFile -# endif -# ifndef ProjectTmplFile -# define ProjectTmplFile -# endif -# endif - -/* -#ifndef HasGcc2 -#define HasGcc2 YES -#endif -*/ - -#endif /* BeforeVendorCF */ - -#ifdef AfterVendorCF - -#ifndef ProjectRoot -#define ProjectRoot /usr/local -#endif - -/* - * On some platforms, some things may be installed outside of ProjectRoot - * by default. To disable this, uncomment the following line. - * -#define NothingOutsideProjectRoot YES - */ - -/* - * Set EtcX11Directory if you want config file links installed under - * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, - * UseEtcX11 and UseSeparateConfDir. - * -#define EtcX11Directory /etc/nx - */ - - -/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ -/* #define HasXdmAuth YES */ - -/* -#if defined(SunArchitecture) && defined(SparcArchitecture) -#define HasCodeCenter YES -#ifndef SVR4Architecture -#define HasTestCenter YES -#endif -#endif -*/ - -/* -#ifdef __hp9000s800 -#define HasCodeCenter YES -#endif -*/ - -/* -#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) -#define HasPurify YES -#endif -*/ - -/* -#define HasSentinel YES -*/ - -/* -#undef DefaultUserPath -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin -*/ - -#include - -#endif /* AfterVendorCF */ diff --git a/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules deleted file mode 100644 index 879bd3c901..0000000000 --- a/nx-X11/config/cf/xf86.rules +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Rules needed to build the XFree86 X Servers - */ - -#ifndef ObjectMapIncludeFromSpecialSource -#define ObjectMapIncludeFromSpecialSource(dst,src,flags) @@\ -dst.c: src.c @@\ - RemoveFile($@) @@\ - echo "#include \"mfbmap.h\"" > $@ @@\ - echo "#include \"$?\"" >> $@ @@\ - @@\ -SpecialCObjectRule(dst,NullParameter,flags) @@\ - @@\ -depend:: dst.c @@\ - @@\ -clean:: @@\ - RemoveFile(dst.c) -#endif - - -/* - * Rules for building config files from scripts - */ - -#ifndef Depend -# define Depend depend -#endif - -#ifndef ConfigTargetLong -#define ConfigTargetLong(target,dep,script,args,extra) @@\ -all:: Configure @@\ - @@\ -Configure:: target.o @@\ - @@\ -target.c: script dep @@\ - $(MAKE) $(MFLAGS) Makefile @@\ - $(MAKE) $(MFLAGS) extra Concat(Build,target) @@\ - @@\ -Concat(Build,target): @@\ - $(RM) target.c @@\ - $(SHELL) script args @@\ - @@\ -clean:: @@\ - $(RM) target.c -#endif - -#define ConfigTarget(target,dep,script,args) ConfigTargetLong(target,dep,script,args,Depend) - -#define ConfigTargetNoDepend(target,dep,script,args) ConfigTargetLong(target,dep,script,args,) - -#ifndef DriverObjectList -#define DriverObjectList(drivers,list) @@\ -list: $(ICONFIGFILES) drivers @@\ - RemoveFile(list) @@\ - @echo Creating list for drivers; \ @@\ - DRIVERS="drivers"; \ @@\ - if [ x"$$DRIVERS" != x ]; then \ @@\ - for i in $$DRIVERS; do \ @@\ - DRIVER="$$i/*_drv.o"; \ @@\ - for j in $$DRIVER; do \ @@\ - echo $$j >> list; \ @@\ - done; \ @@\ - done; \ @@\ - else \ @@\ - echo "" > list; \ @@\ - fi @@\ - @@\ -clean:: @@\ - RemoveFile(list) -#endif - -/* - * Rules for installing Driver SDK parts (target is install.sdk) - */ - -#ifndef InstallDriverSDKNonExecFile -#define InstallDriverSDKNonExecFile(file,dest) /**/ -#endif - -#ifndef InstallDriverSDKLibrary -#define InstallDriverSDKLibrary(libname,dest) /**/ -#endif - -#ifndef InstallDriverSDKNamedLibrary -#define InstallDriverSDKNamedLibrary(libname,dlibname,dest) /**/ -#endif - -#ifndef InstallDriverSDKNamedNonExec -#define InstallDriverSDKNamedNonExec(srcname,dstname,dest) /**/ -#endif - -#ifndef InstallDriverSDKNamedProg -#define InstallDriverSDKNamedProg(srcname,dstname,dest) /**/ -#endif - -#ifndef InstallDriverSDKSubdirs -#define InstallDriverSDKSubdirs(dirs) /**/ -#endif - -#ifndef InstallDriverSDKMultipleDestFlags -#define InstallDriverSDKMultipleDestFlags(list,dest,flags) /**/ -#endif - -#ifndef InstallDriverSDKDynamicModule -#define InstallDriverSDKDynamicModule(module,dest,subdir) /**/ -#endif - -#ifndef InstallDriverSDKObjectModule -#define InstallDriverSDKObjectModule(module,dest,subdir) /**/ -#endif - - -#ifndef InstallDriverSDKObjectSubModule -#define InstallDriverSDKObjectSubModule(module,dest,subdir) /**/ -#endif - -#ifndef InstallDriverSDKLibraryModule -#define InstallDriverSDKLibraryModule(module,dest,subdir) /**/ -#endif - -#ifndef ServerDriverSDKTarget -#define ServerDriverSDKTarget(program) /**/ -#endif - -#ifndef InstallDriverSDKProgramWithFlags -#define InstallDriverSDKProgramWithFlags(program,dest,flags) /**/ -#endif diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf deleted file mode 100644 index f9928b928d..0000000000 --- a/nx-X11/config/cf/xorg.cf +++ /dev/null @@ -1,884 +0,0 @@ -/* - * This configuration file contains all of the configuration - * information for the Xorg based X Servers. - * - * Most of these settings can be overridden in a vendor.cf or the - * BeforeVendor part of the site.def file. - */ - -/* Get and set version information. */ - -#include "xorgversion.def" - -#if !defined(XorgVersionString) && \ - defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \ - defined(XORG_VERSION_PATCH) && defined(XORG_VERSION_SNAP) -# if XORG_VERSION_SNAP == 0 -# if XORG_VERSION_PATCH == 0 -# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR | sed 's/ /./g'` -# else -# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed 's/ /./g'` -# endif -# else -# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH XORG_VERSION_SNAP | sed 's/ /./g'` -# endif -#endif - -#if !defined(XORG_DATE) && defined(XF86_DATE) -# define XORG_DATE XF86_DATE -#endif - -/* - * Xorg versions are M.m.P.s, and XorgVersion is: - * - * M * 10000000 + m * 100000 + P * 1000 + s - * - */ - -#ifndef XorgVersion -# define XorgVersion (((XORG_VERSION_MAJOR) * 10000000) + ((XORG_VERSION_MINOR) * 100000) + ((XORG_VERSION_PATCH) * 1000) + XORG_VERSION_SNAP) -#endif - -#ifndef VersionDefines -# define VersionDefines -DXORG_VERSION_CURRENT="$(XORG_VERSION_CURRENT)" -#endif - -/* Place the version of the relevant changelog file here */ -#ifndef ReleaseVersion -# define ReleaseVersion RELEASE-1 -#endif - -XORG_VERSION_CURRENT = XorgVersion -RELEASE_VERSION = ReleaseVersion - -#if NXAgentServer -#include "nxconfig.def" -#include "nxcompile.def" -#include "nxversion.def" - -#if !defined(nxVersionString) && \ - defined(NX_VERSION_MAJOR) && defined(NX_VERSION_MINOR) && \ - defined(NX_VERSION_MICRO) && defined(NX_VERSION_PATCH) -# define nxVersionString `echo NX_VERSION_MAJOR NX_VERSION_MINOR NX_VERSION_MICRO NX_VERSION_PATCH | sed 's/ /./g'` -#endif - -/* - * NX versions are M.m.µ.p, and NXVersion is: - * - * M * 10000000 + m * 100000 + µ * 1000 + p - * - */ - -#if !defined(nxVersion) && defined(nxVersionString) -# define nxVersion (((NX_VERSION_MAJOR) * 10000000) + ((NX_VERSION_MINOR) * 100000) + ((NX_VERSION_MICRO) * 1000) + NX_VERSION_PATCH) - -NX_VERSION_CURRENT = nxVersion -NX_VERSION_CURRENT_STRING = nxVersionString - -#endif -#endif /* NXAgentServer */ - -#if !defined(XorgManVersionString) && \ - defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \ - defined(XORG_VERSION_PATCH) && defined(XORG_VERSION_SNAP) -# if XORG_VERSION_SNAP == 0 -#define XorgManVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -#else -#define XorgManVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH XORG_VERSION_SNAP | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -# endif -#endif - -#if !defined(XorgDateString) && defined(XORG_DATE) -# define XorgDateString XORG_DATE -#endif - -#if !defined(XFree86DateString) && defined(XorgDateString) -# define XFree86DateString XorgDateString -#endif - -#ifndef BuildDateCmd -# define BuildDateCmd date +%Y%m%d -#endif - -#if !defined(BuildDate) -# define BuildDate `BuildDateCmd` -#endif - -#ifndef ChangelogDateCmd -# define ChangelogDateCmd if tail $(CHANGELOGFILE) 2>/dev/null | \ @@\ - fgrep '$$XdotOrg:' >/dev/null 2>&1; then \ @@\ - tail $(CHANGELOGFILE) | fgrep '$$XdotOrg:' | \ @@\ - sed s,'.* \([0-9][0-9]*\)/\([0-9][0-9]*\)/\([0-9][0-9]*\).*,\1\2\3,'; \ @@\ - else echo 0; fi -#endif - -#if !defined(ChangelogDate) -# define ChangelogDate `ChangelogDateCmd` -#endif - -#ifndef XVendorString -# define XVendorString "The X.Org Foundation" -#endif - -#ifndef XVendorRelease -# define XVendorRelease XorgVersion -#endif - -#ifndef XVendorManVersionString -#define XVendorManVersionString XorgManVersionString -#endif - -#ifndef XVendorManNameString -#define XVendorManNameString X.Org -#endif - -/* - * This enables some settings for developers. - */ - -#ifndef XFree86Devel -# if !defined(PatheticCpp) || !PatheticCpp -# if (XorgVersion % 1000) -# define XFree86Devel YES -# else -# define XFree86Devel NO -# endif -# else -# define XFree86Devel NO /* Assume the worst */ -# endif -#endif - -#ifndef BuildDebug -# define BuildDebug YES -#endif - -/* - * settings for the config file parser - */ - -#ifndef XConfigFile -#define XConfigFile xorg.conf -#endif -#ifndef XConfigDir -#define XConfigDir $(LIBDIR) -#endif -#ifndef XLogFile -#define XLogFile Xorg -#endif -#ifndef XServerName -# define XServerName Xorg -#endif - -/* - * BuildXFree86ConfigTools: - * - * Turning this on allows the XFree86 config tools to build when - * BuildServersOnly is YES. This requires more than the servonly CVS - * module. This cannot be used to disable building the config tools with - * a full build. - */ -#ifndef BuildXFree86ConfigTools -#ifdef BuildServersOnly -#define BuildXFree86ConfigTools !BuildServersOnly -#else -#define BuildXFree86ConfigTools YES -#endif -#endif - -#ifndef BuildLibrariesForConfigTools -#define BuildLibrariesForConfigTools BuildXFree86ConfigTools -#endif - -#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools -#define BuildLibraries YES -#define BuildXKBlib YES -#endif - -/* - * When this is set, modules are always built separately from the libraries - * that statically link into an Xserver. This is for platforms where the - * module and native object formats are different (e.g., OS/2). - */ -#ifndef BuildModuleInSubdir -#define BuildModuleInSubdir NO -#endif - -/* - * Default settings for which X Servers to build. - */ - -/* OS.cf files may set this for OS-specific input drivers */ -#ifndef OSXInputDrivers -#define OSXInputDrivers /**/ -#endif - -/* This may be set in host.def for 3rd party input drivers */ -#ifndef ExtraXInputDrivers -#define ExtraXInputDrivers /**/ -#endif - -/* XInput drivers */ -#ifndef XInputDrivers -#define XInputDrivers mouse keyboard acecad calcomp citron \ - digitaledge dmc dynapro elographics tek4957 \ - microtouch mutouch penmount spaceorb summa \ - wacom void magellan /* magictouch */ hyperpen \ - jamstudio fpit \ - palmax OSXInputDrivers ExtraXInputDrivers -#endif - - -/* Deprecated keyboard driver */ -#ifndef UseDeprecatedKeyboardDriver -#define UseDeprecatedKeyboardDriver NO -#endif - -/* support mainly for USB support */ -#ifndef HasLinuxInput -# define HasLinuxInput NO -#endif - -/* - * Many architectures share common X Server pieces. List them here. - */ -#if defined(i386Architecture) || defined(ia64Architecture) || \ - defined(AMD64Architecture) || defined(SparcArchitecture) || \ - defined(Sparc64Architecture) || defined(MipsArchitecture) || \ - defined(AlphaArchitecture) || defined(PpcArchitecture) || \ - defined(Ppc64Architecture) || defined(Ppc64LeArchitecture) || \ - defined(Mc68020Architecture) || defined(Arm32Architecture) || \ - defined(HPArchitecture) || defined(SuperHArchitecture) -# ifndef XorgServer -# define XorgServer YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif -#endif - -/* - * For Mips/Arc platforms, the default is to build all modules which - * are supported on this platform. - */ -#ifdef ArcArchitecture -# ifndef XorgServer -# define XorgServer YES -# endif -#endif - -#if BuildDebug -# define DebugDefines -DBUILDDEBUG -#else -# define DebugDefines /**/ -#endif - -#ifndef XorgServer -# define XorgServer NO -#endif - -/* - * Fbdev module defines. They are set to indicate the fb types supported - * on different architectures. - */ -#ifndef XF86AFB -# define XF86AFB NO -#endif -#ifndef XF86ILBM -# define XF86ILBM NO -#endif -#ifndef XF86IPLAN2P2 -# define XF86IPLAN2P2 NO -#endif -#ifndef XF86IPLAN2P4 -# define XF86IPLAN2P4 NO -#endif -#ifndef XF86IPLAN2P8 -# define XF86IPLAN2P8 NO -#endif -#if XF86AFB -AFB_DEFS = -DUSE_AFB -#endif -#if XF86ILBM -ILBM_DEFS = -DUSE_ILBM -#endif -#if XF86IPLAN2P2 -IPLAN2P2_DEFS = -DUSE_IPLAN2P2 -#endif -#if XF86IPLAN2P4 -IPLAN2P4_DEFS = -DUSE_IPLAN2P4 -#endif -#if XF86IPLAN2P8 -IPLAN2P8_DEFS = -DUSE_IPLAN2P8 -#endif -#ifndef FbdevDefines -# define FbdevDefines $(AFB_DEFS) $(ILBM_DEFS) $(IPLAN2P2_DEFS) \ - $(IPLAN2P4_DEFS) $(IPLAN2P8_DEFS) -#endif - -/* - * Build GLX server interface - * --- Doesn't work for 1-bit and 4-bit servers - */ -#ifndef BuildGlxExt -# define BuildGlxExt YES -#endif - -#if BuildGlxExt - -# define GlxCoreLibDefines -DGLX_USE_MESA - -# if defined(SparcArchitecture) \ - || defined (Sparc64Architecture) \ - || defined(ia64Architecture) \ - || defined(s390xArchitecture) \ - || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) -/* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) -/* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines -# endif - -#endif - -# ifndef UseX86Emu -# define UseX86Emu YES -# endif - -#define X86INT10_STUB 0 -#define X86EMU_GENERIC 1 -#define X86VM 2 -#define X86EMU_OS 3 - -#ifndef XF86INT10_BUILD -# if UseX86Emu -# define XF86INT10_BUILD X86EMU_GENERIC -# else -# define XF86INT10_BUILD X86INT10_STUB -# endif -#endif - -#ifndef BuildRECORDlib -# define BuildRECORDlib YES -#endif - -#ifndef BuildXKBlib -# define BuildXKBlib YES -#endif - -#ifndef HasXfont2 -# define HasXfont2 NO -#endif - -#ifndef HasLegacyXfont1 -# define HasLegacyXfont1 NO -#endif - -#ifndef HasLegacyXextProto -# define HasLegacyXextProto NO -#endif - -#ifndef BuildScreenSaverExt -# define BuildScreenSaverExt YES -#endif - -/* - * Build XInput support - */ -#ifndef BuildXInputExt -# define BuildXInputExt YES -#endif - -/* Build Xinerama (aka panoramiX) extension */ -#ifndef BuildXinerama -# define BuildXinerama YES -#endif - -/* Build Render extension */ -#ifndef BuildRender -# define BuildRender YES -#endif - -#if 0 -#ifndef JoystickSupport -# define JoystickSupport NO -#endif -#endif - -/* - * Build the XFree86-Bigfont extension - */ -#ifndef BuildXF86BigfontExt -# define BuildXF86BigfontExt YES -#endif - -/* - * Build the DPMS extension support - */ -#ifndef BuildDPMSExt -# define BuildDPMSExt YES -#endif - -/* - * Build the X Video Extension - */ -#ifndef BuildXvExt -# define BuildXvExt YES -#endif - -/* - * Build the X Video Motion Compensation Extension - */ -#ifndef BuildXvMCExt -# define BuildXvMCExt YES -#endif - -/* - * Build the X-Resource Extension - */ -#ifndef BuildXResExt -# define BuildXResExt YES -#endif - -#if Malloc0ReturnsNull -# ifndef XtMalloc0ReturnsNullDefines -# define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC -# endif -#endif - -#ifndef HasDlsymBug -# define HasDlsymBug NO -#endif - -#ifndef HasMTRRSupport -# define HasMTRRSupport NO -#endif - -/* - * Build scanpci? - */ -#ifndef SystemV -#define SystemV NO -#endif -#ifndef SystemV4 -#define SystemV4 NO -#endif -#ifndef BuildScanpci -# if SystemV || SystemV4 || \ - (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ - defined(i386BsdArchitecture) || \ - defined(GNUMachArchitecture) || \ - (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define BuildScanpci YES -# else -# define BuildScanpci NO -# endif -#endif - -/* Disable stripping installed programs for this release. */ -#ifndef StripInstalledPrograms -# define StripInstalledPrograms NO -#endif - -#ifndef InstallJapaneseDocs -#define InstallJapaneseDocs NO -#endif - -#if BuildXvExt -# define XFree86XvDefines -DXvExtension -#else -# define XFree86XvDefines /**/ -#endif - -#if BuildXvMCExt -# define XFree86XvMCDefines -DXvMCExtension -#else -# define XFree86XvMCDefines /**/ -#endif - -#if BuildXResExt -# define XFree86XResDefines -DXResExtension -#else -# define XFree86XResDefines /**/ -#endif - -#ifndef DlopenHack -# define DlopenHack -DDLOPEN_HACK -#endif - -#ifndef ExtraLoaderDefines -# define ExtraLoaderDefines /**/ -#endif - -#ifndef HasBsdMake -#define HasBsdMake NO -#endif - -#ifndef MakeHasPosixVariableSubstitutions -# if !HasBsdMake && !defined(SunArchitecture) -# define MakeHasPosixVariableSubstitutions NO -# else -# define MakeHasPosixVariableSubstitutions YES -# endif -#endif - -/* Server defines required for all OSs */ -#ifndef XFree86ServerDefines -# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ - XFree86XvDefines \ - -DXFree86Server \ - XFree86XvMCDefines \ - DebugDefines XFree86XResDefines \ - -DX_BYTE_ORDER=$(X_BYTE_ORDER) \ - VersionDefines -#endif - -#ifndef XFree86ServerOSDefines -# define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ - -DDDXOSVERRORF -DCLIENTIDS -#endif - -#ifndef XFree86ConsoleDefines -# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) || (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -# elif defined(KFreeBSDArchitecture) -# define XFree86ConsoleDefines -DSYSCONS_SUPPORT -# else -# define XFree86ConsoleDefines /**/ -# endif -#endif - -/* Support for USB mouse */ -#ifndef UsbMouseSupport -# define UsbMouseSupport NO -#endif -/* Does this OS have libusb ? */ -#ifndef HasLibUsb -# define HasLibUsb NO -#endif - -#ifndef UseServerLock -# define UseServerLock YES -#endif - -#ifndef ServerExtraDefines -# define ServerExtraDefines XFree86ServerDefines -#endif - -#ifndef ServerOSDefines -# define ServerOSDefines XFree86ServerOSDefines -#endif - -#ifndef DriverSDKDir -# define DriverSDKDir $(USRLIBDIR)/Server -#endif - -#ifndef DriverSDKModuleDir -# define DriverSDKModuleDir $(USRLIBDIR)/Server/modules -#endif - -#ifndef DriverSDKIncludeDir -# define DriverSDKIncludeDir $(USRLIBDIR)/Server/include -#endif - -DRIVERSDKDIR = DriverSDKDir -DRIVERSDKMODULEDIR = DriverSDKModuleDir -DRIVERSDKINCLUDEDIR = DriverSDKIncludeDir - -/* - * Some commonly referred to directories are defined here. - */ - - XF86SRC = $(SERVERSRC)/hw/xfree86 - XF86COMSRC = $(XF86SRC)/common - XF86PARSERSRC = $(XF86SRC)/parser - XF86OSSRC = $(XF86SRC)/os-support - XF86DRIVERSRC = $(XF86SRC)/drivers - DRIVERSRC = $(XF86DRIVERSRC) - -/* - * Installed location of the XFree86 documentation - */ - - XFREE86DOCDIR = $(DOCDIR) - XFREE86PSDOCDIR = $(DOCPSDIR) - XFREE86PDFDOCDIR = $(DOCPDFDIR) - XFREE86HTMLDOCDIR = $(DOCHTMLDIR) -XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese - -/* - * Other stuff used in the X Server source. - */ - -#ifndef OtherIConfigFiles -# define OtherIConfigFiles $(IRULESRC)/xf86.rules -#endif - -#ifndef ManSuffix -# define ManSuffix 1 -#endif - -/* - * GNU Compiler stuff - */ -#ifndef HasGcc3 -# define HasGcc3 NO -#endif -#ifndef HasGcc2 -# define HasGcc2 HasGcc3 -#endif -#ifndef HasGcc -# define HasGcc HasGcc2 -#endif -#ifndef HasGcc2ForCplusplus -# define HasGcc2ForCplusplus HasGcc2 -#endif - -#if HasGcc -# ifndef Gcc28Warnings -# if (GccMajorVersion > 2) || \ - ((GccMajorVersion == 2) && (GccMinorVersion >= 8)) -# define Gcc28Warnings -Wundef -# else -# define Gcc28Warnings /* */ -# endif -# ifndef HasGcc34 -# if (((GccMajorVersion == 3) && (GccMinorVersion >= 4)) || \ - (GccMajorVersion > 3)) -# define HasGcc34 YES -# else -# define HasGcc34 NO -# endif -# endif -# endif -# ifndef GccWarningOptions -# if XFree86Devel -# define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs Gcc28Warnings -# else -# define GccWarningOptions -Wall -Wpedantic -Wpointer-arith Gcc28Warnings -# endif -# endif -# ifndef DefaultCCOptions -# if defined(UseInstalled) -# define DefaultCCOptions /* -std=c99 */ -# else -# define DefaultCCOptions -std=c99 GccWarningOptions -# endif -# endif -# if defined(UseInstalled) -# ifndef UseGccMakeDepend -# define UseGccMakeDepend YES -# endif -# endif -#endif - -/* Make imake noisier. Note that this is ineffective for 3.0 <= GCC <= 3.2 */ -#ifndef ImakeWarningFlags -# ifdef Gcc28Warnings -# define ImakeWarningFlags Gcc28Warnings -# else -# define ImakeWarningFlags /* */ -# endif -#endif - -#if ((GccMajorVersion == 3) && (GccMinorVersion >= 1)) || (GccMajorVersion > 3) -# define GccAliasingArgs -fno-strict-aliasing -#else -# define GccAliasingArgs /* */ -#endif - -#if HasGcc2 && defined(i386Architecture) -# ifndef DefaultGcc2i386Opt -# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(AMD64Architecture) -# ifndef DefaultGcc2AMD64Opt -# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(AlphaArchitecture) -# ifndef DefaultGcc2AxpOpt -# define DefaultGcc2AxpOpt -O2 GccAliasingArgs -# endif -#endif - -#if HasGcc2 && (defined(Ppc64Architecture) || defined(Ppc64LeArchitecture)) -# ifndef DefaultGcc2Ppc64Opt -# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(MipsArchitecture) -# ifndef DefaultGcc2MipsOpt -# define DefaultGcc2MipsOpt -O2 GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(PpcArchitecture) -# ifndef DefaultGcc2PpcOpt -# define DefaultGcc2PpcOpt -O2 GccAliasingArgs -# endif -#endif - -#ifndef DefaultGcc2DebugOpt -# define DefaultGcc2DebugOpt -g -#endif - -#ifndef DebuggableLibraries -# define DebuggableLibraries NO -#endif - -#if HasGcc2 && DebuggableLibraries -# define LibraryDebugOpt DefaultGcc2DebugOpt -#endif - -/* - * Some versions of gcc have optimisation bugs that cause problems building - * some files. The definitions here cover those. - */ - -#ifndef Egcs112Bug - /* Not exactly precise, but it'll do for now... */ -# if HasGcc2 && defined(i386Architecture) && \ - (GccMajorVersion == 2) && (GccMinorVersion > 8) -# define Egcs112Bug YES -# else -# define Egcs112Bug NO -# endif -#endif - -#ifdef i386Architecture -# ifndef HasX86Support -# define HasX86Support YES -# endif -# ifndef HasMMXSupport -# define HasMMXSupport YES -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#elif defined (AMD64Architecture) -# ifndef HasX86Support -# define HasX86Support NO -# endif -# ifndef HasMMXSupport -# define HasMMXSupport NO -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#else -# ifndef HasX86Support -# define HasX86Support NO -# endif -# ifndef HasMMXSupport -# define HasMMXSupport NO -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#endif - -#ifndef StaticNeedsPicForShared -# if defined (AMD64Architecture)\ - || defined (AlphaArchitecture) \ - || defined (ia64Architecture) \ - || defined (PpcArchitecture) \ - || defined (SparcArchitecture) \ - || defined (s390xArchitecture) -# define StaticNeedsPicForShared YES -# else -# define StaticNeedsPicForShared NO -# endif -#endif - -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) \ - && !defined(LargePositionIndependentCFlags) \ - && defined(HasGcc) -# define LargePositionIndependentCFlags -fPIC -#endif - - -#ifndef XF8_32Wid -# define XF8_32Wid NO -#endif - -#if CrossCompiling -#include -#endif -#include diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl deleted file mode 100644 index 2737ebdf96..0000000000 --- a/nx-X11/config/cf/xorg.tmpl +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef ConfigDefines -# define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \ - -D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \ - -D__XSERVERNAME__='"$(XSERVERNAME)"' -#endif - -CONFIG_DEFINES = ConfigDefines - -#ifndef ServerDefines -#define ServerDefines StandardDefines VersionDefines -#endif - -#ifdef BuilderEMailAddr -BUILDERADDR = BuilderEMailAddr -#else -BUILDERADDR = "xorg@lists.freedesktop.org" -#endif -#ifdef VendorSupportAddress - VENDORSUPPORT = VendorSupportAddress - BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' -DVENDORSUPPORT='$(VENDORSUPPORT)' -#else - BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' -#endif - -#if defined(XF86DriverSDK) - BUILDMODULEDIR = $(DRIVERSDKMODULEDIR) - BUILDMODULETOP = .. - TOP_INCLUDES = TopIncludes - IMAKE_DEFINES = -DXF86DriverSDK=1 -#ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#endif - -#undef ImakeSubCmdHelper -#ifdef UseInstalled -#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \ - -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#else -#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) \ - -I$(IMAKEPREFIX)$(IRULESRC) -#endif -#endif - -#ifndef JoystickSupport -#define JoystickSupport NO -#endif - -/* - * Module support: These overrides must be here, not in xf86.rules, - * because they will replace rules after having seen the first lines - * of Imakefile (include ) - */ - -#ifndef ProPoliceSupport -#define ProPoliceSupport O -#endif - -#ifndef HasGccMergeConstants -#define HasGccMergeConstants NO -#endif - -MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS) diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def deleted file mode 100644 index 0ffe860561..0000000000 --- a/nx-X11/config/cf/xorgsite.def +++ /dev/null @@ -1,378 +0,0 @@ -/******************************************************************************/ -/* - * This file is to provide a quick method for most people to change the - * behaviour of their Xorg installation without having to fully - * understand the workings of site.def and all the various '.cf' files. - * - * In the vast majority of cases, it should not be necessary to use this - * file at all or change it in any way. - * - * This file is divided into two sections. The first contains settings - * that end-users might reasonably change. The second contains settings - * that developers might want to change. - * - * IMPORTANT NOTE: In all cases changing the defaults may cause problems - * and/or unexpected side-effects. If you don't understand what a setting - * does, then it's best to not change it. If you make changes and have - * problems, verify that those problems are also present when using an - * empty host.def file and unchanged version of this file before reporting - * them. - * - * A good way to use this file is to copy it to host.def, and make the - * changes there. That way, future patches to this file won't fail. - * The host.def file will never be patched. - * - * The distributed version of this file MUST contain no uncommented - * definitions. Default definitions belong in xorg.cf, or .cf - * files. - */ -/******************************************************************************/ - -/* - * If you have build-specific modifications in your host.def file, but - * want an empty host.def file installed when doing 'make install', - * uncomment the following - * -#define InstallEmptyHostDef - */ - -/* - * Which servers to build. There is only Xorg server. - * It can be disabled by the following. - * -#define XorgServer NO - */ - -/* - * Set the default server (ie the one that gets the sym-link to "X") - * -#define ServerToInstall Xorg - */ - -/* - * Server configuration parameters. The defaults are shown here: - */ - -/* - * Select the XInput devices you want by uncommenting this. - * -#define XInputDrivers mouse keyboard acecad calcomp citron \ - digitaledge dmc dynapro elographics \ - microtouch mutouch penmount spaceorb summa \ - wacom void magictouch aiptek - */ - -/* - * To use the deprecated, old keyboard driver, uncomment this. But - * even better, make the new keyboard driver (hw/xfree86/input/keyboard) - * work for your architecture. The old driver will be removed in the - * next release. - * -#define UseDeprecatedKeyboardDriver YES - */ - -/* - * To build only the servers with a cut-down source tree, uncomment - * this. - * -#define BuildServersOnly YES - */ - -/* - * Undefine the following if you don't want to have config files and - * app-defaults installed in a separate directory (i.e. /etc/X11). - * -#define UseSeparateConfDir NO - */ - -/* - * Unless you're a developer you shouldn't need to change anything - * beyond this point. - */ - -/* - * If you want to enable some developer settings, like more verbose - * compiler warnings, uncomment this. - * -#define XFree86Devel YES -*/ - -/* - * The default optimisation flags for GCC 2.x. -fno-strength-reduce is - * here to work around a bug in -O2 for GCC 2.x on i386 platforms. - * If you are using a version that doesn't have this bug, you can - * uncomment the following line, and remove '-fno-strength-reduce' - * If you are building binaries for a 486, it may be beneficial to add - * -m486 - * -#define DefaultGcc2i386Opt -O2 -fno-strength-reduce - */ - -/* - * This allows the GCC warning flags to be set. The default is shown here. - * -#define GccWarningOptions -Wall -Wpedantic -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs - */ - -/* - * Sun Compiler stuff.. - * -#define HasSunC YES -#define HasSunCplusplus YES -#define CplusplusCompilerMajorVersion 5 -#define CplusplusCompilerMinorVersion 0 -#define CCompilerMajorVersion 5 -#define CCompilerMinorVersion 0 - */ - -/* - * Optimized Sun Compiler Build. - * -#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro -#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro - */ - -/* - * Debuggable Sun Compiler Build. - * Note: This builds _EVERYTHING_ as debuggable - * -#define DefaultCDebugFlags -g -xs -#define OptimizedCDebugFlags -g -xs - */ - -/* - * For Linux, this should match the Binutils version you have. This example - * is for 2.6.0.7. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxBinUtilsMajorVersion 26 - */ - -/* - * For Linux, these should match the libc version you have. This example - * is for libc.5.4.x. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxCLibMajorVersion 5 -#define LinuxClibMinorVersion 4 - */ - -/* - * Some Linux releases don't have a libtermcap. In this case you may need - * to uncomment the following - * -#define TermcapLibrary -lncurses - */ - -/* - * Build XAA. This can be disabled with: - * -#define XF86XAA NO - */ - -/* - * Build vgahw. This can be disabled with: - * -#define XF86VgaHw NO - */ - -/* - * Build xf1bpp. This can be disabled with: - * -#define XF1Bpp NO - */ - -/* - * Build xf4bpp. This can be disabled with: - * -#define XF4Bpp NO - */ - - -/* - * BSD Console driver support (for FreeBSD and NetBSD). - * - * By default, support is included for pccons and pcvt for NetBSD, and - * pccons, syscons and pcvt for FreeBSD. - * - * To change the list of supported drivers, set the following parameter. - * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT. - * The following example includes support for syscons and pcvt only. - * -#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT - */ - -/* - * To disable building XInput support, uncomment this - * -#define BuildXInputExt NO - */ - -/* - * Uncomment this for joystick support. - * - * Note: Joystick support is broken, so don't enable this. - * -#define JoystickSupport YES - */ - -/* - * To disable the ScreenSaver Extension, uncomment this line. - * -#define BuildScreenSaverExt NO - */ - -/* - * If you don't want to build Xinerama support, uncomment this. - * -#define BuildXinerama NO - */ - -/* - * If you don't want to build support for the GLX extension, uncomment this. - * -#define BuildGlxExt NO - */ - -/* - * If you are running NetBSD 0.9C or later, and have the aperture driver - * installed, uncomment this. - * -#define HasNetBSDApertureDriver YES - */ - -/* - * If you are running SVR3 and have the mmap driver installed (for linear - * framebuffer access) uncomment this. - * -#define HasSVR3mmapDrv YES - */ - -/* - * If you are using an SVR3 (like ISC 4.x) which supports long file names, - * you can uncomment this to have manual pages installed under their - * full names - * -#define ExpandManNames YES - */ - -/* - * For a POSIXized build on Interactive uncomment this - * Could be used with gcc 'till Version 2.6.3 - * Should be used with gcc 2.7.2. - * -#define UsePosix YES - */ - -/* - * If you don't want XDMAUTH support (if you don't have Wraphelp.c), - * comment this out. - * - */ -#define HasXdmAuth YES - -/* - * To build static and shared libraries with debugging information, uncomment - * this. Assumes you have Gcc2. - * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables - * to build debugging versions of the libraries separately.) - * -#define DebuggableLibraries YES -*/ - -/* - * To forceably build static libraries in addition to shared libraries, - * uncomment this. - * -#define ForceNormalLib YES - */ - -/* - * Uncomment this if your default tools (eg, gcc, ld, as, etc) are - * not the Linux ELF versions. - * -#define LinuxElfDefault NO - */ - -/* - * To use ELF format shared libraries for supported OSs, uncomment this. - * - * For Linux the default setting of this is the same as the setting of - * LinuxElfDefault. - * - * For FreeBSD this should automatically be set correctly by imake. Only - * change it here if you need to override the automatic setting. - * -#define UseElfFormat YES - */ - -/* - * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install - * a.out compatibility libraries. To enable that, uncomment this. - * -#define BuildAoutLibraries YES - */ - -/* - * If you have trouble with make bombing out in Xlib, try uncommenting this. - * You will not get dependencies as a result, but better than nothing. - * -#define MakeHashTableBug YES - */ - -/* - * If you do not want your man pages compress under SVR3 systems that - * support it, uncomment this. - * -#define CompressManPages NO - */ - -/* - * If you have sgmlfmt (the XFree86 doctools package) and want to build - * formatted docs from the SGML source, uncomment this. - * -#define HasSgmlFmt YES - */ - -/* - * To disable building some document formats, uncomment some of these. - * -#define BuildLinuxDocText NO -#define BuildLinuxDocHtml NO -#define BuildLinuxDocPS NO - */ - -/* - * To install Japanese versions of the documentation uncomment this. - * Note: The Japanese documentation consists of a subset of the - * XFree86 3.1 docs. - * -#define InstallJapaneseDocs YES - */ - -/* - * To build/install X specs docs, uncomment the following. - * The SpecsDocDirs setting here is recommended because it covers - * the docs that XFree86 has changed or added. - * -#define BuildSpecsDocs YES -#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n - */ - -/* - * To build all specs docs, not just those listed in SpecsDocDirs, uncomment - * the following. - * -#define BuildAllSpecsDocs YES - */ - -/* - * If your system doesn't support vm86() mode and you have - * libx86emu set library path here - * -#define X86EMU_LIBPATH /usr/local/lib - */ diff --git a/nx-X11/config/cf/xorgversion.def b/nx-X11/config/cf/xorgversion.def deleted file mode 100644 index f630100fa4..0000000000 --- a/nx-X11/config/cf/xorgversion.def +++ /dev/null @@ -1,5 +0,0 @@ -#define XORG_VERSION_MAJOR 6 -#define XORG_VERSION_MINOR 9 -#define XORG_VERSION_PATCH 0 -#define XORG_VERSION_SNAP 0 -#define XORG_DATE "21 December 2005" diff --git a/nx-X11/include/GL/Imakefile b/nx-X11/include/GL/Imakefile deleted file mode 100644 index 8afed568b2..0000000000 --- a/nx-X11/include/GL/Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -LinkSourceFile(gl.h, $(MESASRCDIR)/include/GL) -LinkSourceFile(glext.h, $(MESASRCDIR)/include/GL) -LinkSourceFile(glxext.h, $(MESASRCDIR)/include/GL) -LinkSourceFile(osmesa.h, $(MESASRCDIR)/include/GL) - -GLXHEADERS = gl.h glext.h glx.h glxint.h glxmd.h glxproto.h \ - glxtokens.h osmesa.h glxext.h - -HEADERS = $(GLXHEADERS) - -all:: - -BuildIncludes($(HEADERS),GL,..) -InstallMultipleFlags($(HEADERS),$(INCDIR)/GL,$(INSTINCFLAGS)) - -InstallDriverSDKNonExecFile(glxint.h,$(DRIVERSDKINCLUDEDIR)/GL) -InstallDriverSDKNonExecFile(glxtokens.h,$(DRIVERSDKINCLUDEDIR)/GL) - diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile deleted file mode 100644 index 4ef28f9134..0000000000 --- a/nx-X11/include/Imakefile +++ /dev/null @@ -1,91 +0,0 @@ -NULL = - -#define IHaveSubdirs -#define PassCDebugFlags /**/ - -#if BuildGlxExt -GLXDIR = GL -#endif - -SUBDIRS = extensions $(GLXDIR) - -AU_HEADERS = Xauth.h - -#ifdef Win32Architecture -EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h -#elif defined(cygwinArchitecture) -EXTRA_HEADERS = Xwindows.h -#endif - -HEADERS = \ - DECkeysym.h \ - HPkeysym.h \ - Sunkeysym.h \ - X.h \ - XF86keysym.h \ - XWDFile.h \ - Xalloca.h \ - Xarch.h \ - Xatom.h \ - Xdefs.h \ - Xfuncproto.h \ - Xfuncs.h \ - Xmd.h \ - Xos.h \ - Xos_r.h \ - Xosdefs.h \ - Xpoll.h \ - Xproto.h \ - Xprotostr.h \ - Xthreads.h \ - keysym.h \ - keysymdef.h \ - $(AU_HEADERS) \ - $(EXTRA_HEADERS) \ - $(NULL) - -all:: - -BuildIncludes($(HEADERS),nx-X11,..) - -includes:: - -$(RM) $(BUILDINCDIR)/X11 - -$(LN) nx-X11 $(BUILDINCDIR)/X11 - -#if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) -#endif -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -InstallDriverSDKNonExecFile(X.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xalloca.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xarch.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)/X11) -InstallDriverSDKNonExecFile(Xfuncproto.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xfuncs.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xmd.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xosdefs.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xproto.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xprotostr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(keysym.h,$(DRIVERSDKINCLUDEDIR)) - -/* _XOPEN_SOURCE is defined where needed to move __fds_bits to fds_bits. */ -USE_FDS_BITS = fds_bits - -Xpoll.h: Xpoll.h.in - sed -e "s/@USE_FDS_BITS@/$(USE_FDS_BITS)/;" < Xpoll.h.in > Xpoll.h - -clean:: - -$(RM) Xpoll.h - -XCOMM For the Linux/OpenGL base standard -#if AlternateIncRoot -install:: - MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR)) - -$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL - @if [ ! -d $(DESTDIR)$(SYSTEMUSRINCDIR)/GL ]; then \ - set -x; $(LN) $(INCDIR)/GL $(DESTDIR)$(SYSTEMUSRINCDIR)/GL; \ - fi -#endif diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h similarity index 99% rename from nx-X11/include/Xpoll.h.in rename to nx-X11/include/Xpoll.h index db8c565d96..32f8ea83e2 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h @@ -143,7 +143,7 @@ extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, #endif /* #ifdef NX_TRANS_SOCKET */ -#define __X_FDS_BITS @USE_FDS_BITS@ +#define __X_FDS_BITS fds_bits #ifndef __FDS_BITS # define __FDS_BITS(p) ((p)->__X_FDS_BITS) diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile deleted file mode 100644 index 29f3b97faa..0000000000 --- a/nx-X11/include/extensions/Imakefile +++ /dev/null @@ -1,84 +0,0 @@ -NULL = - -#if BuildScreenSaverExt -SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h -#endif - -#if BuildXF86BigfontExt -XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h -#endif -#if BuildXvExt -XVHEADERS = Xv.h Xvproto.h -XVMCHEADERS = XvMC.h XvMCproto.h -#endif -#if BuildXinerama -XINERAMAHEADERS = panoramiXext.h panoramiXproto.h -#endif -#if BuildRandR -RANDRHEADERS = randr.h randrproto.h -#endif -#if BuildRender -RENDERHEADERS = render.h renderproto.h -#endif -#if BuildXfixes -XFIXESHEADERS = xfixeswire.h xfixesproto.h -#endif -#if BuildComposite -COMPOSITEHEADERS = composite.h compositeproto.h -#endif -#if BuildDamage -DAMAGEHEADERS = damagewire.h damageproto.h -#endif -#if BuildXResExt -XRESHEADERS = XResproto.h -#endif - -XKBFILEHEADERS = XKMformat.h XKM.h XKBconfig.h XKBfile.h XKBrules.h - -EXTRAHEADERS = \ - $(SCREENSAVERHEADERS) \ - $(XINERAMAHEADERS) \ - $(XF86BIGFONTHEADERS) \ - $(XVHEADERS) \ - $(XVMCHEADERS) \ - $(RANDRHEADERS) \ - $(RENDERHEADERS) \ - $(XFIXESHEADERS) \ - $(COMPOSITEHEADERS) \ - $(DAMAGEHEADERS) \ - $(XRESHEADERS) \ - $(XKBFILEHEADERS) \ - $(NULL) - -HEADERS = \ - xcmiscstr.h \ - bigreqstr.h \ - XI.h XIproto.h \ - xtestconst.h xteststr.h \ - XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \ - Xdbeproto.h \ - $(EXTRAHEADERS) \ - record.h recordstr.h \ - security.h securstr.h \ - sync.h syncstr.h \ - dpms.h dpmsstr.h \ - shapeconst.h \ - $(NULL) - -all:: - -BuildIncludes($(HEADERS),nx-X11/extensions,../..) - -#if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11/extensions,$(INSTINCFLAGS)) -#endif - -InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions) -InstallDriverSDKNonExecFile(XIproto.h,$(DRIVERSDKINCLUDEDIR)/extensions) -InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xvproto.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions) -InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions) -InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/X11/extensions) diff --git a/nx-X11/include/extensions/XKB.h b/nx-X11/include/extensions/XKB.h index 50fb27e097..360f7da2d2 100644 --- a/nx-X11/include/extensions/XKB.h +++ b/nx-X11/include/extensions/XKB.h @@ -500,9 +500,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbSA_LastAction XkbSA_DeviceValuator #define XkbSA_NumActions (XkbSA_LastAction+1) -#if defined(XF86DDXACTIONS) || defined(XFree86Server) #define XkbSA_XFree86Private 0x86 -#endif /* * Specifies the key actions that clear latched groups or modifiers. diff --git a/nx-X11/programs/Imakefile b/nx-X11/programs/Imakefile deleted file mode 100644 index 7438511432..0000000000 --- a/nx-X11/programs/Imakefile +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/**************************************************************************/ - -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" - -#if BuildServer - XSSRCDIR = Xserver -#endif - -SUBDIRS = $(XSSRCDIR) - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/programs/Xserver/.gitignore b/nx-X11/programs/Xserver/.gitignore index ea37aa3ef8..ce2889d156 100644 --- a/nx-X11/programs/Xserver/.gitignore +++ b/nx-X11/programs/Xserver/.gitignore @@ -1,2 +1,2 @@ -nxagent -nxagent.bak +./nxagent +./nxagent.bak diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile deleted file mode 100644 index 19b5902a55..0000000000 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ /dev/null @@ -1,45 +0,0 @@ -#define IHaveModules -#include - -#define IHaveSubdirs - - CORE_SUBDIR = mesa - -SUBDIRS = glx $(CORE_SUBDIR) - - -#if BuildModuleInSubdir -SRCS = glx/module/?*.c $(MSRCS) -OBJS = glx/module/?*.o $(MOBJS) -#else -SRCS = glx/?*.c $(MSRCS) -OBJS = glx/?*.o $(MOBJS) -#endif - -DONES = glx/DONE - -INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ - -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC) -DEPEND_DEFINES = $(EXT_DEFINES) DependDefines -DEFINES = $(GLX_DEFINES) - -#if HasParallelMake -MakeMutex($(SUBDIRS) $(OBJS) $(DONES)) -#endif - -#if HasGnuMake || HasBsdMake -$(DONES): $(SUBDIRS) -#endif - -ModuleObjectRule() - -DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS)) - -InstallLibraryModule(glx,$(MODULEDIR),extensions) -ForceSubdirs($(SUBDIRS)) - -DependSubdirs($(SUBDIRS)) -MakeLintLibSubdirs($(SUBDIRS)) -LintSubdirs($(SUBDIRS)) - -InstallDriverSDKLibraryModule(glx,$(DRIVERSDKMODULEDIR),extensions) diff --git a/nx-X11/programs/Xserver/GL/Makefile.am b/nx-X11/programs/Xserver/GL/Makefile.am new file mode 100644 index 0000000000..cf93738406 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = glx mesa include + +EXTRA_DIST = symlink-mesa.sh $(APPLE_EXTRAS) $(WINDOWS_EXTRAS) diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile deleted file mode 100644 index 2ee2d17e63..0000000000 --- a/nx-X11/programs/Xserver/GL/glx/Imakefile +++ /dev/null @@ -1,178 +0,0 @@ -NULL = - - -/* Large PIC tables needed for SPARC builds */ -#if defined(sparc) || defined(SparcArchitecture) -# define LargePICTable YES - PICFLAGS = LargePositionIndependentCFlags -#endif - -#include - -LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common) -LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common) -LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11) - -#if (!(defined(NXAgentServer) && NXAgentServer)) -NXAGENT_SKIP_SRCS = \ - glxext.c \ - $(NULL) -NXAGENT_SKIP_OBJS = \ - glxext.o \ - $(NULL) -#else - NX_DEFINES = -DNXAGENT_SERVER -#endif - - SRCS = global.c \ - glxbuf.c \ - glxcmds.c \ - glxcmdsswap.c \ - glxfb.c \ - glximports.c \ - glxmem.c \ - glxpix.c \ - glxscreens.c \ - glxutil.c \ - render2.c \ - render2swap.c \ - renderpix.c \ - renderpixswap.c \ - rensize.c \ - rensizetab.c \ - single2.c \ - single2swap.c \ - singlepix.c \ - singlepixswap.c \ - singlesize.c \ - xfont.c \ - g_disptab.c \ - g_disptab_EXT.c \ - g_render.c \ - g_renderswap.c \ - g_single.c \ - g_singleswap.c \ - glcontextmodes.c \ - indirect_size.c \ - $(MSRCS) \ - $(NXAGENT_SKIP_SRCS) \ - $(NULL) - - OBJS = global.o \ - glxbuf.o \ - glxcmds.o \ - glxcmdsswap.o \ - glxfb.o \ - glximports.o \ - glxmem.o \ - glxpix.o \ - glxscreens.o \ - glxutil.o \ - render2.o \ - render2swap.o \ - renderpix.o \ - renderpixswap.o \ - rensize.o \ - rensizetab.o \ - single2.o \ - single2swap.o \ - singlepix.o \ - singlepixswap.o \ - singlesize.o \ - xfont.o \ - g_disptab.o \ - g_disptab_EXT.o \ - g_render.o \ - g_renderswap.o \ - g_single.o \ - g_singleswap.o \ - glcontextmodes.o \ - indirect_size.o \ - $(MOBJS) \ - $(NXAGENT_SKIP_OBJS) \ - $(NULL) - - INCLUDES = -I$(SERVERSRC)/GL/glx \ - -I$(SERVERSRC)/GL/include \ - -I$(SERVERSRC)/include \ - -I$(INCLUDESRC) \ - -I$(MESASRCDIR)/include \ - -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/mi \ - -I$(EXTINCSRC) \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) \ - `pkg-config --cflags-only-I pixman-1` \ - $(NULL) - -#if defined(DarwinArchitecture) && ((OSMajorVersion == 6 && OSMinorVersion < 3) || OSMajorVersion < 6) - NO_EXT_DEFS = -DMISSING_GL_EXTS -#endif -#if defined(Win32Architecture) -# undef __stdcall - APIENTRY_DEFS = -DAPIENTRY=__stdcall -#endif - -XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also -XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c - DEFINES = \ - $(GLX_DEFINES) \ - $(NO_EXT_DEFS) \ - $(APIENTRY_DEFS) \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryObjectRule() -NormalLibraryTarget(glx,$(OBJS)) -#if defined(GlxUseWindows) && GlxUseWindows -clean:: - RemoveFiles($(foreach obj,$(OBJS), stdcall/$(obj))) -includes:: - MakeDir(stdcall) -SpecialObjectRule(stdcall/%.o,%.c,-DUSE_OPENGL32 -o $@) -NormalLibraryTarget(glx_stdcall,$(foreach obj,$(OBJS), stdcall/$(obj))) -#endif -SubdirLibraryRule($(OBJS)) - -LintLibraryTarget(glx,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - -#ifdef LinkDirectory -LinkSourceFile(global.c,LinkDirectory) -LinkSourceFile(glxbuf.c,LinkDirectory) -LinkSourceFile(glxcmds.c,LinkDirectory) -LinkSourceFile(glxcmdsswap.c,LinkDirectory) -LinkSourceFile(glxext.c,LinkDirectory) -LinkSourceFile(glxfb.c,LinkDirectory) -LinkSourceFile(glximports.c,LinkDirectory) -LinkSourceFile(glxmem.c,LinkDirectory) -LinkSourceFile(glxpix.c,LinkDirectory) -LinkSourceFile(glxscreens.c,LinkDirectory) -LinkSourceFile(glxutil.c,LinkDirectory) -LinkSourceFile(render2.c,LinkDirectory) -LinkSourceFile(render2swap.c,LinkDirectory) -LinkSourceFile(renderpix.c,LinkDirectory) -LinkSourceFile(renderpixswap.c,LinkDirectory) -LinkSourceFile(rensize.c,LinkDirectory) -LinkSourceFile(rensizetab.c,LinkDirectory) -LinkSourceFile(single2.c,LinkDirectory) -LinkSourceFile(single2swap.c,LinkDirectory) -LinkSourceFile(singlepix.c,LinkDirectory) -LinkSourceFile(singlepixswap.c,LinkDirectory) -LinkSourceFile(singlesize.c,LinkDirectory) -LinkSourceFile(xfont.c,LinkDirectory) -LinkSourceFile(g_disptab.c,LinkDirectory) -LinkSourceFile(g_disptab_EXT.c,LinkDirectory) -LinkSourceFile(g_render.c,LinkDirectory) -LinkSourceFile(g_renderswap.c,LinkDirectory) -LinkSourceFile(g_single.c,LinkDirectory) -LinkSourceFile(g_singleswap.c,LinkDirectory) -#endif diff --git a/nx-X11/programs/Xserver/GL/glx/Makefile.am b/nx-X11/programs/Xserver/GL/glx/Makefile.am new file mode 100644 index 0000000000..a039b71ce1 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/glx/Makefile.am @@ -0,0 +1,70 @@ +noinst_LTLIBRARIES = libglx.la + +AM_CFLAGS = \ + @DIX_CFLAGS@ \ + @GL_CFLAGS@ \ + @XLIB_CFLAGS@ \ + -I@MESA_SOURCE@/include \ + -DXFree86Server + +# none yet +#sdk_HEADERS = + +AM_CPPFLAGS = -I$(top_srcdir)/GL/include + +nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h + +if NXAGENT +SPECIAL = +else +SPECIAL = glxext.c +endif + +libglx_la_SOURCES = \ + g_disptab.c \ + g_disptab.h \ + g_disptab_EXT.c \ + g_disptab_EXT.h \ + g_render.c \ + g_renderswap.c \ + g_single.c \ + g_singleswap.c \ + glcontextmodes.c \ + glcontextmodes.h \ + global.c \ + glxbuf.c \ + glxbuf.h \ + glxcmds.c \ + glxcmdsswap.c \ + glxcontext.h \ + glxdrawable.h \ + glxerror.h \ + glxext.h \ + glxfb.c \ + glxfb.h \ + glximports.c \ + glximports.h \ + glxmem.c \ + glxmem.h \ + glxpix.c \ + glxpix.h \ + glxscreens.c \ + glxscreens.h \ + glxserver.h \ + glxutil.c \ + glxutil.h \ + impsize.h \ + render2.c \ + render2swap.c \ + renderpix.c \ + renderpixswap.c \ + rensize.c \ + rensizetab.c \ + single2.c \ + single2swap.c \ + singlepix.c \ + singlepixswap.c \ + singlesize.c \ + singlesize.h \ + unpack.h \ + xfont.c diff --git a/nx-X11/programs/Xserver/GL/include/GL/Makefile.am b/nx-X11/programs/Xserver/GL/include/GL/Makefile.am new file mode 100644 index 0000000000..f2a902396a --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/GL/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = glx_ansic.h xf86glx.h diff --git a/nx-X11/programs/Xserver/GL/include/Makefile.am b/nx-X11/programs/Xserver/GL/include/Makefile.am new file mode 100644 index 0000000000..1367fb4373 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = GL diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile deleted file mode 100644 index 5fb93b3646..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ /dev/null @@ -1,52 +0,0 @@ -#include - -#define NeedAllMesaSrc -#define MesaInXServer -#define MesaBuildDir ../main/ -#define MesaACBuildDir ../array_cache/ -#define MesaMathBuildDir ../math/ -#define MesaSwrastBuildDir ../swrast/ -#define MesaSwrastSetupBuildDir ../swrast_setup/ -#define MesaTnlBuildDir ../tnl/ -#define MesaShaderBuildDir ../shader/ -#define MesaGrammarBuildDir ../shader/grammar/ -#define MesaSlangBuildDir ../shader/slang/ -#define MesaXBuildDir ../X/ - -#include "../array_cache/Imakefile.inc" -#include "../swrast/Imakefile.inc" -#include "../swrast_setup/Imakefile.inc" -#include "../tnl/Imakefile.inc" -#include "../main/Imakefile.inc" -#include "../math/Imakefile.inc" -#include "../shader/Imakefile.inc" -#include "../shader/grammar/Imakefile.inc" -#include "../shader/slang/Imakefile.inc" -#include "../X/Imakefile.inc" -#include "../Imakefile.inc" - - XOBJS = ../X/?*.o - - OBJS = $(COREMESAOBJS) $(MOBJS) - - DONES = ../main/DONE ../X/DONE ../array_cache/DONE \ - ../math/DONE ../swrast/DONE ../swrast_setup/DONE \ - ../tnl/DONE ../shader/DONE ../shader/grammar/DONE \ - ../shader/slang/DONE - - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include - - DEFINES = $(GLX_DEFINES) - -NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS)) -NormalLibraryObjectRule() - -InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile deleted file mode 100644 index f1dbbe1019..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ /dev/null @@ -1,26 +0,0 @@ -#define IHaveSubdirs - SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) - -#include - - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaBuildDir /**/ -#include "Imakefile.inc" - - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include - - DEFINES = $(GLX_DEFINES) - -NormalLibraryObjectRule() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - -DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc deleted file mode 100644 index 1bff5782e0..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc +++ /dev/null @@ -1,51 +0,0 @@ -MESABUILDDIR = MesaBuildDir - -COREMESASRCS = $(COREMESABASESRCS) \ - $(MESA_AC_SRCS) \ - $(MESA_MATH_SRCS) \ - $(MESA_SWRAST_SRCS) \ - $(MESA_SWR_SETUP_SRCS) \ - $(MESA_TNL_SRCS) \ - $(MESA_SHADER_SRCS) \ - $(MESA_GRAMMAR_SRCS) \ - $(MESA_SLANG_SRCS) - -COREMESAOBJS = $(COREMESABASEOBJS) \ - $(MESA_AC_OBJS) \ - $(MESA_MATH_OBJS) \ - $(MESA_SWRAST_OBJS) \ - $(MESA_SWR_SETUP_OBJS) \ - $(MESA_TNL_OBJS) \ - $(MESA_SHADER_OBJS) \ - $(MESA_GRAMMAR_OBJS) \ - $(MESA_SLANG_OBJS) - -COREMESAUOBJS = $(COREMESABASEUOBJS) \ - $(MESA_AC_UOBJS) \ - $(MESA_MATH_UOBJS) \ - $(MESA_SWRAST_UOBJS) \ - $(MESA_SWR_SETUP_UOBJS) \ - $(MESA_TNL_UOBJS) \ - $(MESA_SHADER_UOBJS) \ - $(MESA_GRAMMAR_UOBJS) \ - $(MESA_SLANG_UOBJS) - -COREMESADOBJS = $(COREMESABASEDOBJS) \ - $(MESA_AC_DOBJS) \ - $(MESA_MATH_DOBJS) \ - $(MESA_SWRAST_DOBJS) \ - $(MESA_SWR_SETUP_DOBJS) \ - $(MESA_TNL_DOBJS) \ - $(MESA_SHADER_DOBJS) \ - $(MESA_GRAMMAR_DOBJS) \ - $(MESA_SLANG_DOBJS) - -COREMESAPOBJS = $(COREMESABASEPOBJS) \ - $(MESA_AC_POBJS) \ - $(MESA_MATH_POBJS) \ - $(MESA_SWRAST_POBJS) \ - $(MESA_SWR_SETUP_POBJS) \ - $(MESA_TNL_POBJS) \ - $(MESA_SHADER_POBJS) \ - $(MESA_GRAMMAR_POBJS) \ - $(MESA_SLANG_POBJS) diff --git a/nx-X11/programs/Xserver/GL/mesa/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/Makefile.am new file mode 100644 index 0000000000..72a7488eb1 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/Makefile.am @@ -0,0 +1,16 @@ +SUBDIRS = glapi main math array_cache swrast swrast_setup tnl shader X + +noinst_LTLIBRARIES = libGLcore.la + +libGLcore_la_SOURCES = dummy.c +libGLcore_la_LIBADD = glapi/libglapi.la \ + main/libmain.la \ + math/libmath.la \ + array_cache/libac.la \ + swrast/libswrast.la \ + swrast_setup/libss.la \ + tnl/libtnl.la \ + shader/libshader.la \ + shader/grammar/libgrammar.la \ + shader/slang/libslang.la \ + X/libX.la diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile deleted file mode 100644 index f8812e0965..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ /dev/null @@ -1,63 +0,0 @@ -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaXBuildDir /**/ -#define MesaInXServer -#include "Imakefile.inc" - - -LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) - - DRIVER_SRCS = $(XMESA_SRCS) - DRIVER_OBJS = $(XMESA_OBJS) - - COMMON_SRCS = driverfuncs.c - COMMON_OBJS = driverfuncs.o - - GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c - GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o - - SRCS = $(DRIVER_SRCS) $(GLX_SRCS) $(COMMON_SRCS) - OBJS = $(DRIVER_OBJS) $(GLX_OBJS) $(COMMON_OBJS) - - INCLUDES = -I$(SERVERSRC)/GL/mesa/X -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src -I$(MESASRCDIR)/src/mesa/drivers/x11 \ - -I$(MESASRCDIR)/include \ - -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/include -I$(SERVERSRC)/GL/include \ - -I$(SERVERSRC)/GL/glx \ - -I$(XF86OSSRC) \ - -I$(DRMSRCDIR)/shared-core \ - `pkg-config --cflags-only-I pixman-1` - - DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - - -#ifndef MesaDrvSrcDir -#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri -#endif - -MESADRVSRCDIR = MesaDrvSrcDir - - -LinkSourceFile(driverfuncs.c, $(MESADRVSRCDIR)/../common) -LinkSourceFile(driverfuncs.h, $(MESADRVSRCDIR)/../common) diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc deleted file mode 100644 index 67eaf78045..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc +++ /dev/null @@ -1,98 +0,0 @@ -MESAXBUILDDIR = MesaXBuildDir - -#ifndef MesaInXServer -XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \ - $(MESAXBUILDDIR)glxapi.c \ - $(MESAXBUILDDIR)realglx.c \ - $(MESAXBUILDDIR)xfonts.c -#endif - - XMESA_SRCS = $(XMESA_GLX_SRCS) \ - $(MESAXBUILDDIR)xm_api.c \ - $(MESAXBUILDDIR)xm_buffer.c \ - $(MESAXBUILDDIR)xm_dd.c \ - $(MESAXBUILDDIR)xm_line.c \ - $(MESAXBUILDDIR)xm_span.c \ - $(MESAXBUILDDIR)xm_tri.c - -#ifdef NeedToLinkMesaSrc -#ifndef MesaInXServer -LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(realglx.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/mesa/drivers/x11) -#endif -LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_buffer.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/mesa/drivers/x11) -#endif - -#ifndef MesaInXServer -XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \ - $(MESAXBUILDDIR)glxapi.o \ - $(MESAXBUILDDIR)realglx.o \ - $(MESAXBUILDDIR)xfonts.o -#endif - - XMESA_OBJS = $(XMESA_GLX_OBJS) \ - $(MESAXBUILDDIR)xm_api.o \ - $(MESAXBUILDDIR)xm_buffer.o \ - $(MESAXBUILDDIR)xm_dd.o \ - $(MESAXBUILDDIR)xm_line.o \ - $(MESAXBUILDDIR)xm_span.o \ - $(MESAXBUILDDIR)xm_tri.o - -#if defined(DoSharedLib) && DoSharedLib -#ifndef MesaInXServer -XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \ - $(MESAXBUILDDIR)unshared/glxapi.o \ - $(MESAXBUILDDIR)unshared/realglx.o \ - $(MESAXBUILDDIR)unshared/xfonts.o -#endif - - XMESA_UOBJS = $(XMESA_GLX_UOBJS) \ - $(MESAXBUILDDIR)unshared/xm_api.o \ - $(MESAXBUILDDIR)unshared/xm_buffer.o \ - $(MESAXBUILDDIR)unshared/xm_dd.o \ - $(MESAXBUILDDIR)unshared/xm_line.o \ - $(MESAXBUILDDIR)unshared/xm_span.o \ - $(MESAXBUILDDIR)unshared/xm_tri.o -#else -XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS) - XMESA_UOBJS = $(XMESA_OBJS) -#endif - -#ifndef MesaInXServer -XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \ - $(MESAXBUILDDIR)debugger/glxapi.o \ - $(MESAXBUILDDIR)debugger/realglx.o \ - $(MESAXBUILDDIR)debugger/xfonts.o -#endif - - XMESA_DOBJS = $(XMESA_GLX_DOBJS) \ - $(MESAXBUILDDIR)debugger/xm_api.o \ - $(MESAXBUILDDIR)debugger/xm_buffer.o \ - $(MESAXBUILDDIR)debugger/xm_dd.o \ - $(MESAXBUILDDIR)debugger/xm_line.o \ - $(MESAXBUILDDIR)debugger/xm_span.o \ - $(MESAXBUILDDIR)debugger/xm_tri.o - -#ifndef MesaInXServer -XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \ - $(MESAXBUILDDIR)profiled/glxapi.o \ - $(MESAXBUILDDIR)profiled/realglx.o \ - $(MESAXBUILDDIR)profiled/xfonts.o -#endif - - XMESA_POBJS = $(XMESA_GLX_POBJS) \ - $(MESAXBUILDDIR)profiled/xm_api.o \ - $(MESAXBUILDDIR)profiled/xm_buffer.o \ - $(MESAXBUILDDIR)profiled/xm_dd.o \ - $(MESAXBUILDDIR)profiled/xm_line.o \ - $(MESAXBUILDDIR)profiled/xm_span.o \ - $(MESAXBUILDDIR)profiled/xm_tri.o - diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/X/Makefile.am new file mode 100644 index 0000000000..e9b6f92bcf --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/X/Makefile.am @@ -0,0 +1,36 @@ +AUTOMAKE_OPTIONS = subdir-objects + +noinst_LTLIBRARIES = libX.la + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. \ + -I../../glx \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include + +# -DXFree86Server is required because the X11 driver in Mesa thinks that +# symbol means "being built in the server" +AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server + +libX_la_SOURCES = xf86glx.c \ + xf86glx_util.c \ + xf86glx_util.h \ + xf86glxint.h + +nodist_libX_la_SOURCES = \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_line.c \ + xm_span.c \ + xm_tri.c \ + drivers/common/driverfuncs.c diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h index bb314128d4..809c1550f8 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h,v 1.5 2000/08/10 17:40:29 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h b/nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h index 4784566a48..974ff03649 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h,v 1.4 2002/02/22 21:45:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile deleted file mode 100644 index 4747107479..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ /dev/null @@ -1,36 +0,0 @@ -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaACBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_AC_SRCS) - OBJS = $(MESA_AC_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc deleted file mode 100644 index 39f6e24000..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -MESAACBUILDDIR = MesaACBuildDir - - MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ - $(MESAACBUILDDIR)ac_import.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(acache.h, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/mesa/array_cache) -#endif - - MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \ - $(MESAACBUILDDIR)ac_import.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \ - $(MESAACBUILDDIR)unshared/ac_import.o -#else - MESA_AC_UOBJS = $(MESA_AC_OBJS) -#endif - - MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \ - $(MESAACBUILDDIR)debugger/ac_import.o - - MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \ - $(MESAACBUILDDIR)profiled/ac_import.o - diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile.am new file mode 100644 index 0000000000..c3db35ee57 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile.am @@ -0,0 +1,17 @@ +noinst_LTLIBRARIES = libac.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libac_la_SOURCES = ac_context.c ac_import.c diff --git a/nx-X11/programs/Xserver/GL/mesa/dummy.c b/nx-X11/programs/Xserver/GL/mesa/dummy.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nx-X11/programs/Xserver/GL/mesa/glapi/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/glapi/Makefile.am new file mode 100644 index 0000000000..cb37b37061 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/glapi/Makefile.am @@ -0,0 +1,17 @@ +noinst_LTLIBRARIES = libglapi.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libglapi_la_SOURCES = glapi.c glthread.c diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile deleted file mode 100644 index d6e914b892..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ /dev/null @@ -1,40 +0,0 @@ -/* Large PIC tables needed for Solaris/SPARC builds */ -#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags -#endif - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(COREMESABASESRCS) - OBJS = $(COREMESABASEOBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc deleted file mode 100644 index 3e98f91497..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc +++ /dev/null @@ -1,481 +0,0 @@ -/* gcc on ppc64 defines this, causes macro recursion with pixel below */ -#undef pixel - -MESABUILDDIR = MesaBuildDir - -#ifdef NeedAllMesaSrc - DISPATCHSRCS = $(MESABUILDDIR)dispatch.c - GLAPISRCS = $(MESABUILDDIR)glapi.c - GLTHREADSRCS = $(MESABUILDDIR)glthread.c -#endif - -MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math -I$(MESASRCDIR)/src/shader \ - -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \ - -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd - -COREMESABASESRCS = \ - $(MESABUILDDIR)api_arrayelt.c \ - $(MESABUILDDIR)api_loopback.c \ - $(MESABUILDDIR)api_noop.c \ - $(MESABUILDDIR)api_validate.c \ - $(MESABUILDDIR)accum.c \ - $(MESABUILDDIR)attrib.c \ - $(MESABUILDDIR)blend.c \ - $(MESABUILDDIR)bufferobj.c \ - $(MESABUILDDIR)buffers.c \ - $(MESABUILDDIR)clip.c \ - $(MESABUILDDIR)colortab.c \ - $(MESABUILDDIR)context.c \ - $(MESABUILDDIR)convolve.c \ - $(MESABUILDDIR)debug.c \ - $(MESABUILDDIR)depth.c \ - $(MESABUILDDIR)dlist.c \ - $(MESABUILDDIR)drawpix.c \ - $(MESABUILDDIR)enable.c \ - $(MESABUILDDIR)enums.c \ - $(MESABUILDDIR)eval.c \ - $(MESABUILDDIR)execmem.c \ - $(MESABUILDDIR)extensions.c \ - $(MESABUILDDIR)feedback.c \ - $(MESABUILDDIR)fbobject.c \ - $(MESABUILDDIR)fog.c \ - $(MESABUILDDIR)framebuffer.c \ - $(MESABUILDDIR)get.c \ - $(MESABUILDDIR)getstring.c \ - $(MESABUILDDIR)hash.c \ - $(MESABUILDDIR)hint.c \ - $(MESABUILDDIR)histogram.c \ - $(MESABUILDDIR)image.c \ - $(MESABUILDDIR)imports.c \ - $(MESABUILDDIR)light.c \ - $(MESABUILDDIR)lines.c \ - $(MESABUILDDIR)matrix.c \ - $(MESABUILDDIR)mm.c \ - $(MESABUILDDIR)occlude.c \ - $(MESABUILDDIR)pixel.c \ - $(MESABUILDDIR)points.c \ - $(MESABUILDDIR)polygon.c \ - $(MESABUILDDIR)rastpos.c \ - $(MESABUILDDIR)renderbuffer.c \ - $(MESABUILDDIR)state.c \ - $(MESABUILDDIR)stencil.c \ - $(MESABUILDDIR)texcompress.c \ - $(MESABUILDDIR)texcompress_fxt1.c \ - $(MESABUILDDIR)texcompress_s3tc.c \ - $(MESABUILDDIR)texenvprogram.c \ - $(MESABUILDDIR)texformat.c \ - $(MESABUILDDIR)teximage.c \ - $(MESABUILDDIR)texobj.c \ - $(MESABUILDDIR)texrender.c \ - $(MESABUILDDIR)texstate.c \ - $(MESABUILDDIR)texstore.c \ - $(MESABUILDDIR)varray.c \ - $(MESABUILDDIR)vtxfmt.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(api_arrayelt.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_arrayelt.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_eval.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_loopback.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_loopback.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_noop.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_noop.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_validate.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_validate.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(accum.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(accum.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(attrib.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(attrib.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(blend.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(blend.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(bufferobj.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(bufferobj.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(buffers.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(buffers.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(clip.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(clip.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colormac.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colortab.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colortab.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(config.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(context.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(context.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(convolve.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(convolve.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(dd.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(debug.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(debug.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(depth.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(depth.h, $(MESASRCDIR)/src/mesa/main) -#ifdef NeedAllMesaSrc -LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main) -#endif -LinkSourceFile(dlist.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(dlist.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(drawpix.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(drawpix.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enable.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enable.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enums.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enums.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(eval.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(eval.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(execmem.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(extensions.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(extensions.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fbobject.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fbobject.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(feedback.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(feedback.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fog.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fog.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(framebuffer.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(framebuffer.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(get.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(get.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(getstring.c, $(MESASRCDIR)/src/mesa/main) -#ifdef NeedAllMesaSrc -LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi) -LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi) -#endif -LinkSourceFile(glheader.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hash.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hash.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hint.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hint.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(histogram.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(histogram.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(image.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(image.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(imports.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(imports.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(light.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(light.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(lines.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(lines.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(macros.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(matrix.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(matrix.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mm.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mm.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mtypes.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(occlude.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(occlude.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(pixel.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(points.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(points.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(polygon.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(polygon.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(rastpos.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(rastpos.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(renderbuffer.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(renderbuffer.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(simple_list.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(state.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(state.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(stencil.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(stencil.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress_fxt1.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress_s3tc.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texenvprogram.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texenvprogram.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat_tmp.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(teximage.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(teximage.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texobj.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texobj.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texrender.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texrender.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstate.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstate.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstore.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstore.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(varray.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(varray.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(version.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt_tmp.h, $(MESASRCDIR)/src/mesa/main) -#endif - -#ifdef NeedAllMesaSrc - DISPATCHOBJS = $(MESABUILDDIR)dispatch.o - GLAPIOBJS = $(MESABUILDDIR)glapi.o - GLTHREADOBJS = $(MESABUILDDIR)glthread.o -#endif - -COREMESABASEOBJS = \ - $(DISPATCHOBJS) \ - $(GLAPIOBJS) \ - $(GLTHREADOBJS) \ - $(MESABUILDDIR)api_arrayelt.o \ - $(MESABUILDDIR)api_loopback.o \ - $(MESABUILDDIR)api_noop.o \ - $(MESABUILDDIR)api_validate.o \ - $(MESABUILDDIR)accum.o \ - $(MESABUILDDIR)attrib.o \ - $(MESABUILDDIR)blend.o \ - $(MESABUILDDIR)bufferobj.o \ - $(MESABUILDDIR)buffers.o \ - $(MESABUILDDIR)clip.o \ - $(MESABUILDDIR)colortab.o \ - $(MESABUILDDIR)context.o \ - $(MESABUILDDIR)convolve.o \ - $(MESABUILDDIR)debug.o \ - $(MESABUILDDIR)depth.o \ - $(MESABUILDDIR)dlist.o \ - $(MESABUILDDIR)drawpix.o \ - $(MESABUILDDIR)enable.o \ - $(MESABUILDDIR)enums.o \ - $(MESABUILDDIR)eval.o \ - $(MESABUILDDIR)execmem.o \ - $(MESABUILDDIR)extensions.o \ - $(MESABUILDDIR)fbobject.o \ - $(MESABUILDDIR)feedback.o \ - $(MESABUILDDIR)fog.o \ - $(MESABUILDDIR)framebuffer.o \ - $(MESABUILDDIR)get.o \ - $(MESABUILDDIR)getstring.o \ - $(MESABUILDDIR)hash.o \ - $(MESABUILDDIR)hint.o \ - $(MESABUILDDIR)histogram.o \ - $(MESABUILDDIR)image.o \ - $(MESABUILDDIR)imports.o \ - $(MESABUILDDIR)light.o \ - $(MESABUILDDIR)lines.o \ - $(MESABUILDDIR)matrix.o \ - $(MESABUILDDIR)mm.o \ - $(MESABUILDDIR)occlude.o \ - $(MESABUILDDIR)pixel.o \ - $(MESABUILDDIR)points.o \ - $(MESABUILDDIR)polygon.o \ - $(MESABUILDDIR)rastpos.o \ - $(MESABUILDDIR)renderbuffer.o \ - $(MESABUILDDIR)state.o \ - $(MESABUILDDIR)stencil.o \ - $(MESABUILDDIR)texcompress.o \ - $(MESABUILDDIR)texcompress_fxt1.o \ - $(MESABUILDDIR)texcompress_s3tc.o \ - $(MESABUILDDIR)texenvprogram.o \ - $(MESABUILDDIR)texformat.o \ - $(MESABUILDDIR)teximage.o \ - $(MESABUILDDIR)texrender.o \ - $(MESABUILDDIR)texobj.o \ - $(MESABUILDDIR)texstate.o \ - $(MESABUILDDIR)texstore.o \ - $(MESABUILDDIR)varray.o \ - $(MESABUILDDIR)vtxfmt.o - -#ifdef NeedAllMesaSrc - DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o - GLAPIUOBJS = $(MESABUILDDIR)unshared/glapi.o - GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o -#endif - -#if defined(DoSharedLib) && DoSharedLib -COREMESABASEUOBJS = \ - $(DISPATCHUOBJS) \ - $(GLAPIUOBJS) \ - $(GLTHREADUOBJS) \ - $(MESABUILDDIR)unshared/api_arrayelt.o \ - $(MESABUILDDIR)unshared/api_loopback.o \ - $(MESABUILDDIR)unshared/api_noop.o \ - $(MESABUILDDIR)unshared/api_validate.o \ - $(MESABUILDDIR)unshared/accum.o \ - $(MESABUILDDIR)unshared/attrib.o \ - $(MESABUILDDIR)unshared/blend.o \ - $(MESABUILDDIR)unshared/bufferobj.o \ - $(MESABUILDDIR)unshared/buffers.o \ - $(MESABUILDDIR)unshared/clip.o \ - $(MESABUILDDIR)unshared/colortab.o \ - $(MESABUILDDIR)unshared/context.o \ - $(MESABUILDDIR)unshared/convolve.o \ - $(MESABUILDDIR)unshared/debug.o \ - $(MESABUILDDIR)unshared/depth.o \ - $(MESABUILDDIR)unshared/dlist.o \ - $(MESABUILDDIR)unshared/drawpix.o \ - $(MESABUILDDIR)unshared/enable.o \ - $(MESABUILDDIR)unshared/enums.o \ - $(MESABUILDDIR)unshared/eval.o \ - $(MESABUILDDIR)unshared/execmem.o \ - $(MESABUILDDIR)unshared/extensions.o \ - $(MESABUILDDIR)unshared/fbobject.o \ - $(MESABUILDDIR)unshared/feedback.o \ - $(MESABUILDDIR)unshared/fog.o \ - $(MESABUILDDIR)unshared/framebuffer.o \ - $(MESABUILDDIR)unshared/get.o \ - $(MESABUILDDIR)unshared/getstring.o \ - $(MESABUILDDIR)unshared/hash.o \ - $(MESABUILDDIR)unshared/hint.o \ - $(MESABUILDDIR)unshared/histogram.o \ - $(MESABUILDDIR)unshared/image.o \ - $(MESABUILDDIR)unshared/imports.o \ - $(MESABUILDDIR)unshared/light.o \ - $(MESABUILDDIR)unshared/lines.o \ - $(MESABUILDDIR)unshared/matrix.o \ - $(MESABUILDDIR)unshared/mm.o \ - $(MESABUILDDIR)unshared/occlude.o \ - $(MESABUILDDIR)unshared/pixel.o \ - $(MESABUILDDIR)unshared/points.o \ - $(MESABUILDDIR)unshared/polygon.o \ - $(MESABUILDDIR)unshared/rastpos.o \ - $(MESABUILDDIR)unshared/renderbuffer.o \ - $(MESABUILDDIR)unshared/state.o \ - $(MESABUILDDIR)unshared/stencil.o \ - $(MESABUILDDIR)unshared/texcompress.o \ - $(MESABUILDDIR)unshared/texcompress_fxt1.o \ - $(MESABUILDDIR)unshared/texcompress_s3tc.o \ - $(MESABUILDDIR)unshared/texenvprogram.o \ - $(MESABUILDDIR)unshared/texformat.o \ - $(MESABUILDDIR)unshared/teximage.o \ - $(MESABUILDDIR)unshared/texobj.o \ - $(MESABUILDDIR)unshared/texrender.o \ - $(MESABUILDDIR)unshared/texstate.o \ - $(MESABUILDDIR)unshared/texstore.o \ - $(MESABUILDDIR)unshared/varray.o \ - $(MESABUILDDIR)unshared/vtxfmt.o -#else -COREMESABASEUOBJS = $(COREMESABASEOBJS) -#endif - -#ifdef NeedAllMesaSrc - DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o - GLAPIDOBJS = $(MESABUILDDIR)debugger/glapi.o - GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o -#endif - -COREMESABASEDOBJS = \ - $(DISPATCHDOBJS) \ - $(GLAPIDOBJS) \ - $(GLTHREADDOBJS) \ - $(MESABUILDDIR)debugger/api_arrayelt.o \ - $(MESABUILDDIR)debugger/api_loopback.o \ - $(MESABUILDDIR)debugger/api_noop.o \ - $(MESABUILDDIR)debugger/api_validate.o \ - $(MESABUILDDIR)debugger/accum.o \ - $(MESABUILDDIR)debugger/attrib.o \ - $(MESABUILDDIR)debugger/blend.o \ - $(MESABUILDDIR)debugger/bufferobj.o \ - $(MESABUILDDIR)debugger/buffers.o \ - $(MESABUILDDIR)debugger/clip.o \ - $(MESABUILDDIR)debugger/colortab.o \ - $(MESABUILDDIR)debugger/context.o \ - $(MESABUILDDIR)debugger/convolve.o \ - $(MESABUILDDIR)debugger/debug.o \ - $(MESABUILDDIR)debugger/depth.o \ - $(MESABUILDDIR)debugger/dlist.o \ - $(MESABUILDDIR)debugger/drawpix.o \ - $(MESABUILDDIR)debugger/enable.o \ - $(MESABUILDDIR)debugger/enums.o \ - $(MESABUILDDIR)debugger/eval.o \ - $(MESABUILDDIR)debugger/execmem.o \ - $(MESABUILDDIR)debugger/extensions.o \ - $(MESABUILDDIR)debugger/fbobject.o \ - $(MESABUILDDIR)debugger/feedback.o \ - $(MESABUILDDIR)debugger/fog.o \ - $(MESABUILDDIR)debugger/framebuffer.o \ - $(MESABUILDDIR)debugger/get.o \ - $(MESABUILDDIR)debugger/getstring.o \ - $(MESABUILDDIR)debugger/hash.o \ - $(MESABUILDDIR)debugger/hint.o \ - $(MESABUILDDIR)debugger/histogram.o \ - $(MESABUILDDIR)debugger/image.o \ - $(MESABUILDDIR)debugger/imports.o \ - $(MESABUILDDIR)debugger/light.o \ - $(MESABUILDDIR)debugger/lines.o \ - $(MESABUILDDIR)debugger/matrix.o \ - $(MESABUILDDIR)debugger/mm.o \ - $(MESABUILDDIR)debugger/occlude.o \ - $(MESABUILDDIR)debugger/pixel.o \ - $(MESABUILDDIR)debugger/points.o \ - $(MESABUILDDIR)debugger/polygon.o \ - $(MESABUILDDIR)debugger/rastpos.o \ - $(MESABUILDDIR)debugger/renderbuffer.o \ - $(MESABUILDDIR)debugger/state.o \ - $(MESABUILDDIR)debugger/stencil.o \ - $(MESABUILDDIR)debugger/texcompress.o \ - $(MESABUILDDIR)debugger/texcompress_fxt1.o \ - $(MESABUILDDIR)debugger/texcompress_s3tc.o \ - $(MESABUILDDIR)debugger/texenvprogram.o \ - $(MESABUILDDIR)debugger/texformat.o \ - $(MESABUILDDIR)debugger/teximage.o \ - $(MESABUILDDIR)debugger/texobj.o \ - $(MESABUILDDIR)debugger/texrender.o \ - $(MESABUILDDIR)debugger/texstate.o \ - $(MESABUILDDIR)debugger/texstore.o \ - $(MESABUILDDIR)debugger/varray.o \ - $(MESABUILDDIR)debugger/vtxfmt.o - -#ifdef NeedAllMesaSrc - DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o - GLAPIPOBJS = $(MESABUILDDIR)profiled/glapi.o - GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o -#endif - -COREMESABASEPOBJS = \ - $(DISPATCHPOBJS) \ - $(GLAPIPOBJS) \ - $(GLTHREADPOBJS) \ - $(MESABUILDDIR)profiled/api_arrayelt.o \ - $(MESABUILDDIR)profiled/api_loopback.o \ - $(MESABUILDDIR)profiled/api_noop.o \ - $(MESABUILDDIR)profiled/api_validate.o \ - $(MESABUILDDIR)profiled/accum.o \ - $(MESABUILDDIR)profiled/attrib.o \ - $(MESABUILDDIR)profiled/blend.o \ - $(MESABUILDDIR)profiled/bufferobj.o \ - $(MESABUILDDIR)profiled/buffers.o \ - $(MESABUILDDIR)profiled/clip.o \ - $(MESABUILDDIR)profiled/colortab.o \ - $(MESABUILDDIR)profiled/context.o \ - $(MESABUILDDIR)profiled/convolve.o \ - $(MESABUILDDIR)profiled/debug.o \ - $(MESABUILDDIR)profiled/depth.o \ - $(MESABUILDDIR)profiled/dlist.o \ - $(MESABUILDDIR)profiled/drawpix.o \ - $(MESABUILDDIR)profiled/enable.o \ - $(MESABUILDDIR)profiled/enums.o \ - $(MESABUILDDIR)profiled/eval.o \ - $(MESABUILDDIR)profiled/execmem.o \ - $(MESABUILDDIR)profiled/extensions.o \ - $(MESABUILDDIR)profiled/fbobject.o \ - $(MESABUILDDIR)profiled/feedback.o \ - $(MESABUILDDIR)profiled/fog.o \ - $(MESABUILDDIR)profiled/framebuffer.o \ - $(MESABUILDDIR)profiled/get.o \ - $(MESABUILDDIR)profiled/getstring.o \ - $(MESABUILDDIR)profiled/hash.o \ - $(MESABUILDDIR)profiled/hint.o \ - $(MESABUILDDIR)profiled/histogram.o \ - $(MESABUILDDIR)profiled/image.o \ - $(MESABUILDDIR)profiled/imports.o \ - $(MESABUILDDIR)profiled/light.o \ - $(MESABUILDDIR)profiled/lines.o \ - $(MESABUILDDIR)profiled/matrix.o \ - $(MESABUILDDIR)profiled/mm.o \ - $(MESABUILDDIR)profiled/occlude.o \ - $(MESABUILDDIR)profiled/pixel.o \ - $(MESABUILDDIR)profiled/points.o \ - $(MESABUILDDIR)profiled/polygon.o \ - $(MESABUILDDIR)profiled/rastpos.o \ - $(MESABUILDDIR)profiled/renderbuffer.o \ - $(MESABUILDDIR)profiled/state.o \ - $(MESABUILDDIR)profiled/stencil.o \ - $(MESABUILDDIR)profiled/texcompress.o \ - $(MESABUILDDIR)profiled/texcompress_fxt1.o \ - $(MESABUILDDIR)profiled/texcompress_s3tc.o \ - $(MESABUILDDIR)profiled/texenvprogram.o \ - $(MESABUILDDIR)profiled/texformat.o \ - $(MESABUILDDIR)profiled/teximage.o \ - $(MESABUILDDIR)profiled/texobj.o \ - $(MESABUILDDIR)profiled/texrender.o \ - $(MESABUILDDIR)profiled/texstate.o \ - $(MESABUILDDIR)profiled/texstore.o \ - $(MESABUILDDIR)profiled/varray.o \ - $(MESABUILDDIR)profiled/vtxfmt.o diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/main/Makefile.am new file mode 100644 index 0000000000..d2d03d59ae --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/Makefile.am @@ -0,0 +1,79 @@ +noinst_LTLIBRARIES = libmain.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +if NEED_VSNPRINTF +VSNPRINTF_SOURCES = vsnprintf.c +endif + +nodist_libmain_la_SOURCES = accum.c \ + api_arrayelt.c \ + api_loopback.c \ + api_noop.c \ + api_validate.c \ + attrib.c \ + blend.c \ + bufferobj.c \ + buffers.c \ + clip.c \ + colortab.c \ + context.c \ + convolve.c \ + debug.c \ + depth.c \ + dispatch.c \ + dlist.c \ + drawpix.c \ + enable.c \ + enums.c \ + eval.c \ + execmem.c \ + extensions.c \ + fbobject.c \ + feedback.c \ + fog.c \ + framebuffer.c \ + get.c \ + getstring.c \ + hash.c \ + hint.c \ + histogram.c \ + image.c \ + imports.c \ + light.c \ + lines.c \ + matrix.c \ + mm.c \ + occlude.c \ + pixel.c \ + points.c \ + polygon.c \ + rastpos.c \ + renderbuffer.c \ + state.c \ + stencil.c \ + texcompress.c \ + texcompress_fxt1.c \ + texcompress_s3tc.c \ + texenvprogram.c \ + texformat.c \ + teximage.c \ + texobj.c \ + texrender.c \ + texstate.c \ + texstore.c \ + varray.c \ + $(VSNPRINTF_SOURCES) \ + vtxfmt.c diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile deleted file mode 100644 index 6af3a0a0cf..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ /dev/null @@ -1,35 +0,0 @@ -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaMathBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_MATH_SRCS) - OBJS = $(MESA_MATH_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc deleted file mode 100644 index bc9a1f3265..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc +++ /dev/null @@ -1,76 +0,0 @@ -MESAMATHBUILDDIR = MesaMathBuildDir - - MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ - $(MESAMATHBUILDDIR)m_debug_norm.c \ - $(MESAMATHBUILDDIR)m_debug_xform.c \ - $(MESAMATHBUILDDIR)m_eval.c \ - $(MESAMATHBUILDDIR)m_matrix.c \ - $(MESAMATHBUILDDIR)m_translate.c \ - $(MESAMATHBUILDDIR)m_vector.c \ - $(MESAMATHBUILDDIR)m_xform.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math) -#endif - - MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \ - $(MESAMATHBUILDDIR)m_debug_norm.o \ - $(MESAMATHBUILDDIR)m_debug_xform.o \ - $(MESAMATHBUILDDIR)m_eval.o \ - $(MESAMATHBUILDDIR)m_matrix.o \ - $(MESAMATHBUILDDIR)m_translate.o \ - $(MESAMATHBUILDDIR)m_vector.o \ - $(MESAMATHBUILDDIR)m_xform.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \ - $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \ - $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \ - $(MESAMATHBUILDDIR)unshared/m_eval.o \ - $(MESAMATHBUILDDIR)unshared/m_matrix.o \ - $(MESAMATHBUILDDIR)unshared/m_translate.o \ - $(MESAMATHBUILDDIR)unshared/m_vector.o \ - $(MESAMATHBUILDDIR)unshared/m_xform.o -#else - MATH_MESA_UOBJS = $(MESA_MATH_OBJS) -#endif - - MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \ - $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \ - $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \ - $(MESAMATHBUILDDIR)debugger/m_eval.o \ - $(MESAMATHBUILDDIR)debugger/m_matrix.o \ - $(MESAMATHBUILDDIR)debugger/m_translate.o \ - $(MESAMATHBUILDDIR)debugger/m_vector.o \ - $(MESAMATHBUILDDIR)debugger/m_xform.o - - MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \ - $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \ - $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \ - $(MESAMATHBUILDDIR)profiled/m_eval.o \ - $(MESAMATHBUILDDIR)profiled/m_matrix.o \ - $(MESAMATHBUILDDIR)profiled/m_translate.o \ - $(MESAMATHBUILDDIR)profiled/m_vector.o \ - $(MESAMATHBUILDDIR)profiled/m_xform.o - diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/math/Makefile.am new file mode 100644 index 0000000000..c2512c7bd8 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/math/Makefile.am @@ -0,0 +1,24 @@ +noinst_LTLIBRARIES = libmath.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libmath_la_SOURCES = m_debug_clip.c \ + m_debug_norm.c \ + m_debug_xform.c \ + m_eval.c \ + m_matrix.c \ + m_translate.c \ + m_vector.c \ + m_xform.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile deleted file mode 100644 index bf3acd4f66..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile +++ /dev/null @@ -1,40 +0,0 @@ - -#define IHaveSubdirs - SUBDIRS = grammar slang - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaShaderBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_SHADER_SRCS) - OBJS = $(MESA_SHADER_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc deleted file mode 100644 index 185103996d..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc +++ /dev/null @@ -1,100 +0,0 @@ -MESASHADERBUILDDIR = MesaShaderBuildDir - - MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ - $(MESASHADERBUILDDIR)arbprogram.c \ - $(MESASHADERBUILDDIR)arbfragparse.c \ - $(MESASHADERBUILDDIR)arbvertparse.c \ - $(MESASHADERBUILDDIR)atifragshader.c \ - $(MESASHADERBUILDDIR)nvprogram.c \ - $(MESASHADERBUILDDIR)nvfragparse.c \ - $(MESASHADERBUILDDIR)nvvertexec.c \ - $(MESASHADERBUILDDIR)nvvertparse.c \ - $(MESASHADERBUILDDIR)program.c \ - $(MESASHADERBUILDDIR)shaderobjects.c \ - $(MESASHADERBUILDDIR)shaderobjects_3dlabs.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram_syn.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(atifragshader.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(atifragshader.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects_3dlabs.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects_3dlabs.h, $(MESASRCDIR)/src/mesa/shader) -#endif - - MESA_SHADER_OBJS = $(MESASHADERBUILDDIR)arbprogparse.o \ - $(MESASHADERBUILDDIR)arbprogram.o \ - $(MESASHADERBUILDDIR)arbfragparse.o \ - $(MESASHADERBUILDDIR)arbvertparse.o \ - $(MESASHADERBUILDDIR)atifragshader.o \ - $(MESASHADERBUILDDIR)nvprogram.o \ - $(MESASHADERBUILDDIR)nvfragparse.o \ - $(MESASHADERBUILDDIR)nvvertexec.o \ - $(MESASHADERBUILDDIR)nvvertparse.o \ - $(MESASHADERBUILDDIR)program.o \ - $(MESASHADERBUILDDIR)shaderobjects.o \ - $(MESASHADERBUILDDIR)shaderobjects_3dlabs.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_SHADER_UOBJS = $(MESASHADERBUILDDIR)unshared/arbprogparse.o \ - $(MESASHADERBUILDDIR)unshared/arbprogram.o \ - $(MESASHADERBUILDDIR)unshared/arbfragparse.o \ - $(MESASHADERBUILDDIR)unshared/arbvertparse.o \ - $(MESASHADERBUILDDIR)unshared/atifragshader.o \ - $(MESASHADERBUILDDIR)unshared/nvprogram.o \ - $(MESASHADERBUILDDIR)unshared/nvfragparse.o \ - $(MESASHADERBUILDDIR)unshared/nvvertexec.o \ - $(MESASHADERBUILDDIR)unshared/nvvertparse.o \ - $(MESASHADERBUILDDIR)unshared/program.o \ - $(MESASHADERBUILDDIR)unshared/shaderobjects.o \ - $(MESASHADERBUILDDIR)unshared/shaderobjects_3dlabs.o -#else - MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS) -#endif - - MESA_SHADER_DOBJS = $(MESASHADERBUILDDIR)debugger/arbprogparse.o \ - $(MESASHADERBUILDDIR)debugger/arbprogram.o \ - $(MESASHADERBUILDDIR)debugger/arbfragparse.o \ - $(MESASHADERBUILDDIR)debugger/arbvertparse.o \ - $(MESASHADERBUILDDIR)debugger/atifragshader.o \ - $(MESASHADERBUILDDIR)debugger/nvprogram.o \ - $(MESASHADERBUILDDIR)debugger/nvfragparse.o \ - $(MESASHADERBUILDDIR)debugger/nvvertexec.o \ - $(MESASHADERBUILDDIR)debugger/nvvertparse.o \ - $(MESASHADERBUILDDIR)debugger/program.o \ - $(MESASHADERBUILDDIR)debugger/shaderobjects.o \ - $(MESASHADERBUILDDIR)debugger/shaderobjects_3dlabs.o - - MESA_SHADER_POBJS = $(MESASHADERBUILDDIR)profiled/arbprogparse.o \ - $(MESASHADERBUILDDIR)profiled/arbprogram.o \ - $(MESASHADERBUILDDIR)profiled/arbfragparse.o \ - $(MESASHADERBUILDDIR)profiled/arbvertparse.o \ - $(MESASHADERBUILDDIR)profiled/atifragshader.o \ - $(MESASHADERBUILDDIR)profiled/nvprogram.o \ - $(MESASHADERBUILDDIR)profiled/nvfragparse.o \ - $(MESASHADERBUILDDIR)profiled/nvvertexec.o \ - $(MESASHADERBUILDDIR)profiled/nvvertparse.o \ - $(MESASHADERBUILDDIR)profiled/program.o \ - $(MESASHADERBUILDDIR)profiled/shaderobjects.o \ - $(MESASHADERBUILDDIR)profiled/shaderobjects_3dlabs.o diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/shader/Makefile.am new file mode 100644 index 0000000000..f42d515dac --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Makefile.am @@ -0,0 +1,32 @@ +SUBDIRS = grammar slang + +noinst_LTLIBRARIES = libshader.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../shader/grammar \ + -I../shader/slang \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libshader_la_SOURCES = arbfragparse.c \ + arbprogparse.c \ + arbprogram.c \ + arbvertparse.c \ + atifragshader.c \ + nvfragparse.c \ + nvprogram.c \ + nvvertexec.c \ + nvvertparse.c \ + program.c \ + shaderobjects.c \ + shaderobjects_3dlabs.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile deleted file mode 100644 index 3fe604f2e1..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile +++ /dev/null @@ -1,37 +0,0 @@ - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaGrammarBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_GRAMMAR_SRCS) - OBJS = $(MESA_GRAMMAR_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc deleted file mode 100644 index 4f91af9c1c..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -MESAGRAMMARBUILDDIR=MesaGrammarBuildDir - - MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar) -#endif - - MESA_GRAMMAR_OBJS = $(MESAGRAMMARBUILDDIR)grammar_mesa.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o -#else - MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS) -#endif - - MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o - - MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile.am new file mode 100644 index 0000000000..d7a37a8748 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile.am @@ -0,0 +1,17 @@ +noinst_LTLIBRARIES = libgrammar.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../../X \ + -I../../array_cache \ + -I../../glapi \ + -I../../main \ + -I../../math \ + -I../../shader \ + -I../../swrast \ + -I../../swrast_setup \ + -I../../tnl \ + -I../.. + +nodist_libgrammar_la_SOURCES = grammar_mesa.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile deleted file mode 100644 index d5ec4d6cf3..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile +++ /dev/null @@ -1,40 +0,0 @@ - -#define IHaveSubdirs - SUBDIRS = library - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaSlangBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_SLANG_SRCS) - OBJS = $(MESA_SLANG_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc deleted file mode 100644 index 6757e2e50f..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc +++ /dev/null @@ -1,84 +0,0 @@ -MESASLANGBUILDDIR=MesaSlangBuildDir - - MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ - $(MESASLANGBUILDDIR)slang_assemble.c \ - $(MESASLANGBUILDDIR)slang_assemble_conditional.c \ - $(MESASLANGBUILDDIR)slang_assemble_constructor.c \ - $(MESASLANGBUILDDIR)slang_assemble_typeinfo.c \ - $(MESASLANGBUILDDIR)slang_compile.c \ - $(MESASLANGBUILDDIR)slang_execute.c \ - $(MESASLANGBUILDDIR)slang_preprocess.c \ - $(MESASLANGBUILDDIR)slang_storage.c \ - $(MESASLANGBUILDDIR)slang_utility.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_assignment.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_conditional.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_conditional.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_constructor.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_constructor.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_typeinfo.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_typeinfo.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_compile.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_compile.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_execute.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_execute.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_preprocess.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_preprocess.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_storage.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_storage.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_utility.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_utility.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang) -#endif - - MESA_SLANG_OBJS = $(MESASLANGBUILDDIR)slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)slang_assemble.o \ - $(MESASLANGBUILDDIR)slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)slang_compile.o \ - $(MESASLANGBUILDDIR)slang_execute.o \ - $(MESASLANGBUILDDIR)slang_preprocess.o \ - $(MESASLANGBUILDDIR)slang_storage.o \ - $(MESASLANGBUILDDIR)slang_utility.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_SLANG_UOBJS = $(MESASLANGBUILDDIR)unshared/slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)unshared/slang_compile.o \ - $(MESASLANGBUILDDIR)unshared/slang_execute.o \ - $(MESASLANGBUILDDIR)unshared/slang_preprocess.o \ - $(MESASLANGBUILDDIR)unshared/slang_storage.o \ - $(MESASLANGBUILDDIR)unshared/slang_utility.o -#else - MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS) -#endif - - MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debugger/slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)debugger/slang_assemble.o \ - $(MESASLANGBUILDDIR)debugger/slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)debugger/slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)debugger/slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)debugger/slang_compile.o \ - $(MESASLANGBUILDDIR)debugger/slang_execute.o \ - $(MESASLANGBUILDDIR)debugger/slang_preprocess.o \ - $(MESASLANGBUILDDIR)debugger/slang_storage.o \ - $(MESASLANGBUILDDIR)debugger/slang_utility.o - - MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)profiled/slang_compile.o \ - $(MESASLANGBUILDDIR)profiled/slang_execute.o \ - $(MESASLANGBUILDDIR)profiled/slang_preprocess.o \ - $(MESASLANGBUILDDIR)profiled/slang_storage.o \ - $(MESASLANGBUILDDIR)profiled/slang_utility.o diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile.am new file mode 100644 index 0000000000..f4dfdc0c8d --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile.am @@ -0,0 +1,27 @@ +noinst_LTLIBRARIES = libslang.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../grammar \ + -I../../X \ + -I../../array_cache \ + -I../../glapi \ + -I../../main \ + -I../../math \ + -I../../shader \ + -I../../swrast \ + -I../../swrast_setup \ + -I../../tnl \ + -I../.. + +nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ + slang_assemble.c \ + slang_assemble_conditional.c \ + slang_assemble_constructor.c \ + slang_assemble_typeinfo.c \ + slang_compile.c \ + slang_execute.c \ + slang_preprocess.c \ + slang_storage.c \ + slang_utility.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile deleted file mode 100644 index 8c216804d0..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile +++ /dev/null @@ -1,30 +0,0 @@ - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaLibraryBuildDir /**/ -#include "Imakefile.inc" - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc deleted file mode 100644 index 06b5300633..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef NeedToLinkMesaSrc -LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -#endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile deleted file mode 100644 index df47a1caac..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ /dev/null @@ -1,42 +0,0 @@ -/* Large PIC tables needed for Solaris/SPARC builds */ -#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags -#endif - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaSwrastBuildDir /**/ -#include "Imakefile.inc" - - - SRCS = $(MESA_SWRAST_SRCS) - OBJS = $(MESA_SWRAST_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc deleted file mode 100644 index f573098c16..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc +++ /dev/null @@ -1,212 +0,0 @@ -MESASWRASTBUILDDIR = MesaSwrastBuildDir - - MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ - $(MESASWRASTBUILDDIR)s_aatriangle.c \ - $(MESASWRASTBUILDDIR)s_accum.c \ - $(MESASWRASTBUILDDIR)s_alpha.c \ - $(MESASWRASTBUILDDIR)s_atifragshader.c \ - $(MESASWRASTBUILDDIR)s_bitmap.c \ - $(MESASWRASTBUILDDIR)s_blend.c \ - $(MESASWRASTBUILDDIR)s_buffers.c \ - $(MESASWRASTBUILDDIR)s_context.c \ - $(MESASWRASTBUILDDIR)s_copypix.c \ - $(MESASWRASTBUILDDIR)s_depth.c \ - $(MESASWRASTBUILDDIR)s_drawpix.c \ - $(MESASWRASTBUILDDIR)s_feedback.c \ - $(MESASWRASTBUILDDIR)s_fog.c \ - $(MESASWRASTBUILDDIR)s_imaging.c \ - $(MESASWRASTBUILDDIR)s_lines.c \ - $(MESASWRASTBUILDDIR)s_logic.c \ - $(MESASWRASTBUILDDIR)s_masking.c \ - $(MESASWRASTBUILDDIR)s_nvfragprog.c \ - $(MESASWRASTBUILDDIR)s_pixeltex.c \ - $(MESASWRASTBUILDDIR)s_points.c \ - $(MESASWRASTBUILDDIR)s_readpix.c \ - $(MESASWRASTBUILDDIR)s_span.c \ - $(MESASWRASTBUILDDIR)s_stencil.c \ - $(MESASWRASTBUILDDIR)s_texstore.c \ - $(MESASWRASTBUILDDIR)s_texture.c \ - $(MESASWRASTBUILDDIR)s_triangle.c \ - $(MESASWRASTBUILDDIR)s_zoom.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(s_aaline.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aaline.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aalinetemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatriangle.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatritemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_accum.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_alpha.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_atifragshader.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_atifragshader.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_blend.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_context.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_context.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_depth.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_drawpix.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_feedback.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_fog.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_lines.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_linetemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_logic.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_masking.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_nvfragprog.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_nvfragprog.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pixeltex.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_points.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_points.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pointtemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_span.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_span.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_spantemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_stencil.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texture.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_triangle.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_trispan.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_tritemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_zoom.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(swrast.h, $(MESASRCDIR)/src/mesa/swrast) -#endif - - MESA_SWRAST_OBJS = $(MESASWRASTBUILDDIR)s_aaline.o \ - $(MESASWRASTBUILDDIR)s_aatriangle.o \ - $(MESASWRASTBUILDDIR)s_accum.o \ - $(MESASWRASTBUILDDIR)s_alpha.o \ - $(MESASWRASTBUILDDIR)s_atifragshader.o \ - $(MESASWRASTBUILDDIR)s_bitmap.o \ - $(MESASWRASTBUILDDIR)s_blend.o \ - $(MESASWRASTBUILDDIR)s_buffers.o \ - $(MESASWRASTBUILDDIR)s_context.o \ - $(MESASWRASTBUILDDIR)s_copypix.o \ - $(MESASWRASTBUILDDIR)s_depth.o \ - $(MESASWRASTBUILDDIR)s_drawpix.o \ - $(MESASWRASTBUILDDIR)s_feedback.o \ - $(MESASWRASTBUILDDIR)s_fog.o \ - $(MESASWRASTBUILDDIR)s_imaging.o \ - $(MESASWRASTBUILDDIR)s_lines.o \ - $(MESASWRASTBUILDDIR)s_logic.o \ - $(MESASWRASTBUILDDIR)s_masking.o \ - $(MESASWRASTBUILDDIR)s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)s_pixeltex.o \ - $(MESASWRASTBUILDDIR)s_points.o \ - $(MESASWRASTBUILDDIR)s_readpix.o \ - $(MESASWRASTBUILDDIR)s_span.o \ - $(MESASWRASTBUILDDIR)s_stencil.o \ - $(MESASWRASTBUILDDIR)s_texstore.o \ - $(MESASWRASTBUILDDIR)s_texture.o \ - $(MESASWRASTBUILDDIR)s_triangle.o \ - $(MESASWRASTBUILDDIR)s_zoom.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_SWRAST_UOBJS = $(MESASWRASTBUILDDIR)unshared/s_aaline.o \ - $(MESASWRASTBUILDDIR)unshared/s_aatriangle.o \ - $(MESASWRASTBUILDDIR)unshared/s_accum.o \ - $(MESASWRASTBUILDDIR)unshared/s_alpha.o \ - $(MESASWRASTBUILDDIR)unshared/s_atifragshader.o \ - $(MESASWRASTBUILDDIR)unshared/s_bitmap.o \ - $(MESASWRASTBUILDDIR)unshared/s_blend.o \ - $(MESASWRASTBUILDDIR)unshared/s_buffers.o \ - $(MESASWRASTBUILDDIR)unshared/s_context.o \ - $(MESASWRASTBUILDDIR)unshared/s_copypix.o \ - $(MESASWRASTBUILDDIR)unshared/s_depth.o \ - $(MESASWRASTBUILDDIR)unshared/s_drawpix.o \ - $(MESASWRASTBUILDDIR)unshared/s_feedback.o \ - $(MESASWRASTBUILDDIR)unshared/s_fog.o \ - $(MESASWRASTBUILDDIR)unshared/s_imaging.o \ - $(MESASWRASTBUILDDIR)unshared/s_lines.o \ - $(MESASWRASTBUILDDIR)unshared/s_logic.o \ - $(MESASWRASTBUILDDIR)unshared/s_masking.o \ - $(MESASWRASTBUILDDIR)unshared/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)unshared/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)unshared/s_points.o \ - $(MESASWRASTBUILDDIR)unshared/s_readpix.o \ - $(MESASWRASTBUILDDIR)unshared/s_span.o \ - $(MESASWRASTBUILDDIR)unshared/s_stencil.o \ - $(MESASWRASTBUILDDIR)unshared/s_texstore.o \ - $(MESASWRASTBUILDDIR)unshared/s_texture.o \ - $(MESASWRASTBUILDDIR)unshared/s_triangle.o \ - $(MESASWRASTBUILDDIR)unshared/s_zoom.o -#else - MESA_SWRAST_UOBJS = $(MESA_SWRAST_OBJS) -#endif - - MESA_SWRAST_DOBJS = $(MESASWRASTBUILDDIR)debugger/s_aaline.o \ - $(MESASWRASTBUILDDIR)debugger/s_aatriangle.o \ - $(MESASWRASTBUILDDIR)debugger/s_accum.o \ - $(MESASWRASTBUILDDIR)debugger/s_alpha.o \ - $(MESASWRASTBUILDDIR)debugger/s_atifragshader.o \ - $(MESASWRASTBUILDDIR)debugger/s_bitmap.o \ - $(MESASWRASTBUILDDIR)debugger/s_blend.o \ - $(MESASWRASTBUILDDIR)debugger/s_buffers.o \ - $(MESASWRASTBUILDDIR)debugger/s_context.o \ - $(MESASWRASTBUILDDIR)debugger/s_copypix.o \ - $(MESASWRASTBUILDDIR)debugger/s_depth.o \ - $(MESASWRASTBUILDDIR)debugger/s_drawpix.o \ - $(MESASWRASTBUILDDIR)debugger/s_feedback.o \ - $(MESASWRASTBUILDDIR)debugger/s_fog.o \ - $(MESASWRASTBUILDDIR)debugger/s_imaging.o \ - $(MESASWRASTBUILDDIR)debugger/s_lines.o \ - $(MESASWRASTBUILDDIR)debugger/s_logic.o \ - $(MESASWRASTBUILDDIR)debugger/s_masking.o \ - $(MESASWRASTBUILDDIR)debugger/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)debugger/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)debugger/s_points.o \ - $(MESASWRASTBUILDDIR)debugger/s_readpix.o \ - $(MESASWRASTBUILDDIR)debugger/s_span.o \ - $(MESASWRASTBUILDDIR)debugger/s_stencil.o \ - $(MESASWRASTBUILDDIR)debugger/s_texstore.o \ - $(MESASWRASTBUILDDIR)debugger/s_texture.o \ - $(MESASWRASTBUILDDIR)debugger/s_triangle.o \ - $(MESASWRASTBUILDDIR)debugger/s_zoom.o - - MESA_SWRAST_POBJS = $(MESASWRASTBUILDDIR)profiled/s_aaline.o \ - $(MESASWRASTBUILDDIR)profiled/s_aatriangle.o \ - $(MESASWRASTBUILDDIR)profiled/s_accum.o \ - $(MESASWRASTBUILDDIR)profiled/s_alpha.o \ - $(MESASWRASTBUILDDIR)profiled/s_atifragshader.o \ - $(MESASWRASTBUILDDIR)profiled/s_bitmap.o \ - $(MESASWRASTBUILDDIR)profiled/s_blend.o \ - $(MESASWRASTBUILDDIR)profiled/s_buffers.o \ - $(MESASWRASTBUILDDIR)profiled/s_context.o \ - $(MESASWRASTBUILDDIR)profiled/s_copypix.o \ - $(MESASWRASTBUILDDIR)profiled/s_depth.o \ - $(MESASWRASTBUILDDIR)profiled/s_drawpix.o \ - $(MESASWRASTBUILDDIR)profiled/s_feedback.o \ - $(MESASWRASTBUILDDIR)profiled/s_fog.o \ - $(MESASWRASTBUILDDIR)profiled/s_imaging.o \ - $(MESASWRASTBUILDDIR)profiled/s_lines.o \ - $(MESASWRASTBUILDDIR)profiled/s_logic.o \ - $(MESASWRASTBUILDDIR)profiled/s_masking.o \ - $(MESASWRASTBUILDDIR)profiled/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)profiled/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)profiled/s_points.o \ - $(MESASWRASTBUILDDIR)profiled/s_readpix.o \ - $(MESASWRASTBUILDDIR)profiled/s_span.o \ - $(MESASWRASTBUILDDIR)profiled/s_stencil.o \ - $(MESASWRASTBUILDDIR)profiled/s_texstore.o \ - $(MESASWRASTBUILDDIR)profiled/s_texture.o \ - $(MESASWRASTBUILDDIR)profiled/s_triangle.o \ - $(MESASWRASTBUILDDIR)profiled/s_zoom.o - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/swrast/Makefile.am new file mode 100644 index 0000000000..c18be7bd38 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Makefile.am @@ -0,0 +1,46 @@ +noinst_LTLIBRARIES = libswrast.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libswrast_la_SOURCES = s_aaline.c \ + s_aatriangle.c \ + s_accum.c \ + s_alpha.c \ + s_atifragshader.c \ + s_bitmap.c \ + s_blend.c \ + s_buffers.c \ + s_context.c \ + s_copypix.c \ + s_depth.c \ + s_drawpix.c \ + s_feedback.c \ + s_fog.c \ + s_fragprog_to_c.c \ + s_imaging.c \ + s_lines.c \ + s_logic.c \ + s_masking.c \ + s_nvfragprog.c \ + s_pixeltex.c \ + s_points.c \ + s_readpix.c \ + s_span.c \ + s_stencil.c \ + s_tcc.c \ + s_texstore.c \ + s_texture.c \ + s_triangle.c \ + s_zoom.c diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile deleted file mode 100644 index be2ce62a4d..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ /dev/null @@ -1,34 +0,0 @@ -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaSwrastSetupBuildDir /**/ -#include "Imakefile.inc" - - SRCS = $(MESA_SWR_SETUP_SRCS) - OBJS = $(MESA_SWR_SETUP_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc deleted file mode 100644 index 567ad65b8c..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc +++ /dev/null @@ -1,30 +0,0 @@ -MESASWRSETUPDIR = MesaSwrastSetupBuildDir - - MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ - $(MESASWRSETUPDIR)ss_triangle.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_context.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_triangle.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_tritmp.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup) -#endif - - MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \ - $(MESASWRSETUPDIR)ss_triangle.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \ - $(MESASWRSETUPDIR)unshared/ss_triangle.o -#else -MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS) -#endif - -MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \ - $(MESASWRSETUPDIR)debugger/ss_triangle.o - -MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \ - $(MESASWRSETUPDIR)profiled/ss_triangle.o - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile.am new file mode 100644 index 0000000000..1a51b27443 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile.am @@ -0,0 +1,17 @@ +noinst_LTLIBRARIES = libss.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libss_la_SOURCES = ss_context.c ss_triangle.c diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile deleted file mode 100644 index b36454259c..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ /dev/null @@ -1,45 +0,0 @@ -/* Large PIC tables needed for Solaris/SPARC builds */ -#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags -#endif - - -#include - -#define NeedAllMesaSrc -#define NeedToLinkMesaSrc -#define MesaTnlBuildDir /**/ -#include "Imakefile.inc" - - - SRCS = $(MESA_TNL_SRCS) - OBJS = $(MESA_TNL_OBJS) - - INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/tnl \ - -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) - - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ - -NormalLibraryObjectRule() - -SubdirLibraryRule($(OBJS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc deleted file mode 100644 index a6c8f923e1..0000000000 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc +++ /dev/null @@ -1,219 +0,0 @@ -MESATNLBUILDDIR = MesaTnlBuildDir - - MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ - $(MESATNLBUILDDIR)t_array_import.c \ - $(MESATNLBUILDDIR)t_context.c \ - $(MESATNLBUILDDIR)t_pipeline.c \ - $(MESATNLBUILDDIR)t_save_api.c \ - $(MESATNLBUILDDIR)t_save_loopback.c \ - $(MESATNLBUILDDIR)t_save_playback.c \ - $(MESATNLBUILDDIR)t_vb_arbprogram.c \ - $(MESATNLBUILDDIR)t_vb_arbprogram_sse.c \ - $(MESATNLBUILDDIR)t_vb_fog.c \ - $(MESATNLBUILDDIR)t_vb_cull.c \ - $(MESATNLBUILDDIR)t_vb_light.c \ - $(MESATNLBUILDDIR)t_vb_normals.c \ - $(MESATNLBUILDDIR)t_vb_points.c \ - $(MESATNLBUILDDIR)t_vb_program.c \ - $(MESATNLBUILDDIR)t_vb_render.c \ - $(MESATNLBUILDDIR)t_vb_texgen.c \ - $(MESATNLBUILDDIR)t_vb_texmat.c \ - $(MESATNLBUILDDIR)t_vb_vertex.c \ - $(MESATNLBUILDDIR)t_vertex.c \ - $(MESATNLBUILDDIR)t_vertex_generic.c \ - $(MESATNLBUILDDIR)t_vertex_sse.c \ - $(MESATNLBUILDDIR)t_vp_build.c \ - $(MESATNLBUILDDIR)t_vtx_api.c \ - $(MESATNLBUILDDIR)t_vtx_eval.c \ - $(MESATNLBUILDDIR)t_vtx_exec.c \ - $(MESATNLBUILDDIR)t_vtx_generic.c - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_SRCS += MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.S -#endif - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_import.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_context.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_context.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(tnl.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_pipeline.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_loopback.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_playback.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram_sse.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_cliptmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_cull.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_lighttmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex_generic.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex_sse.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vp_build.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vp_build.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_eval.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_generic.c, $(MESASRCDIR)/src/mesa/tnl) -#if defined(i386Architecture) && MesaUseX86Asm -LinkSourceFile(t_vtx_x86.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl) -#endif -#endif - - MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \ - $(MESATNLBUILDDIR)t_array_import.o \ - $(MESATNLBUILDDIR)t_context.o \ - $(MESATNLBUILDDIR)t_pipeline.o \ - $(MESATNLBUILDDIR)t_save_api.o \ - $(MESATNLBUILDDIR)t_save_loopback.o \ - $(MESATNLBUILDDIR)t_save_playback.o \ - $(MESATNLBUILDDIR)t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)t_vb_fog.o \ - $(MESATNLBUILDDIR)t_vb_cull.o \ - $(MESATNLBUILDDIR)t_vb_light.o \ - $(MESATNLBUILDDIR)t_vb_normals.o \ - $(MESATNLBUILDDIR)t_vb_points.o \ - $(MESATNLBUILDDIR)t_vb_program.o \ - $(MESATNLBUILDDIR)t_vb_render.o \ - $(MESATNLBUILDDIR)t_vb_texgen.o \ - $(MESATNLBUILDDIR)t_vb_texmat.o \ - $(MESATNLBUILDDIR)t_vb_vertex.o \ - $(MESATNLBUILDDIR)t_vertex.o \ - $(MESATNLBUILDDIR)t_vertex_generic.o \ - $(MESATNLBUILDDIR)t_vertex_sse.o \ - $(MESATNLBUILDDIR)t_vp_build.o \ - $(MESATNLBUILDDIR)t_vtx_api.o \ - $(MESATNLBUILDDIR)t_vtx_eval.o \ - $(MESATNLBUILDDIR)t_vtx_exec.o \ - $(MESATNLBUILDDIR)t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_OBJS += $(MESATNLBUILDDIR)t_vtx_x86.o \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.o -#endif - -#if defined(DoSharedLib) && DoSharedLib - MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \ - $(MESATNLBUILDDIR)unshared/t_array_import.o \ - $(MESATNLBUILDDIR)unshared/t_context.o \ - $(MESATNLBUILDDIR)unshared/t_pipeline.o \ - $(MESATNLBUILDDIR)unshared/t_save_api.o \ - $(MESATNLBUILDDIR)unshared/t_save_loopback.o \ - $(MESATNLBUILDDIR)unshared/t_save_playback.o \ - $(MESATNLBUILDDIR)unshared/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)unshared/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)unshared/t_vb_fog.o \ - $(MESATNLBUILDDIR)unshared/t_vb_cull.o \ - $(MESATNLBUILDDIR)unshared/t_vb_light.o \ - $(MESATNLBUILDDIR)unshared/t_vb_normals.o \ - $(MESATNLBUILDDIR)unshared/t_vb_points.o \ - $(MESATNLBUILDDIR)unshared/t_vb_program.o \ - $(MESATNLBUILDDIR)unshared/t_vb_render.o \ - $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \ - $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \ - $(MESATNLBUILDDIR)unshared/t_vb_vertex.o \ - $(MESATNLBUILDDIR)unshared/t_vertex.o \ - $(MESATNLBUILDDIR)unshared/t_vertex_generic.o \ - $(MESATNLBUILDDIR)unshared/t_vertex_sse.o \ - $(MESATNLBUILDDIR)unshared/t_vp_build.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_api.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_UOBJS += $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.o -#endif - -#else - MESA_TNL_UOBJS = $(MESA_TNL_OBJS) -#endif - - MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \ - $(MESATNLBUILDDIR)debugger/t_array_import.o \ - $(MESATNLBUILDDIR)debugger/t_context.o \ - $(MESATNLBUILDDIR)debugger/t_pipeline.o \ - $(MESATNLBUILDDIR)debugger/t_save_api.o \ - $(MESATNLBUILDDIR)debugger/t_save_loopback.o \ - $(MESATNLBUILDDIR)debugger/t_save_playback.o \ - $(MESATNLBUILDDIR)debugger/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)debugger/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)debugger/t_vb_fog.o \ - $(MESATNLBUILDDIR)debugger/t_vb_cull.o \ - $(MESATNLBUILDDIR)debugger/t_vb_light.o \ - $(MESATNLBUILDDIR)debugger/t_vb_normals.o \ - $(MESATNLBUILDDIR)debugger/t_vb_points.o \ - $(MESATNLBUILDDIR)debugger/t_vb_program.o \ - $(MESATNLBUILDDIR)debugger/t_vb_render.o \ - $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \ - $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \ - $(MESATNLBUILDDIR)debugger/t_vb_vertex.o \ - $(MESATNLBUILDDIR)debugger/t_vertex.o \ - $(MESATNLBUILDDIR)debugger/t_vertex_generic.o \ - $(MESATNLBUILDDIR)debugger/t_vertex_sse.o \ - $(MESATNLBUILDDIR)debugger/t_vp_build.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_api.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_DOBJS += $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o -#endif - - MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \ - $(MESATNLBUILDDIR)profiled/t_array_import.o \ - $(MESATNLBUILDDIR)profiled/t_context.o \ - $(MESATNLBUILDDIR)profiled/t_pipeline.o \ - $(MESATNLBUILDDIR)profiled/t_save_api.o \ - $(MESATNLBUILDDIR)profiled/t_save_loopback.o \ - $(MESATNLBUILDDIR)profiled/t_save_playback.o \ - $(MESATNLBUILDDIR)profiled/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)profiled/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)profiled/t_vb_fog.o \ - $(MESATNLBUILDDIR)profiled/t_vb_cull.o \ - $(MESATNLBUILDDIR)profiled/t_vb_light.o \ - $(MESATNLBUILDDIR)profiled/t_vb_normals.o \ - $(MESATNLBUILDDIR)profiled/t_vb_points.o \ - $(MESATNLBUILDDIR)profiled/t_vb_program.o \ - $(MESATNLBUILDDIR)profiled/t_vb_render.o \ - $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \ - $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \ - $(MESATNLBUILDDIR)profiled/t_vb_vertex.o \ - $(MESATNLBUILDDIR)profiled/t_vertex.o \ - $(MESATNLBUILDDIR)profiled/t_vertex_generic.o \ - $(MESATNLBUILDDIR)profiled/t_vertex_sse.o \ - $(MESATNLBUILDDIR)profiled/t_vp_build.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_api.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_POBJS += $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o -#endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Makefile.am b/nx-X11/programs/Xserver/GL/mesa/tnl/Makefile.am new file mode 100644 index 0000000000..21cd515c20 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Makefile.am @@ -0,0 +1,44 @@ +noinst_LTLIBRARIES = libtnl.la + +AM_CFLAGS = -DXFree86Server + +AM_CPPFLAGS = -I@MESA_SOURCE@/include \ + -I../X \ + -I../array_cache \ + -I../glapi \ + -I../main \ + -I../math \ + -I../shader \ + -I../swrast \ + -I../swrast_setup \ + -I../tnl \ + -I.. + +nodist_libtnl_la_SOURCES = t_array_api.c \ + t_array_import.c \ + t_context.c \ + t_pipeline.c \ + t_save_api.c \ + t_save_loopback.c \ + t_save_playback.c \ + t_vb_arbprogram.c \ + t_vb_arbprogram_sse.c \ + t_vb_cull.c \ + t_vb_fog.c \ + t_vb_light.c \ + t_vb_normals.c \ + t_vb_points.c \ + t_vb_program.c \ + t_vb_render.c \ + t_vb_texgen.c \ + t_vb_texmat.c \ + t_vb_vertex.c \ + t_vertex.c \ + t_vertex_generic.c \ + t_vertex_sse.c \ + t_vp_build.c \ + t_vtx_api.c \ + t_vtx_eval.c \ + t_vtx_exec.c \ + t_vtx_generic.c \ + t_vtx_x86.c diff --git a/nx-X11/programs/Xserver/GL/symlink-mesa.sh b/nx-X11/programs/Xserver/GL/symlink-mesa.sh new file mode 100755 index 0000000000..3acff15c5d --- /dev/null +++ b/nx-X11/programs/Xserver/GL/symlink-mesa.sh @@ -0,0 +1,630 @@ +#!/bin/sh + +# +# A script that symlinks source files from Mesa to modular +# +# Author: Soren Sandmann (sandmann@redhat.com) (original) +# adapted for Mesa by Adam Jackson (ajax@nwnk.net) + +# +# Things we would like to do +# +# - Check that all the relevant files exist +# - AUTHORS, autogen.sh, configure.ac, ... +# - Check that we have actually linked everything +# - if a file doesn't need to be linked, then it needs +# to be listed as "not-linked" +# - Compute diffs between all the files (shouldn't be necessary) +# - possibly check that files are listet in Makefile.am's +# - Clean target directory of irrelevant files +# + +check_destinations () { + # don't do anything - we are relying on the side + # effect of dst_dir + true +} + +check_exist() { + # Check whether $1 exists + + if [ ! -e $1 ] ; then + error "$1 not found" + fi +} + +delete_existing() { + # Delete $2 + + rm -f $2 +} + +link_files() { + # Link $1 to $2 + + if [ ! -e $2 ] ; then + ln -s $1 $2 + fi +} + +main() { + check_args $1 $2 + + run check_destinations "Creating destination directories" + run check_exist "Checking that the source files exist" + run delete_existing "Deleting existing files" + run link_files "Linking files" +} + +## actual symlinking + +symlink_mesa_glapi() { + src_dir src/mesa/glapi + dst_dir mesa/glapi + + action dispatch.h + action glapi.c + action glapi.h + action glapioffsets.h + action glapitable.h + action glapitemp.h + action glprocs.h + action glthread.c + action glthread.h +} + +symlink_mesa_main() { + src_dir src/mesa/main + dst_dir mesa/main + + action accum.c + action accum.h + action api_arrayelt.c + action api_arrayelt.h + action api_eval.h + action api_loopback.c + action api_loopback.h + action api_noop.c + action api_noop.h + action api_validate.c + action api_validate.h + action attrib.c + action attrib.h + action blend.c + action blend.h + action bufferobj.c + action bufferobj.h + action buffers.c + action buffers.h + action clip.c + action clip.h + action colormac.h + action colortab.c + action colortab.h + action config.h + action context.c + action context.h + action convolve.c + action convolve.h + action dd.h + action debug.c + action debug.h + action depth.c + action depth.h + action dispatch.c + action dlist.c + action dlist.h + action drawpix.c + action drawpix.h + action enable.c + action enable.h + action enums.c + action enums.h + action eval.c + action eval.h + action execmem.c + action extensions.c + action extensions.h + action fbobject.c + action fbobject.h + action feedback.c + action feedback.h + action fog.c + action fog.h + action framebuffer.c + action framebuffer.h + action get.c + action get.h + action getstring.c + action glheader.h + action hash.c + action hash.h + action hint.c + action hint.h + action histogram.c + action histogram.h + action image.c + action image.h + action imports.c + action imports.h + action light.c + action light.h + action lines.c + action lines.h + action macros.h + action matrix.c + action matrix.h + action mm.c + action mm.h + action mtypes.h + action occlude.c + action occlude.h + action pixel.c + action pixel.h + action points.c + action points.h + action polygon.c + action polygon.h + action rastpos.c + action rastpos.h + action renderbuffer.c + action renderbuffer.h + action simple_list.h + action state.c + action state.h + action stencil.c + action stencil.h + action texcompress.c + action texcompress.h + action texcompress_fxt1.c + action texcompress_s3tc.c + action texenvprogram.c + action texenvprogram.h + action texformat.c + action texformat.h + action texformat_tmp.h + action teximage.c + action teximage.h + action texobj.c + action texobj.h + action texrender.c + action texrender.h + action texstate.c + action texstate.h + action texstore.c + action texstore.h + action varray.c + action varray.h + action version.h + action vsnprintf.c + action vtxfmt.c + action vtxfmt.h + action vtxfmt_tmp.h +} + +symlink_mesa_math() { + src_dir src/mesa/math + dst_dir mesa/math + + action m_clip_tmp.h + action m_copy_tmp.h + action m_debug.h + action m_debug_clip.c + action m_debug_norm.c + action m_debug_util.h + action m_debug_xform.c + action m_dotprod_tmp.h + action m_eval.c + action m_eval.h + action m_matrix.c + action m_matrix.h + action m_norm_tmp.h + action m_trans_tmp.h + action m_translate.c + action m_translate.h + action m_vector.c + action m_vector.h + action m_xform.c + action m_xform.h + action m_xform_tmp.h + action mathmod.h +} + +symlink_mesa_ac() { + src_dir src/mesa/array_cache + dst_dir mesa/array_cache + + action ac_context.c + action ac_context.h + action ac_import.c + action acache.h +} + +symlink_mesa_swrast() { + src_dir src/mesa/swrast + dst_dir mesa/swrast + + action s_aaline.c + action s_aaline.h + action s_aalinetemp.h + action s_aatriangle.c + action s_aatriangle.h + action s_aatritemp.h + action s_accum.c + action s_accum.h + action s_alpha.c + action s_alpha.h + action s_atifragshader.c + action s_atifragshader.h + action s_bitmap.c + action s_blend.c + action s_blend.h + action s_buffers.c + action s_context.c + action s_context.h + action s_copypix.c + action s_depth.c + action s_depth.h + action s_drawpix.c + action s_drawpix.h + action s_feedback.c + action s_feedback.h + action s_fog.c + action s_fog.h + action s_fragprog_to_c.c + action s_imaging.c + action s_lines.c + action s_lines.h + action s_linetemp.h + action s_logic.c + action s_logic.h + action s_masking.c + action s_masking.h + action s_nvfragprog.c + action s_nvfragprog.h + action s_pixeltex.c + action s_pixeltex.h + action s_points.c + action s_points.h + action s_pointtemp.h + action s_readpix.c + action s_span.c + action s_span.h + action s_spantemp.h + action s_stencil.c + action s_stencil.h + action s_tcc.c + action s_texstore.c + action s_texture.c + action s_texture.h + action s_triangle.c + action s_triangle.h + action s_trispan.h + action s_tritemp.h + action s_zoom.c + action s_zoom.h + action swrast.h +} + +symlink_mesa_ss() { + src_dir src/mesa/swrast_setup + dst_dir mesa/swrast_setup + + action ss_context.c + action ss_context.h + action ss_triangle.c + action ss_triangle.h + action ss_tritmp.h + action ss_vb.h + action swrast_setup.h +} + +symlink_mesa_tnl() { + src_dir src/mesa/tnl + dst_dir mesa/tnl + + action t_array_api.c + action t_array_api.h + action t_array_import.c + action t_array_import.h + action t_context.c + action t_context.h + action t_pipeline.c + action t_pipeline.h + action t_save_api.c + action t_save_api.h + action t_save_loopback.c + action t_save_playback.c + action t_vb_arbprogram.c + action t_vb_arbprogram.h + action t_vb_arbprogram_sse.c + action t_vb_cliptmp.h + action t_vb_cull.c + action t_vb_fog.c + action t_vb_light.c + action t_vb_lighttmp.h + action t_vb_normals.c + action t_vb_points.c + action t_vb_program.c + action t_vb_render.c + action t_vb_rendertmp.h + action t_vb_texgen.c + action t_vb_texmat.c + action t_vb_vertex.c + action t_vertex.c + action t_vertex.h + action t_vertex_generic.c + action t_vertex_sse.c + action t_vp_build.c + action t_vp_build.h + action t_vtx_api.c + action t_vtx_api.h + action t_vtx_eval.c + action t_vtx_exec.c + action t_vtx_generic.c + action t_vtx_x86.c + action tnl.h +} + +symlink_mesa_shader() { + src_dir src/mesa/shader + dst_dir mesa/shader + + action arbfragparse.c + action arbfragparse.h + action arbprogparse.c + action arbprogparse.h + action arbprogram.c + action arbprogram.h + action arbprogram_syn.h + action arbvertparse.c + action arbvertparse.h + action atifragshader.c + action atifragshader.h + action nvfragparse.c + action nvfragparse.h + action nvfragprog.h + action nvprogram.c + action nvprogram.h + action nvvertexec.c + action nvvertexec.h + action nvvertparse.c + action nvvertparse.h + action nvvertprog.h + action program.c + action program.h + action shaderobjects.c + action shaderobjects.h + action shaderobjects_3dlabs.c + action shaderobjects_3dlabs.h +} + +symlink_mesa_shader_grammar() { + src_dir src/mesa/shader/grammar + dst_dir mesa/shader/grammar + + action grammar.c + action grammar.h + action grammar_syn.h + action grammar_mesa.c + action grammar_mesa.h +} + +symlink_mesa_shader_slang() { + src_dir src/mesa/shader/slang + dst_dir mesa/shader/slang + + action slang_assemble_assignment.c + action slang_assemble_assignment.h + action slang_assemble.c + action slang_assemble_conditional.c + action slang_assemble_conditional.h + action slang_assemble_constructor.c + action slang_assemble_constructor.h + action slang_assemble.h + action slang_assemble_typeinfo.c + action slang_assemble_typeinfo.h + action slang_compile.c + action slang_compile.h + action slang_execute.c + action slang_execute.h + action slang_mesa.h + action slang_preprocess.c + action slang_preprocess.h + action slang_storage.c + action slang_storage.h + action slang_utility.c + action slang_utility.h + action traverse_wrap.h +} + +symlink_mesa_shader_slang_library() { + src_dir src/mesa/shader/slang/library + dst_dir mesa/shader/slang/library + + action slang_common_builtin_gc_bin.h + action slang_common_builtin_gc.h + action slang_core_gc_bin.h + action slang_core_gc.h + action slang_fragment_builtin_gc_bin.h + action slang_fragment_builtin_gc.h + action slang_shader_syn.h + action slang_version_syn.h + action slang_vertex_builtin_gc_bin.h + action slang_vertex_builtin_gc.h +} + +symlink_mesa_x() { + src_dir src/mesa/drivers/x11 + dst_dir mesa/X + + # action glxapi.h + action glxheader.h + # action realglx.h + # action xfonts.h + action xm_api.c + action xm_buffer.c + action xm_dd.c + action xm_line.c + action xm_span.c + action xm_tri.c + action xmesaP.h + + # another hack + src_dir src/mesa/drivers/common + dst_dir mesa/X/drivers/common + action driverfuncs.c + action driverfuncs.h +} + +symlink_mesa_ppc() { + src_dir src/mesa/ppc + dst_dir mesa/ppc +} + +symlink_mesa_sparc() { + src_dir src/mesa/sparc + dst_dir mesa/sparc +} + +symlink_mesa_x86() { + src_dir src/mesa/x86 + dst_dir mesa/x86 +} + +symlink_mesa_x8664() { + src_dir src/mesa/x86-64 + dst_dir mesa/x86-64 +} + +symlink_mesa() { + symlink_mesa_main + symlink_mesa_math + symlink_mesa_ac + symlink_mesa_swrast + symlink_mesa_ss + symlink_mesa_tnl + symlink_mesa_shader + symlink_mesa_shader_grammar + symlink_mesa_shader_slang + symlink_mesa_shader_slang_library + symlink_mesa_x + symlink_mesa_glapi + symlink_mesa_ppc + symlink_mesa_sparc + symlink_mesa_x86 + symlink_mesa_x8664 +} + +symlink_glx() { + # this is... unpleasant + src_dir src/glx/x11 + dst_dir glx + + action indirect_size.c + action indirect_size.h + + src_dir src/mesa/drivers/dri/common + + action glcontextmodes.c + action glcontextmodes.h +} + +######### +# +# Helper functions +# +######### + +error() { + echo + echo \ \ \ error:\ \ \ $1 + exit +} + +# printing out what's going on +run_module() { + # $1 module + # $2 explanation + echo -n $EXPLANATION for $1 module ...\ + symlink_$1 + echo DONE +} + +run() { + # $1 what to do + # $2 explanation + + ACTION=$1 EXPLANATION=$2 run_module mesa + ACTION=$1 EXPLANATION=$2 run_module glx +} + +src_dir() { + REAL_SRC_DIR=$SRC_DIR/$1 + if [ ! -d $REAL_SRC_DIR ] ; then + error "Source directory $REAL_SRC_DIR does not exist" + fi +} + +dst_dir() { + REAL_DST_DIR=$DST_DIR/$1 + if [ ! -d $REAL_DST_DIR ] ; then + mkdir -p $REAL_DST_DIR + fi +} + +action() { + if [ -z $2 ] ; then + $ACTION $REAL_SRC_DIR/$1 $REAL_DST_DIR/$1 + else + $ACTION $REAL_SRC_DIR/$1 $REAL_DST_DIR/$2 + fi +} + +usage() { + echo symlink.sh src-dir dst-dir + echo src-dir: the xc directory of the monolithic source tree + echo dst-dir: the modular source tree containing proto, app, lib, ... +} + +# Check commandline args +check_args() { + if [ -z $1 ] ; then + echo Missing source dir + usage + exit 1 + fi + + if [ -z $2 ] ; then + echo Missing destination dir + usage + exit 1 + fi + + if [ ! -d $1 ] ; then + echo $1 is not a dir + usage + exit 1 + fi + + if [ ! -d $2 ] ; then + echo $2 is not a dir + usage + exit 1 + fi + + if [ $1 = $2 ] ; then + echo source and destination can\'t be the same + usage + exit 1 + fi + + D=`dirname "$relpath"` + B=`basename "$relpath"` + abspath="`cd \"$D\" 2>/dev/null && pwd || echo \"$D\"`/$B" + + SRC_DIR=`( cd $1 ; pwd )` + DST_DIR=`(cd $2 ; pwd )` +} + +main $1 $2 diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile deleted file mode 100644 index db2f0d7a55..0000000000 --- a/nx-X11/programs/Xserver/Imakefile +++ /dev/null @@ -1,587 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -/* - * Server Master Makefile - */ - -NULL = - -#include - -/* On most systems the linker requires the libraries in dependency order. - But we have no real order because there are cycles. We fix this by adding - some libraries twice on the commandline. dependLib will add the - dependency library to the commandline if the link order is important */ -#if 1 /* This is currently enabled for all systems */ -#define dependLib(x) x -#else -#define dependLib(x) -#endif - -#if defined(XorgVersion) -/* Do not strip server binaries */ -INSTPGMFLAGS = -#endif - -#define PreFbLibs $(DIX) $(OS) $(XPDDX) -#define BarePostFbLibs $(XPFBLIBS) $(MI) -#define PostFbLibs BarePostFbLibs $(EXTENSIONS) - -#if !BuildXinerama -#define FbPostFbLibs $(FB) BarePostFbLibs $(EXTENSIONS) -#else -#define FbPostFbLibs $(FB) $(EXTENSIONS) BarePostFbLibs $(EXTENSIONS) -#endif - -#define FBLibs PreFbLibs FbPostFbLibs - -#define MiExtLibs $(SHADOW) - -#define AllFBLibs PreFbLibs $(FB) PostFbLibs - -#if BuildGlxExt - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) - GLXDIR = GL - GLXEXT = $(GLXLIB) -#endif - -#if BuildXInputExt - XINPUTEXT = Xi/LibraryTargetName(xinput) - XIDIR = Xi -#endif -#if BuildXKB - XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS)) - XKBDIR = xkb -#if defined(XorgVersion) - XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o -#endif -#endif -#if BuildDBE - DBEEXT = dbe/LibraryTargetName(dbe) -#endif -#if BuildDBE - DBEDIR = dbe -#endif -#if BuildRECORD - RECORDEXT = record/LibraryTargetName(record) -#endif -#if BuildRECORD || BuildRECORDlib - RECORDDIR = record -#endif -#ifdef SiteExtensionLibs - SITEEXTS = SiteExtensionLibs -#endif -#ifdef SiteExtensionDirs - SITEEXTDIRS = SiteExtensionDirs -#endif - LIBREGEX = RegexLibrary - - -#if BuildRender - RENDERDIR = render - RENDERLIB = $(RENDERDIR)/librender.a -#endif -#if BuildRandR - RANDRDIR = randr - RANDRLIB = $(RANDRDIR)/librandr.a -#endif -#if BuildXfixes - FIXESDIR = xfixes - FIXESLIB = $(FIXESDIR)/libxfixes.a -#endif -#if BuildDamage - DAMAGEDIR = damageext - DAMAGELIB = $(DAMAGEDIR)/libdamageext.a -#endif -#if BuildComposite - CWDIR = miext/cw - COMPOSITEDIR = composite - COMPOSITELIB = $(COMPOSITEDIR)/libcomposite.a - CW = miext/cw/LibraryTargetName(cw) -#endif - EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \ - $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB) - OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \ - $(DBEEXT) $(RECORDEXT) $(SITEEXTS) - EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \ - $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \ - $(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \ - $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR) - OS = os/LibraryTargetName(os) - BSDEMUL = $(DEPXBSDLIB) - FB = fb/LibraryTargetName(fb) -#if (!(defined(NXAgentServer) && NXAgentServer)) - DAMAGE = miext/damage/LibraryTargetName(damage) -#endif - SHADOW = miext/shadow/LibraryTargetName(shadow) - LAYER = miext/layer/LibraryTargetName(layer) -#if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) - /* Order of libraries is important when linking in mingw or - * cygwin. libmi.a requires ffs from libdix.a. So it is added - * after libmi.a on the commandline */ - MI = mi/LibraryTargetName(mi) $(DIX) -#else - MI = mi/LibraryTargetName(mi) -#endif - MIINITEXTOBJ = mi/miinitext.o - DIX = dix/LibraryTargetName(dix) -#if UsbMouseSupport -#if !HasLibUsb - USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb) -#else - USB = UsbHidLib -#endif -#endif -#ifdef ServerExtraSysLibs - EXTRASYSLIBS = ServerExtraSysLibs -#endif -#if HasPam && HasPamMisc - PAMLIBS = PamLibraries PamMiscLibraries -#endif - SYSLIBS = $(ZLIB) MathLibrary $(USB) \ - $(PAMLIBS) $(EXTRASYSLIBS) -#if !HasCbrt - CBRT = mi/LibraryTargetName(cbrt) -#endif - STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS) - FBDIR = fb - -XCOMM -XCOMM This turns off the default rule for compiling .c files because -XCOMM this makefile does not really know how to build it. This is really -XCOMM just a hack because of the Sun version of make and nfs. -XCOMM -.c.o: - -.s.o: - -#if HasParallelMake -XCOMM -XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides -XCOMM -#if defined(NXAgentServer) && NXAgentServer -NXAGENT = nxagent -#endif -#if defined(NXWinServer) && NXWinServer -NXWIN = NXWin -#endif -#if (defined(NXAgentServer) && NXAgentServer) || \ - (defined(NXWinServer) && NXWinServer) -MakeMutex($(NXAGENT) $(NXWIN)) -#endif -MakeMutex($(STDDIRS) fb) -#endif - - -#if defined(NXAgentServer) && NXAgentServer -XCOMM -XCOMM Nested server with NXlib-based ddx and compressed transport. -XCOMM -FBSUBDIR = fb -MIDAMAGEDIR = miext/damage -FBDIR = fb -#ifndef Win32Architecture -NXAGENTDDXDIR = hw/nxagent -#else -NXAGENTDDXDIR = hw -#endif - -NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS) - -NX_XCOMP_HEADERS = \ - ../../../nxcomp/include/MD5.h \ - ../../../nxcomp/include/NXalert.h \ - ../../../nxcomp/include/NX.h \ - ../../../nxcomp/include/NXpack.h \ - ../../../nxcomp/include/NXproto.h \ - ../../../nxcomp/include/NXvars.h \ - $(NULL) - -NX_XCOMPSHAD_HEADERS = \ - ../../../nxcompshad/include/Shadow.h \ - $(NULL) - -NX_HEADERS = \ - $(NX_XCOMP_HEADERS) \ - $(NX_XCOMPSHAD_HEADERS) \ - $(NULL) - -BuildIncludes($(NX_HEADERS),nx,..) - -#if defined(SunArchitecture) || \ - defined(SparcArchitecture) -NXAGENTOBJS = hw/nxagent/miinitext.o \ - hw/nxagent/NXwindow.o \ - hw/nxagent/NXevents.o \ - hw/nxagent/NXproperty.o \ - hw/nxagent/NXdixfonts.o \ - hw/nxagent/NXglyphcurs.o \ - hw/nxagent/NXdispatch.o \ - hw/nxagent/NXrender.o \ - hw/nxagent/NXglyph.o \ - hw/nxagent/NXpicture.o \ - hw/nxagent/NXextension.o \ - hw/nxagent/NXglxext.o \ - hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ - $(NULL) -#elif !defined(Win32Architecture) -NXAGENTOBJS = hw/nxagent/miinitext.o \ - hw/nxagent/NXwindow.o \ - hw/nxagent/NXevents.o \ - hw/nxagent/NXproperty.o \ - hw/nxagent/NXdixfonts.o \ - hw/nxagent/NXglyphcurs.o \ - hw/nxagent/NXdispatch.o \ - hw/nxagent/NXrender.o \ - hw/nxagent/NXglyph.o \ - hw/nxagent/NXpicture.o \ - hw/nxagent/NXextension.o \ - hw/nxagent/NXglxext.o \ - hw/nxagent/NXxvdisp.o \ - hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ - $(NULL) -#else -NXAGENTOBJS = hw/nxagent/miinitext.o \ - hw/nxagent/NXwindow.o \ - hw/nxagent/NXevents.o \ - hw/nxagent/NXproperty.o \ - hw/nxagent/NXdixfonts.o \ - hw/nxagent/NXglyphcurs.o \ - hw/nxagent/NXdispatch.o \ - hw/nxagent/NXrender.o \ - hw/nxagent/NXglyph.o \ - hw/nxagent/NXpicture.o \ - hw/nxagent/NXextension.o \ - hw/nxagent/NXglxext.o \ - hw/nxagent/NXxvdisp.o \ - hw/nxagent/NXresource.o \ - hw/nxagent/NXdamage.o \ - dix/main.o \ - $(NULL) -#endif - -XPMLIB = -lXpm -XMLLIB = `pkg-config --libs libxml-2.0` -PIXMANLIB = `pkg-config --libs pixman-1` -ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || printf '%s' '-lz') -PNGLIB = `pkg-config --libs libpng` -JPEGLIB = -ljpeg - -TIRPC_LIB = - -#if HasSecureRPC -#if UseTIRPC -TIRPC_LIB = $$(pkg-config --libs 'libtirpc') -#endif -#endif - -NXAGENT = hw/nxagent/LibraryTargetName(nxagent) -NXCOMPEXT = hw/nxagent/compext/LibraryTargetName(compext) -NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXCOMPEXT) $(NXAGENT) $(MI) -NXAGENTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) $(XMLLIB) $(PIXMANLIB) $(TIRPC_LIB) -NXCOMPEXTSYSLIBS = $(ZLIB) $(PNGLIB) $(JPEGLIB) -#if HasParallelMake -MakeMutex($(NXAGENTDIRS) $(NXCOMPEXT) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS)) -#endif -#if ForceServerRemake -$(NXAGENTOBJS) $(NXAGENTLIBS):: $(NXAGENTDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif -#if NXLibraries -/* - * We need this as the linker will try to locate dependencies of X11 and Xext. - */ - -#if defined(SunArchitecture) -NXAGENTNXLIBS = -L/usr/sfw/lib \ - -L../../../nxcomp/src/.libs \ - -L../../../nxcompshad/src/.libs \ - -L../../lib/src/.libs \ - -lrt \ - -lX11 \ - -lXcomp \ - -lXcompshad \ - -lXrender \ - -lXfixes \ - $(XFONTLIB) \ - -lXcomposite \ - -lXinerama \ - -lXdmcp \ - -lNX_X11 \ - -lXext \ - $(NULL) -#elif defined(cygwinArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ - -L../../../nxcompshad/src/.libs \ - -L../../lib/src/.libs \ - -lX11 \ - -lXcomp \ - -lXcompshad \ - -lXrender \ - -lXfixes \ - $(XFONTLIB) \ - -lXcomposite \ - -lXdmcp \ - -lNX_X11 \ - -lXext \ - $(NULL) -#elif defined(OpenBSDArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ - -L../../../nxcompshad/src/.libs \ - -L../../lib/src/.libs \ - -lkvm \ - -lX11 \ - -lXcomp \ - -lXcompshad \ - -lXrender \ - -lXfixes \ - $(XFONTLIB) \ - -lXcomposite \ - -lXinerama \ - -lXdmcp \ - -lNX_X11 \ - -lXext \ - $(NULL) -#else -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ - -L../../../nxcompshad/src/.libs \ - -L../../lib/src/.libs \ - -lX11 \ - -lXcomp \ - -lXcompshad \ - -lXrender \ - -lXfixes \ - $(XFONTLIB) \ - -lXcomposite \ - -lXinerama \ - -lXdmcp \ - -lNX_X11 \ - -lXext \ - $(NULL) -#endif -#endif - -#ifdef cygwinArchitecture -NX_XSHADOWLIBNAME = cygXcompshad.dll -#else -NX_XSHADOWLIBNAME = libXcompshad.so -#endif - -ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \ - $(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTNXLIBS) $(NXAGENTSYSLIBS) $(NXCOMPEXTSYSLIBS)) - -LibX11Links() - -/* - * Hard coded target to build a static nxagent server. - */ -nxagent_static: nxagent - if [ -f nxagent_static ]; then set -x; \ - $(MV) nxagent_static nxagent_static.bak; \ - else exit 0; fi - $(CCLINK) -o nxagent_static -static $(LDOPTIONS) $(NXAGENTOBJS) \ - $(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS) $(LDLIBS) \ - $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS) $(EXTRA_INSTALL_LOAD_FLAGS) - -/* - * Hard coded target to build a static nxagent server except for libX11 and libXext. - */ -nxagent_static_nolibs: nxagent - if [ -f nxagent_static_nolibs ]; then set -x; \ - $(MV) nxagent__static_nolibs nxagent_static_nolibs.bak; \ - else exit 0; fi - $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ - $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \ - $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_INSTALL_LOAD_FLAGS) -#endif /* NXAgentServer */ - -#if defined(NXWinServer) && NXWinServer -XCOMM -XCOMM X Server for MS Windows -XCOMM -FBSUBDIR = fb -MIDAMAGEDIR = miext/damage -SHADOWDIR = miext/shadow -#if BuildXWinLayer -LAYERDIR = miext/layer -XWINLAYERLIB = $(LAYER) -#else -LAYERDIR = -XWINLAYERLIB = -#endif -#if BuildXWinMultiWindowExtWM -ROOTLESSDIR = miext/rootless -ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \ - $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \ - $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel) -#else -ROOTLESSDIR = -ROOTLESSLIB = -#endif -NXWINDDXDIR = hw/nxwin -#if BuildXWinXF86Config -XWINPARSERDIR = hw/xfree86/parser -XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) -#else -XWINPARSERDIR = -XWINPARSERLIB = -#endif -XWINOPENGLLIB = - -NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin) -NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ - $(DEPDIRS) $(XWINPARSERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) -NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NXWin.res -NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(NXWINLIB) $(XWINLAYERLIB) \ - $(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB) $(OS) -#if BuildXWinMultiWindow || BuildXWinClipboard -XWINX11 = $(XONLYLIB) -# if defined(Win32Architecture) -PTHREADLIB = -lpthreadGC -# endif -#endif -#if defined(Win32Architecture) -XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB) -#else -XWINW32 = -lgdi32 -#endif -NXWINSYSLIBS = $(LDPRELIBS) $(XWINX11) $(SYSLIBS) $(XWINW32) - -NXWINNXLIBS = -L../../../nxcomp -lXcomp - -/* - * These flags cause NXWin.exe to be a Windows executable, which - * prevents NXWin.exe from opening a Command Prompt window when it is - * started. However, the flags also prevent NXWin.exe from outputting - * its status and error message to a Command Prompt; thus, one most - * implement a method to redirect status and error messages to a file - * before enabling these flags. - */ -EXTRA_LDOPTIONS = -e _mainCRTStartup - -#if HasParallelMake -MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS)) -#endif - -#if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif - -#ifdef mingwArchitecture -NXWINSERVERNAME=NXming -#else -NXWINSERVERNAME=NXWin -#endif -ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ - $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)) - -#ifndef ServerToInstall -# define ServerToInstall $(NXWINSERVERNAME) -#endif - -#endif /* NXWinServer */ - -#if 0 -#if defined(NXWinServer) && NXWinServer -XCOMM -XCOMM X Server for MS Windows -XCOMM -FBDIR = fb -SHADOWDIR = miext/shadow -LAYERDIR = miext/layer -NXWINDDXDIR = hw/nxwin -XWINPARSERDIR = hw/xfree86/parser -XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) -NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(nxwin) -NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ - $(DEPDIRS) $(XWINPARSERDIR) -#NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res \ - $(NXWINDDXDIR)/NXwindow.o \ - $(NXWINDDXDIR)/NXdispatch.o $(NXWINDDXDIR)/NXproperty.o \ - $(NXWINDDXDIR)/NXevents.o -NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res -NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(LAYER) $(SHADOW) \ - $(XWINPARSERLIB) -NXWINSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 -lddraw -NXWINNXLIBS = -L../../../nxcomp -lXcomp - -/* - * These flags cause NXWin.exe to be a Windows executable, which - * prevents NXWin.exe from opening a Command Prompt window when it is - * started. However, the flags also prevent NXWin.exe from outputting - * its status and error message to a Command Prompt; thus, one most - * implement a method to redirect status and error messages to a file - * before enabling these flags. - */ -EXTRA_LDOPTIONS = -mwindows -e _mainCRTStartup - -#if HasParallelMake -MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS)) -#endif - -#if ForceServerRemake -$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif - -ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \ - $(NXWINLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(NXWINSYSLIBS) $(NXWINNXLIBS)) - -#ifndef ServerToInstall -#define ServerToInstall NXWin -#endif - -#endif /* NXWinServer */ -#endif - -MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) -IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) -DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \ - $(HPDDXDIR) $(XFREE86DDXDIR) \ - $(NXAGENTDDXDIR) $(NXWINDDXDIR) -SUBDIRS = $(STDDIRS) \ - $(IPLANDIRS) $(ILBMDIR) \ - $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) - -#if defined(ServerToInstall) -install:: - -(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X) -#endif - -#define IHaveSubdirs - -DependSubdirs($(SUBDIRS)) -MakeLintLibSubdirs($(SUBDIRS)) -LintSubdirs($(SUBDIRS)) - -ForceSubdirs($(DEPDIRS) $(SUBDIRS)) - -DEFAULTFONTPATH = DefaultFontPath -EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" diff --git a/nx-X11/programs/Xserver/Makefile.am b/nx-X11/programs/Xserver/Makefile.am new file mode 100644 index 0000000000..00bdd6f274 --- /dev/null +++ b/nx-X11/programs/Xserver/Makefile.am @@ -0,0 +1,63 @@ +AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc + +NULL = + +if COMPOSITE +COMPOSITE_DIR=composite +endif + +if GLX +GLX_DIR=GL +endif + +SUBDIRS = \ + include \ + dix \ + fb \ + mi \ + Xext \ + miext \ + os \ + randr \ + render \ + Xi \ + xkb \ + dbe \ + record \ + xfixes \ + damageext \ + $(COMPOSITE_DIR) \ + $(GLX_DIR) \ + hw \ + $(NULL) + +aclocaldir = $(datadir)/aclocal +aclocal_DATA = xorg-server.m4 + +#pkgconfigdir = $(libdir)/pkgconfig +#pkgconfig_DATA = xorg-server.pc + +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = xorg-server.pc.in xorg-server.m4 + +DIST_SUBDIRS = \ + include \ + dix \ + fb \ + mi \ + Xext \ + miext \ + os \ + randr \ + render \ + Xi \ + xkb \ + dbe \ + record \ + xfixes \ + damageext \ + composite \ + GL \ + hw \ + $(NULL) diff --git a/nx-X11/programs/Xserver/VERSION b/nx-X11/programs/Xserver/VERSION new file mode 120000 index 0000000000..d62dc733ef --- /dev/null +++ b/nx-X11/programs/Xserver/VERSION @@ -0,0 +1 @@ +../../../VERSION \ No newline at end of file diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile deleted file mode 100644 index 8262f667dc..0000000000 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ /dev/null @@ -1,137 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -#include - -#if HasShm && (!(defined(NXAgentServer) && NXAgentServer)) - SHMSRCS = shm.c - SHMOBJS = shm.o -#endif - -#if BuildScreenSaverExt - SCRNSAVSRC = saver.c - SCRNSAVOBJ = saver.o -#endif - -#if BuildXF86BigfontExt -XF86BIGFSRCS = xf86bigfont.c -XF86BIGFOBJS = xf86bigfont.o -#if HasShm - SHM_DEFINES = -DHAS_SHM -#endif -#endif - -#if BuildXvExt && ( (defined(NXAgentServer) && NXAgentServer) && !defined(SunArchitecture) && !defined(cygwinArchitecture) ) - XVSRCS = xvmain.c xvmc.c - XVOBJS = xvmain.o xvmc.o -#elif BuildXvExt - XVSRCS = xvmain.c xvdisp.c xvmc.c - XVOBJS = xvmain.o xvdisp.o xvmc.o -#endif - -#if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o -#endif - -#if BuildXCSecurity - SECURITYSRCS = security.c - SECURITYOBJS = security.o - SERVERCONFIGDIR = ServerConfigDir - POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGDIR)/SecurityPolicy\" -#endif -#if BuildXinerama - PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c - PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o - PNRXINCLUDES = -I../mi -I../render -#endif -#if BuildDPMS - DPMSSRCS = dpms.c - DPMSOBJS = dpms.o -#endif - - SRCS = shape.c $(SHMSRCS) xcmisc.c\ - xtest.c sleepuntil.c \ - bigreq.c sync.c $(SCRNSAVSRC) \ - $(XF86BIGFSRCS) $(SECURITYSRCS) \ - $(PNRXSRCS) $(DPMSSRCS) \ - $(XVSRCS) $(XRESSRCS) $(DMXSRCS) - - OBJS = shape.o $(SHMOBJS) xcmisc.o \ - xtest.o sleepuntil.o \ - bigreq.o sync.o $(SCRNSAVOBJ) \ - $(XF86BIGFOBJS) $(SECURITYOBJS) \ - $(PNRXOBJS) $(DPMSOBJS) \ - $(XVOBJS) $(XRESOBJS) $(DMXOBJS) - - SOBJS = $(SHMOBJS) $(SECURITYOBJS) \ - shape.o xtest.o sleepuntil.o $(PNRXOBJS) \ - $(XF86BIGFOBJS) - -#if defined(NXAgentServer) && NXAgentServer -NX_DEFINES = -DNXAGENT_SERVER -#endif - - -#if defined(XorgVersion) -/* XXX Check if this can be eliminated */ -XF86INCLUDES = -I$(XF86COMSRC) -#endif - INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(PNRXINCLUDES) \ - $(XF86INCLUDES) \ - $(DMXINCLUDES) \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - DEFINES = $(EXT_DEFINES) $(XVMCSHM_DEFINES) $(NX_DEFINES) -#else - DEFINES = $(EXT_DEFINES) $(XVMCSHM_DEFINES) -#endif - -NormalLibraryObjectRule() - -NormalLibraryTarget(ext,$(OBJS)) -LintLibraryTarget(ext,$(SRCS)) -NormalLintTarget($(SRCS)) - -#if BuildXF86BigfontExt -SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES)) -#endif -#if BuildXCSecurity -SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) -#endif - -LinkConfDirectory(xserver,.,xserver,.) - -#if BuildXCSecurity && InstallSecurityConfig -InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -#endif - -DependTarget() - -InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/Xext/Makefile.am b/nx-X11/programs/Xserver/Xext/Makefile.am new file mode 100644 index 0000000000..22ee82564e --- /dev/null +++ b/nx-X11/programs/Xserver/Xext/Makefile.am @@ -0,0 +1,98 @@ +NULL = + +# libXext.la: includes all extensions and should be linked into Xvfb, +# Xnest, Xdmx and Xprt +# libXextbuiltin.la: includes those extensions that are built directly into +# Xorg by default +noinst_LTLIBRARIES = libXext.la libXextbuiltin.la + +AM_CPPFLAGS = + +AM_CFLAGS = $(DIX_CFLAGS) + +sdk_HEADERS = xvdix.h xvmcext.h + +# Sources always included in libXextbuiltin.la & libXext.la +BUILTIN_SRCS = \ + shape.c \ + sleepuntil.c \ + sleepuntil.h \ + xtest.c \ + xf86bigfont.c \ + $(NULL) + +# Sources always included in libXext.la +MODULE_SRCS = \ + bigreq.c \ + shape.c \ + sync.c \ + xcmisc.c \ + dpms.c \ + dpmsproc.h \ + $(NULL) + +# Optional sources included if extension enabled by configure.ac rules + +if NXAGENT + +else +# MIT Shared Memory extension +MITSHM_SRCS = shm.c +if MITSHM +BUILTIN_SRCS += $(MITSHM_SRCS) +endif +endif + +# XVideo extension +if NXAGENT +XV_SRCS = xvmain.c xvmc.c xvdix.h xvmcext.h xvdisp.h +else +XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h +endif +if XV +MODULE_SRCS += $(XV_SRCS) +endif + +# XResource extension: lets clients get data about per-client resource usage +RES_SRCS = xres.c +if RES +MODULE_SRCS += $(RES_SRCS) +endif + +# MIT ScreenSaver extension +SCREENSAVER_SRCS = saver.c +if SCREENSAVER +MODULE_SRCS += $(SCREENSAVER_SRCS) +endif + +# Xinerama extension: making multiple video devices act as one virtual screen +XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c +if XINERAMA +BUILTIN_SRCS += $(XINERAMA_SRCS) +endif + +# Security extension: multi-level security to protect clients from each other +XCSECURITY_SRCS = security.c +if XCSECURITY +BUILTIN_SRCS += $(XCSECURITY_SRCS) + +SERVERCONFIGdir = $(libdir)/xserver +SERVERCONFIG_DATA = SecurityPolicy +AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" +endif + +# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la + +libXext_la_SOURCES = $(BUILTIN_SRCS) $(MODULE_SRCS) + +libXextbuiltin_la_SOURCES = $(BUILTIN_SRCS) + +EXTRA_DIST = \ + SecurityPolicy \ + $(MITSHM_SRCS) \ + $(XV_SRCS) \ + $(RES_SRCS) \ + $(SCREENSAVER_SRCS) \ + $(XCSECURITY_SRCS) \ + $(XINERAMA_SRCS) \ + $(NULL) diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c index be5919328b..2b7a75ac3e 100644 --- a/nx-X11/programs/Xserver/Xext/bigreq.c +++ b/nx-X11/programs/Xserver/Xext/bigreq.c @@ -43,6 +43,8 @@ from The Open Group. static unsigned char XBigReqCode; #endif +void BigReqExtensionInit(void); + static void BigReqResetProc( ExtensionEntry * /* extEntry */ ); diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 3342f77381..f96662e0b9 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -72,6 +72,8 @@ static DISPATCH_PROC(ProcDPMSCapable); static DISPATCH_PROC(SProcDPMSCapable); static void DPMSResetProc(ExtensionEntry* extEntry); +void DPMSExtensionInit(void); + void DPMSExtensionInit(void) { diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 6eab7f36dd..e7e990ce26 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -65,6 +65,8 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen, ScreenPtr pMatchScreen); #endif +extern Bool PanoramiXExtensionDisabledHack; + #if 0 static unsigned char PanoramiXReqCode = 0; #endif @@ -97,6 +99,8 @@ _X_EXPORT unsigned long XRT_COLORMAP; * Function prototypes */ +void PanoramiXExtensionInit(int argc, char *argv[]); + static int panoramiXGeneration; static int ProcPanoramiXDispatch(ClientPtr client); @@ -1003,7 +1007,6 @@ ProcXineramaIsActive(ClientPtr client) { /* The following hack fools clients into thinking that Xinerama * is disabled even though it is not. */ - extern Bool PanoramiXExtensionDisabledHack; rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack; } #else diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 65c43f6b4d..72a9624516 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -79,6 +79,8 @@ static DISPATCH_PROC(SProcScreenSaverSetAttributes); static DISPATCH_PROC(SProcScreenSaverUnsetAttributes); static DISPATCH_PROC(SProcScreenSaverSuspend); +void ScreenSaverExtensionInit(void); + static Bool ScreenSaverHandle ( ScreenPtr /* pScreen */, int /* xstate */, diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 2a7d5628f4..e2fc1d2a69 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -135,8 +135,12 @@ int (*SwappedUntrustedProcVector[256])( ClientPtr /*client*/ ); +void SecurityExtensionInit(void); + #ifdef NXAGENT_SERVER +char *_NXGetPolicyFilePath(const char *path); + /* * This function returns the SecurityPolicy * file full path. This path is referred by diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 48a3e952d1..e6e4d2ee01 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -61,6 +61,8 @@ typedef RegionPtr (*CreateDftPtr)( WindowPtr /* pWin */ ); +void ShapeExtensionInit(void); + static int ShapeFreeClient( void * /* data */, XID /* id */ diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index 8e99b10473..4775ad2ffe 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -50,8 +50,7 @@ in this Software without prior written authorization from The Open Group. #include "gcstruct.h" #include "extnsionst.h" #include "servermd.h" -#define _XSHM_SERVER_ -#include +#include "shmint.h" #include #include "protocol-versions.h" diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 00f30e4846..e355a9890f 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -93,6 +93,8 @@ static SyncCounter **SysCounterList = NULL; #define XSyncCAAllTrigger \ (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType) +void SyncExtensionInit(void); + static int FreeAlarm( void * /* addr */, diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index 1b8b9ad375..841303304b 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -45,6 +45,8 @@ from The Open Group. static unsigned char XCMiscCode; #endif +void XCMiscExtensionInit(void); + static void XCMiscResetProc( ExtensionEntry * /* extEntry */ ); diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index 977ea4ce6d..ca2b77b60c 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -22,6 +22,8 @@ #include "protocol-versions.h" +void ResExtensionInit(void); + static int ProcXResQueryVersion (ClientPtr client) { diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index b05d31ba56..50f73824e7 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -64,6 +64,8 @@ extern int DeviceValuator; #include "panoramiXsrv.h" #endif +void XTestExtensionInit(void); + static void XTestResetProc( ExtensionEntry * /* extEntry */ ); diff --git a/nx-X11/programs/Xserver/Xi/Imakefile b/nx-X11/programs/Xserver/Xi/Imakefile deleted file mode 100644 index 746e57eaa7..0000000000 --- a/nx-X11/programs/Xserver/Xi/Imakefile +++ /dev/null @@ -1,93 +0,0 @@ -#include - - SRCS = allowev.c \ - chgkbd.c \ - chgdctl.c \ - chgfctl.c \ - chgkmap.c \ - chgprop.c \ - chgptr.c \ - closedev.c \ - devbell.c \ - exevents.c \ - extinit.c \ - getdctl.c \ - getfctl.c \ - getfocus.c \ - getbmap.c \ - getkmap.c \ - getmmap.c \ - getprop.c \ - getselev.c \ - getvers.c \ - gtmotion.c \ - grabdev.c \ - grabdevb.c \ - grabdevk.c \ - listdev.c \ - opendev.c \ - queryst.c \ - selectev.c \ - sendexev.c \ - setdval.c \ - setfocus.c \ - setmode.c \ - setbmap.c \ - setmmap.c \ - stubs.c \ - ungrdev.c \ - ungrdevb.c \ - ungrdevk.c - - OBJS = allowev.o \ - chgkbd.o \ - chgdctl.o \ - chgfctl.o \ - chgkmap.o \ - chgprop.o \ - chgptr.o \ - closedev.o \ - devbell.o \ - exevents.o \ - extinit.o \ - getdctl.o \ - getfctl.o \ - getfocus.o \ - getbmap.o \ - getkmap.o \ - getmmap.o \ - getprop.o \ - getselev.o \ - getvers.o \ - gtmotion.o \ - grabdev.o \ - grabdevb.o \ - grabdevk.o \ - listdev.o \ - opendev.o \ - queryst.o \ - selectev.o \ - sendexev.o \ - setdval.o \ - setfocus.o \ - setmode.o \ - setbmap.o \ - setmmap.o \ - ungrdev.o \ - ungrdevb.o \ - ungrdevk.o - INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = $(NX_DEFINES) - -NormalLibraryTarget(xinput,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(xinput,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/Xi/Makefile.am b/nx-X11/programs/Xserver/Xi/Makefile.am new file mode 100644 index 0000000000..fbe438543c --- /dev/null +++ b/nx-X11/programs/Xserver/Xi/Makefile.am @@ -0,0 +1,80 @@ +noinst_LTLIBRARIES = libXi.la + +AM_CFLAGS = $(DIX_CFLAGS) + +libXi_la_SOURCES = \ + allowev.c \ + allowev.h \ + chgdctl.c \ + chgdctl.h \ + chgfctl.c \ + chgfctl.h \ + chgkbd.c \ + chgkbd.h \ + chgkmap.c \ + chgkmap.h \ + chgprop.c \ + chgprop.h \ + chgptr.c \ + chgptr.h \ + closedev.c \ + closedev.h \ + devbell.c \ + devbell.h \ + exevents.c \ + exglobals.h \ + extinit.c \ + getbmap.c \ + getbmap.h \ + getdctl.c \ + getdctl.h \ + getfctl.c \ + getfctl.h \ + getfocus.c \ + getfocus.h \ + getkmap.c \ + getkmap.h \ + getmmap.c \ + getmmap.h \ + getprop.c \ + getprop.h \ + getselev.c \ + getselev.h \ + getvers.c \ + getvers.h \ + grabdev.c \ + grabdev.h \ + grabdevb.c \ + grabdevb.h \ + grabdevk.c \ + grabdevk.h \ + gtmotion.c \ + gtmotion.h \ + listdev.c \ + listdev.h \ + opendev.c \ + opendev.h \ + queryst.c \ + queryst.h \ + selectev.c \ + selectev.h \ + sendexev.c \ + sendexev.h \ + setbmap.c \ + setbmap.h \ + setdval.c \ + setdval.h \ + setfocus.c \ + setfocus.h \ + setmmap.c \ + setmmap.h \ + setmode.c \ + setmode.h \ + ungrdev.c \ + ungrdev.h \ + ungrdevb.c \ + ungrdevb.h \ + ungrdevk.c \ + ungrdevk.h + +EXTRA_DIST = stubs.c diff --git a/nx-X11/programs/Xserver/autogen.sh b/nx-X11/programs/Xserver/autogen.sh new file mode 100755 index 0000000000..83326498f0 --- /dev/null +++ b/nx-X11/programs/Xserver/autogen.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +if [ "x$NOCONFIGURE" != "x1" ]; then + if [ -n "${CONFIGURE}" ]; then + $srcdir/${CONFIGURE} + else + $srcdir/configure --enable-maintainer-mode "$@" + fi +fi diff --git a/nx-X11/programs/Xserver/composite/Imakefile b/nx-X11/programs/Xserver/composite/Imakefile deleted file mode 100644 index cf44ded4aa..0000000000 --- a/nx-X11/programs/Xserver/composite/Imakefile +++ /dev/null @@ -1,29 +0,0 @@ -#include - - NULL = - - SRCS = compalloc.c compext.c compinit.c compoverlay.c compwindow.c - - OBJS = compalloc.o compext.o compinit.o compoverlay.o compwindow.o - - INCLUDES = -I../include -I../mi -I../Xext -I../render -I../xfixes \ - -I../damageext -I../miext/damage -I$(EXTINCSRC) \ - -I$(XINCLUDESRC) \ - `pkg-config --cflags-only-I pixman-1` - - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryTarget(composite,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(composite,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/composite/Makefile.am b/nx-X11/programs/Xserver/composite/Makefile.am new file mode 100644 index 0000000000..d7bead137e --- /dev/null +++ b/nx-X11/programs/Xserver/composite/Makefile.am @@ -0,0 +1,11 @@ +noinst_LTLIBRARIES = libcomposite.la + +AM_CFLAGS = $(DIX_CFLAGS) + +libcomposite_la_SOURCES = \ + compalloc.c \ + compext.c \ + compint.h \ + compinit.c \ + compoverlay.c \ + compwindow.c diff --git a/nx-X11/programs/Xserver/composite/compext.c b/nx-X11/programs/Xserver/composite/compext.c index 8513c6d739..5302e97cec 100644 --- a/nx-X11/programs/Xserver/composite/compext.c +++ b/nx-X11/programs/Xserver/composite/compext.c @@ -59,6 +59,8 @@ typedef struct _CompositeClient { (pClient)->devPrivates[CompositeClientPrivIndex].ptr) #endif /* !edefined(NXAGENT_SERVER) */ +void CompositeExtensionInit (void); + static void CompositeClientCallback (CallbackListPtr *list, void *closure, diff --git a/nx-X11/programs/Xserver/configure.ac b/nx-X11/programs/Xserver/configure.ac new file mode 100644 index 0000000000..08bdcbf75c --- /dev/null +++ b/nx-X11/programs/Xserver/configure.ac @@ -0,0 +1,1501 @@ +dnl $Id: configure.ac,v 1.148 2005/12/21 02:30:08 kem Exp $ +dnl +dnl Copyright © 2003-2005 Keith Packard, Daniel Stone +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation, and that the names of Keith Packard and Daniel Stone not be +dnl used in advertising or publicity pertaining to distribution of the software +dnl without specific, written prior permission. Keith Packard and Daniel Stone +dnl make no representations about the suitability of this software for any +dnl purpose. It is provided "as is" without express or implied warranty. +dnl +dnl KEITH PACKARD AND DANIEL STONE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +dnl SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +dnl IN NO EVENT SHALL KEITH PACKARD OR DANIEL STONE BE LIABLE FOR ANY SPECIAL, +dnl INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +dnl LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +dnl OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +dnl PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Process this file with autoconf to create configure. + +AC_PREREQ(2.69) +dnl This is the not the Xorg version number, it's the server version number. +dnl Yes, that's weird. + +AC_INIT([nxagent], [m4_esyscmd_s([cat VERSION])], [https://github.com/ArcticaProject/nx-libs/issues], nxagent) + +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_MACRO_DIRS([m4]) +AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AM_MAINTAINER_MODE + +dnl this gets generated by autoheader, and thus contains all the defines. we +dnl don't ever actually use it, internally. +AC_CONFIG_HEADERS(include/do-not-use-config.h) +dnl xorg-server.h is an external header, designed to be included by loadable +dnl drivers. +AC_CONFIG_HEADERS(include/xorg-server.h) +dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just +dnl dix/). +AC_CONFIG_HEADERS(include/dix-config.h) +dnl xorg-config.h covers the Xorg DDX. +AC_CONFIG_HEADERS(include/xorg-config.h) +dnl xkb-config.h covers XKB for the Xorg and Xnest and nxagent DDXs. +AC_CONFIG_HEADERS(include/xkb-config.h) + +# dnl Set default flags if not present. +if test -z $CFLAGS; then + CFLAGS="-O0 -g3" +fi + +if test -z $CPPFLAGS; then + CPPFLAGS="-O0 -g3" +fi + +if test -z $CXXFLAGS; then + CXXFLAGS="-O0 -g3" +fi + +AC_PROG_CC +AM_PROG_AS +AC_PROG_INSTALL +AC_PROG_LN_S +AC_LIBTOOL_WIN32_DLL +AC_DISABLE_STATIC +AC_PROG_LIBTOOL +AC_PROG_MAKE_SET +PKG_PROG_PKG_CONFIG +AC_PROG_LEX +AC_PROG_YACC +XORG_PROG_RAWCPP + +CFLAGS="$CFLAGS -DNXAGENT_SERVER" +CPPFLAGS="$CPPFLAGS -DNXAGENT_SERVER -DNX_VERSION_CURRENT_STRING='\"$(cat VERSION)\"'" +CXXFLAGS="$CXXFLAGS -DNXAGENT_SERVER" + +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"]) + +AC_CHECK_SIZEOF([unsigned long]) +if test "$ac_cv_sizeof_unsigned_long" = 8; then + AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.]) + XSERVER64_CFLAGS="-D_XSERVER64" +else + XSERVER64_CFLAGS="" +fi + +AC_TYPE_PID_T + +dnl Checks for library functions. +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \ + strtol getopt getopt_long vsnprintf walkcontext backtrace]) +AC_FUNC_ALLOCA +dnl Old HAS_* names used in os/*.c. +AC_CHECK_FUNC([getdtablesize], + AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the `getdtablesize' function.])) +AC_CHECK_FUNC([getifaddrs], + AC_DEFINE(HAS_GETIFADDRS, 1, [Have the `getifaddrs' function.])) +AC_CHECK_FUNC([getpeereid], + AC_DEFINE(HAS_GETPEEREID, 1, [Have the `getpeereid' function.])) +AC_CHECK_FUNC([getpeerucred], + AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the `getpeerucred' function.])) +AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no) +AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno]) + +AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno]) + +dnl Find the math libary +AC_CHECK_LIB(m, sqrt) + +AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h]) + +dnl AGPGART headers +AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h], AGP=yes) +AM_CONDITIONAL(AGP, [test "x$AGP" = xyes]) + +dnl APM header +AC_CHECK_HEADERS([linux/apm_bios.h]) + +dnl fbdev header +AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes) +AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes]) + +dnl MTRR header +AC_CHECK_HEADERS([asm/mtrr.h]) + +dnl BSD MTRR header +AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes) +if test "x$ac_cv_memrange_h" = xyes; then + AC_DEFINE(HAS_MTRR_SUPPORT, 1, [Define to 1 if BSD MTRR support is + available]) +fi + +dnl A NetBSD MTRR header +AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_mtrr_h=yes) +if test "x$ac_cv_mtrr_h" = xyes; then + AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR + support is available]) +fi + +dnl FreeBSD kldload support (sys/linker.h) +AC_CACHE_CHECK([for sys/linker.h], + ac_cv_sys_linker_h, + [AC_TRY_RUN([ +#include +#include +], + [ac_cv_sys_linker_h=yes], + [ac_cv_sys_linker_h=no])]) +AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes]) + +AC_CACHE_CHECK([for SYSV IPC], + ac_cv_sysv_ipc, + [AC_TRY_LINK([ +#include +int main () { + int id; + id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); + if (id < 0) return -1; + return shmctl(id, IPC_RMID, 0); +}], + [ac_cv_sysv_ipc=yes], + [ac_cv_sysv_ipc=no])]) +if test "x$ac_cv_sysv_ipc" = xyes; then + AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available]) +fi + +dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c) +AC_CHECK_HEADER([execinfo.h],[ + AC_CHECK_LIB(c, backtrace, [ + AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support]) + ])] +) + +dnl --------------------------------------------------------------------------- +dnl Bus options and CPU capabilities. Replaces logic in +dnl hw/xfree86/os-support/bus/Makefile.am, among others. +dnl --------------------------------------------------------------------------- +DEFAULT_INT10="x86emu" +use_x86_asm="no" +build_xf8_32wid="yes" + +dnl Override defaults as needed for specific platforms: + +case $host_cpu in + alpha*) + ALPHA_VIDEO=yes + case $host_os in + *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;; + esac + ;; + arm*) + ARM_VIDEO=yes + ;; + i*86) + use_x86_asm="yes" + I386_VIDEO=yes + case $host_os in + *linux*) DEFAULT_INT10=vm86 ;; + *freebsd*) AC_DEFINE(USE_DEV_IO) ;; + *netbsd*) AC_DEFINE(USE_I386_IOPL) ;; + *openbsd*) AC_DEFINE(USE_I386_IOPL) ;; + esac + ;; + powerpc*) + PPC_VIDEO=yes + case $host_os in + *freebsd*) DEFAULT_INT10=stub ;; + esac + ;; + sparc*) + build_xf8_32wid="yes" # used by sunffb driver + xorg_loader_sparcmuldiv="yes" + SPARC64_VIDEO=yes + BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" + ;; + x86_64*|amd64*) + use_x86_asm="yes" + I386_VIDEO=yes + case $host_os in + *freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; + *netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) ;; + *openbsd*) AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl]) ;; + esac + ;; +esac + +AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes]) + +dnl BSD *_video.c selection +AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) +AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) +AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes]) +AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes]) +AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes]) + +DRI=no +dnl it would be nice to autodetect these *CONS_SUPPORTs +case $host_os in + *freebsd*) + AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) + AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) + AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) + AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console]) + DRI=yes + ;; + *netbsd*) + AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) + AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) + AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) + DRI=yes + ;; + *openbsd*) + AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) + AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) + AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) + ;; + *linux*) + DRI=yes + ;; +esac + +OSNAME=`uname -srm` +AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", + [Define to OS Name string to display for build OS in Xorg log]) + +DEFAULT_VENDOR_NAME="The X.Org Foundation" +DEFAULT_VENDOR_NAME_SHORT="X.Org" +DEFAULT_VERSION_MAJOR=7 +DEFAULT_VERSION_MINOR=0 +DEFAULT_VERSION_PATCH=0 +DEFAULT_VERSION_SNAP=0 +DEFAULT_VENDOR_WEB="http://github.com/ArcticaProject/nx-libs" + +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +dnl Build options. +AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], + [Treat warnings as errors (default: disabled)]), + [WERROR=$enableval], [WERROR=no]) +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], + [Enable debugging (default: disabled)]), + [DEBUGGING=$enableval], [DEBUGGING=no]) +AC_ARG_WITH(int10, AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]), + [INT10="$withval"], + [INT10="$DEFAULT_INT10"]) +AC_ARG_WITH(vendor-name, AS_HELP_STRING([--with-vendor-string=VENDOR], + [Vendor string reported by the server]), + [ VENDOR_STRING="$withval" ], + [ VENDOR_STRING="$DEFAULT_VENDOR_NAME" ]) +AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-string-short=VENDOR], + [Short version of vendor string reported by the server]), + [ VENDOR_STRING_SHORT="$withval" ], + [ VENDOR_STRING_SHORT="$DEFAULT_VENDOR_NAME_SHORT" ]) +AC_ARG_WITH(release-major, AS_HELP_STRING([--with-release-major=MAJOR], + [Release major number reported by the server]), + [ VERSION_MAJOR="$withval" ], + [ VERSION_MAJOR="$DEFAULT_VERSION_MAJOR" ]) +AC_ARG_WITH(release-minor, AS_HELP_STRING([--with-release-minor=MINOR], + [Release minor number reported by the server]), + [ VERSION_MINOR="$withval" ], + [ VERSION_MINOR="$DEFAULT_VERSION_MINOR" ]) +AC_ARG_WITH(release-patch, AS_HELP_STRING([--with-release-patch=PATCH], + [Release patch number reported by the server]), + [ VERSION_PATCH="$withval" ], + [ VERSION_PATCH="$DEFAULT_VERSION_PATCH" ]) +AC_ARG_WITH(release-snap, AS_HELP_STRING([--with-release-snap=SNAP], + [Release snap number reported by the server]), + [ VERSION_SNAP="$withval" ], + [ VERSION_SNAP="$DEFAULT_VERSION_SNAP" ]) +AC_ARG_WITH(release-date, AS_HELP_STRING([--with-release-date=DATE], + [Release date reported by the server]), + [ RELEASE_DATE="$withval" ], + [ RELEASE_DATE="$DEFAULT_RELEASE_DATE" ]) +AC_ARG_WITH(vendor-web, AS_HELP_STRING([--with-vendor-web=URL], + [Vendor web address reported by the server]), + [ VENDOR_WEB="$withval" ], + [ VENDOR_WEB="$DEFAULT_VENDOR_WEB" ]) +AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR], + [Directory where log files are kept (default: $localstatedir/log)]), + [ logdir="$withval" ], + [ logdir="$localstatedir/log" ]) +AC_ARG_WITH(builder-addr, AS_HELP_STRING([--with-builder-addr=ADDRESS], + [Builder address (default: devs@lists.arctica-project.org)]), + [ BUILDERADDR="$withval" ], + [ BUILDERADDR="devs@lists.arctica-project.org" ]) +AC_ARG_WITH(os-name, AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: UNKNOWN)]), + [ OSNAME="$withval" ], + [ OSNAME="UNKNOWN" ]) +AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]), + [ OSVENDOR="$withval" ], + [ OSVENDOR="" ]) +AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree (default: `pwd`/../../extras/Mesa/)]), + [ MESA_SOURCE="$withval" ], + [ MESA_SOURCE="`pwd`/../../extras/Mesa/" ]) +AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), + [ FONTDIR="$withval" ], + [ FONTDIR="${libdir}/X11/fonts" ]) +DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" +AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) +AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datarootdir}/X11/xkb)]), + [ XKBPATH="$withval" ], + [ XKBPATH="${datarootdir}/X11/xkb" ]) +AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datarootdir}/X11/xkb/compiled)]), + [ XKBOUTPUT="$withval" ], + [ XKBOUTPUT="compiled" ]) +AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datarootdir}/X11/rgb)]), + [ RGBPATH="$withval" ], + [ RGBPATH="${datarootdir}/X11/rgb" ]) +AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]), + [BUILDDOCS=$enableval], + [BUILDDOCS=no]) +AC_ARG_ENABLE(install-libxf86config, + AS_HELP_STRING([--enable-install-libxf86config], + [Install libxf86config (default: disabled)]), + [INSTALL_LIBXF86CONFIG=$enableval], + [INSTALL_LIBXF86CONFIG=no]) + +dnl Extensions. +AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) +AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) +AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) +AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) +AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) +AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--enable-xvmc], [Build XvMC extension (default: disabled)]), [XVMC=$enableval], [XVMC=no]) +AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: enabled)]), [DGA=$enableval], [DGA=yes]) +AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes]) +AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto]) +AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto]) +AC_ARG_ENABLE(glx, AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes]) +AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes]) +AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--enable-xf86vidmode], [Build XF86VidMode extension (default: disabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=no]) +AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--enable-xf86misc], [Build XF86Misc extension (default: disabled)]), [XF86MISC=$enableval], [XF86MISC=no]) +AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes]) +AC_ARG_ENABLE(fontcache, AS_HELP_STRING([--enable-fontcache], [Build FontCache extension (default: disabled)]), [FONTCACHE=$enableval], [FONTCACHE=no]) +AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) + +dnl DDXes. +AC_ARG_ENABLE(nxagent, AS_HELP_STRING([--disable-nxagent], [Build nxagent server (default: enabled)]), [NXAGENT=$enableval], [NXAGENT=yes]) + +dnl chown/chmod to be setuid root as part of build +dnl Replaces InstallXserverSetUID in imake +AC_ARG_ENABLE(install-setuid, + AS_HELP_STRING([--enable-install-setuid], + [Install Xorg server as owned by root with setuid bit (default: disabled)]), + [SETUID=$enableval], [SETUID=no]) +AC_MSG_CHECKING([to see if we can install the Xorg server as root]) +if test "x$SETUID" = "xauto" ; then + case $host_os in + darwin*) SETUID="no" ;; + *) + case $host_cpu in + sparc) SETUID="no" ;; + *) SETUID="yes" ;; + esac + esac + if test "x$SETUID" = xyes; then + touch testfile + chown root testfile > /dev/null 2>&1 || SETUID="no" + rm -f testfile + fi +fi +AC_MSG_RESULT([$SETUID]) +AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"]) + +dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro +dnl was not expanded, since libX11 with no transport types is rather useless. +dnl +dnl If you're seeing an error here, be sure you installed the lib/xtrans module +dnl first and if it's not in the default location, that you set the ACLOCAL +dnl environment variable to find it, such as: +dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" +m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) + +dnl if there's libtirpc available, prefer that over the system +dnl implementation. +PKG_CHECK_MODULES([TIRPC], [libtirpc], [ + CFLAGS="$CFLAGS $TIRPC_CFLAGS" + LIBS="$LIBS $TIRPC_LIBS" +], [:;]) + +# Transport selection macro from xtrans.m4 +XTRANS_CONNECTION_FLAGS + +# Secure RPC detection macro from xtrans.m4 +XTRANS_SECURE_RPC_FLAGS + +AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86]) +AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu]) +AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub]) +if test "x$INT10" = xyes; then + dnl VM86 headers + AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) +fi + +dnl Handle building documentation +AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes) + +dnl Only build sgml docs when linuxdoc is available and +dnl def.ents has been installed +XORG_CHECK_LINUXDOC + +dnl Handle installing libxf86config +AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes]) + +dnl --------------------------------------------------------------------------- +dnl Extension section +dnl --------------------------------------------------------------------------- +XEXT_INC='-I$(top_srcdir)/Xext' +XEXT_LIB='$(top_builddir)/Xext/libXext.la' +XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + +REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xproto xtrans xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontsproto inputproto xf86dgaproto xineramaproto" +REQUIRED_MODULES_XF86MISC="xf86miscproto" + +dnl if there's pixman-1 available +dnl implementation. +PKG_CHECK_MODULES([pixman], [pixman-1 >= 0.27.2], [ + CFLAGS="$CFLAGS $(pkg-config --cflags pixman-1)" + LIBS="$LIBS $(pkg-config --libs pixman-1)"], [ + AC_MSG_ERROR([pixman explicitly requested, but required + modules not found.])]) + +dnl if there's xfont available +dnl implementation. +PKG_CHECK_MODULES([xfont2], [xfont2 >= 2.0.0], [ + CFLAGS="$CFLAGS $(pkg-config --cflags xfont2)" + LIBS="$LIBS $(pkg-config --libs xfont2)" + AC_DEFINE(HAS_XFONT2, 1, [Use Xfont2])], [ + AC_MSG_ERROR([xfont2 explicitly requested, but required + modules not found.])]) + +dnl if there's xfont available +dnl implementation. +PKG_CHECK_MODULES(XML, libxml-2.0, [ + CFLAGS="$CFLAGS $(pkg-config --cflags libxml-2.0)" + LIBS="$LIBS $(pkg-config --libs libxml-2.0)"], [ + AC_MSG_ERROR([libxml-2.0 explicitly requested, but required + modules not found.])]) + +dnl if there's libjpeg headers +PKG_CHECK_MODULES(LIBJPEG, libjpeg, [ + CFLAGS="$CFLAGS $(pkg-config --cflags libjpeg)" + LIBS="$LIBS $(pkg-config --libs libjpeg)"], [ + AC_MSG_ERROR([libjpeg explicitly requested, but required + modules not found.])]) + +dnl if there's libpng headers +PKG_CHECK_MODULES(LIBPNG, libpng, [ + CFLAGS="$CFLAGS $(pkg-config --cflags libpng)" + LIBS="$LIBS $(pkg-config --libs libpng)"], [ + AC_MSG_ERROR([libpng explicitly requested, but required + modules not found.])]) + +dnl if there's zlib headers +PKG_CHECK_MODULES(ZLIB, zlib, [ + CFLAGS="$CFLAGS $(pkg-config --cflags zlib)" + LIBS="$LIBS $(pkg-config --libs zlib)"], [ + AC_MSG_ERROR([zlib explicitly requested, but required + modules not found.])]) + +dnl if there's xcomposite headers +PKG_CHECK_MODULES(XCOMPOSITE, xcomposite, [ + LIBS="$LIBS $(pkg-config --libs xcomposite)"], [ + AC_MSG_ERROR([xcomposite explicitly requested, but required + modules not found.])]) + +dnl if there's xtst headers +PKG_CHECK_MODULES(XTST, xtst, [ + LIBS="$LIBS $(pkg-config --libs xtst)"], [ + AC_MSG_ERROR([xtst explicitly requested, but required + modules not found.])]) + +dnl if there's xdamage headers +PKG_CHECK_MODULES(XDAMAGE, xdamage, [ + LIBS="$LIBS $(pkg-config --libs xdamage)"], [ + AC_MSG_ERROR([xdamage explicitly requested, but required + modules not found.])]) + +dnl if there's xpm headers +PKG_CHECK_MODULES(XPM, xpm, [ + LIBS="$LIBS $(pkg-config --libs xpm)"], [ + AC_MSG_ERROR([xpm explicitly requested, but required + modules not found.])]) + +dnl if there's xinerama headers +PKG_CHECK_MODULES(XINERAMA, xinerama, [ + LIBS="$LIBS $(pkg-config --libs xinerama)"], [ + AC_MSG_ERROR([xinerama explicitly requested, but required + modules not found.])]) + +dnl if there's xrandr headers +PKG_CHECK_MODULES(XRANDR, xrandr, [ + LIBS="$LIBS $(pkg-config --libs xrandr)"], [ + AC_MSG_ERROR([xrandr explicitly requested, but required + modules not found.])]) + +dnl if there's xext headers +PKG_CHECK_MODULES(XEXT, xext, [ + LIBS="$LIBS $(pkg-config --libs xext)"], [ + AC_MSG_ERROR([xext explicitly requested, but required + modules not found.])]) + +dnl if there's xdmcp headers +PKG_CHECK_MODULES(XDMCP, xdmcp, [ + LIBS="$LIBS $(pkg-config --libs xdmcp)"], [ + AC_MSG_ERROR([xdmcp explicitly requested, but required + modules not found.])]) + +dnl if there's xrender headers +PKG_CHECK_MODULES(XRENDER, xrender, [ + LIBS="$LIBS $(pkg-config --libs xrender)"], [ + AC_MSG_ERROR([xrender explicitly requested, but required + modules not found.])]) + +REQUIRED_LIBS="$REQUIRED_LIBS xau fontenc nx-x11" + +AM_CONDITIONAL(XF86MISC, [test "x$XF86MISC" = xyes]) +if test "x$XF86MISC" = xyes; then + REQUIRED_MODULES="$REQUIRED_MODULES $REQUIRED_MODULES_XF86MISC" +fi + +AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +if test "x$XV" = xyes; then + AC_DEFINE(XV, 1, [Support Xv extension]) + AC_DEFINE(XvExtension, 1, [Build Xv extension]) + REQUIRED_MODULES="$REQUIRED_MODULES videoproto" + AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes]) + if test "x$XVMC" = xyes; then + AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) + fi +fi + +AM_CONDITIONAL(DGA, [test "x$DGA" = xyes]) +if test "x$DGA" = xyes; then + AC_DEFINE(DGA, 1, [Support DGA extension]) +fi + +AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes]) +if test "x$COMPOSITE" = xyes; then + AC_DEFINE(COMPOSITE, 1, [Support Composite Extension]) + REQUIRED_MODULES="$REQUIRED_MODULES compositeproto" + COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' + COMPOSITE_INC='-I$(top_srcdir)/composite' +fi + +AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes]) +if test "x$MITSHM" = xyes; then + AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension]) + AC_DEFINE(HAS_SHM, 1, [Support SHM]) +fi + +AM_CONDITIONAL(XTRAP, [test "x$XTRAP" = xyes]) +if test "x$XTRAP" = xyes; then + AC_DEFINE(XTRAP, 1, [Support XTrap extension]) + REQUIRED_MODULES="$REQUIRED_MODULES trapproto" + XTRAP_LIB='$(top_builddir)/XTrap/libxtrap.la' +fi + +AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes]) +if test "x$RECORD" = xyes; then + AC_DEFINE(XRECORD, 1, [Support Record extension]) + REQUIRED_MODULES="$REQUIRED_MODULES recordproto" + RECORD_LIB='$(top_builddir)/record/librecord.la' +fi + +AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes]) +if test "x$SCREENSAVER" = xyes; then + AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension]) +fi + +AM_CONDITIONAL(RES, [test "x$RES" = xyes]) +if test "x$RES" = xyes; then + AC_DEFINE(RES, 1, [Support X resource extension]) + REQUIRED_MODULES="$REQUIRED_MODULES resourceproto" +fi + +if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then + PKG_CHECK_MODULES([XLIB], [x11]) + AC_SUBST(XLIB_CFLAGS) + AC_DEFINE(GLXEXT, 1, [Build GLX extension]) + GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' + test -d GL || mkdir GL + $srcdir/GL/symlink-mesa.sh $MESA_SOURCE GL/ +else + GLX=no +fi +AM_CONDITIONAL(GLX, test "x$GLX" = xyes) +AC_SUBST([MESA_SOURCE]) + +AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes]) +if test "x$XINERAMA" = xyes; then + AC_DEFINE(XINERAMA, 1, [Support Xinerama extension]) + AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama]) + REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto" +fi + +AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes]) +if test "x$XCSECURITY" = xyes; then + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) +fi + +AM_CONDITIONAL(DBE, [test "x$DBE" = xyes]) +if test "x$DBE" = xyes; then + AC_DEFINE(DBE, 1, [Support DBE extension]) + DBE_LIB='$(top_builddir)/dbe/libdbe.la' +fi + +if test "x$XF86VIDMODE" = xyes; then + AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension]) +fi + +if test "x$XF86MISC" = xyes; then + AC_DEFINE(XF86MISC, 1, [Support XFree86 miscellaneous extensions]) +fi + +AC_DEFINE(RENDER, 1, [Support RENDER extension]) +RENDER_LIB='$(top_builddir)/render/librender.la' +RENDER_INC='-I$(top_srcdir)/render' + +AC_DEFINE(RANDR, 1, [Support RANDR extension]) +RANDR_LIB='$(top_builddir)/randr/librandr.la' +RANDR_INC='-I$(top_srcdir)/randr' + +AC_DEFINE(XFIXES,1,[Support XFixes extension]) +FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' +FIXES_INC='-I$(top_srcdir)/xfixes' + +AC_DEFINE(DAMAGE,1,[Support Damage extension]) +DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' +DAMAGE_INC='-I$(top_srcdir)/damageext' +MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' +dnl damage (may) need the composite wrapper when composite is enabled +if test "$COMPOSITE" = yes; then + MIEXT_DAMAGE_LIB="$MIEXT_DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la' +fi +MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' + +AC_DEFINE(XINPUT, 1, [Support X Input extension]) +XI_LIB='$(top_builddir)/Xi/libXi.la' +XI_INC='-I$(top_srcdir)/Xi' + +AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +AC_DEFINE(XKB, 1, [Build XKB]) +AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +XKB_LIB='$(top_builddir)/xkb/libxkb.la' +XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' + + +PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"]) +if test "x$have_libxdmcp" = xyes; then + AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS]) +fi +if test "x$XDMCP" = xauto; then + if test "x$have_libxdmcp" = xyes; then + XDMCP=yes + else + XDMCP=no + fi +fi +if test "x$XDMAUTH" = xauto; then + if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then + XDMAUTH=yes + else + XDMAUTH=no + fi +fi + +AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes]) +if test "x$XDMCP" = xyes; then + AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol]) + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" + XDMCP_MODULES="xdmcp" +fi + +AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes]) +if test "x$XDMAUTH" = xyes; then + AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1]) + if ! test "x$XDMCP" = xyes; then + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" + XDMCP_MODULES="xdmcp" + fi +fi + +AM_CONDITIONAL(USE_RGB_BUILTIN, [test "x$USE_RGB_BUILTIN" = xyes]) +if test "x$USE_RGB_BUILTIN" = xyes; then + AC_DEFINE(USE_RGB_BUILTIN, 1, [Use built-in RGB color database]) +fi + +VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)" + +if test $VERSION_SNAP = "0"; then + if test $VERSION_PATCH = "0"; then + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}" + else + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" + fi +else + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SNAP}" +fi + +VENDOR_RELEASE_STRING="Release ${VENDOR_VERSION_STRING}" +VENDOR_MAN_VERSION="Version ${VENDOR_VERSION_STRING}" + +AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) +AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path]) +AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name]) +AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name]) +AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release]) +AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) +AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) +AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name]) +AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor]) +AC_SUBST([VENDOR_STRING]) +AC_SUBST([VENDOR_STRING_SHORT]) +AC_SUBST([VENDOR_RELEASE]) +AC_SUBST([VENDOR_MAN_VERSION]) + +AC_DEFINE(DDXOSINIT, 1, [Use OsVendorInit]) +AC_DEFINE(SERVER_LOCK, 1, [Use a lock to prevent multiple servers on a display]) +AC_DEFINE(DDXTIME, 1, [Use GetTimeInMillis]) +AC_DEFINE(DDXOSFATALERROR, 1, [Use OsVendorFatalError]) +AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF]) +AC_DEFINE(SMART_SCHEDULE, 1, [Include time-based scheduler]) +AM_CONDITIONAL(DEBUG, test "x$DEBUGGING" = xyes) + +if ! test "x$DEBUGGING" = xyes; then + AC_DEFINE(NDEBUG, 1, [Disable some debugging code]) +fi + +AC_DEFINE(USE_RGB_TXT, 1, [Use rgb.txt directly]) +AC_DEFINE(MITMISC, 1, [Support MIT Misc extension]) +AC_DEFINE(XTEST, 1, [Support XTest extension]) +AC_DEFINE(XSYNC, 1, [Support XSync extension]) +AC_DEFINE(XCMISC, 1, [Support XCMisc extension]) +AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) +AC_DEFINE(PIXPRIV, 1, [Support pixmap privates]) + +dnl Checks if setitimer function is available +AC_CHECK_FUNC(setitimer, AC_DEFINE(HAVE_SETITIMER, 1, [Check setitimer availability])) + +DIX_LIB='$(top_builddir)/dix/libdix.la' +OS_LIB='$(top_builddir)/os/libos.la' +MI_LIB='$(top_builddir)/mi/libmi.la' +MINIMI_LIB='$(top_builddir)/mi/libminimi.la' +MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' +MI_INC='-I$(top_srcdir)/mi' +FB_LIB='$(top_builddir)/fb/libfb.la' +FB_INC='-I$(top_srcdir)/fb' +#MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' +#MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' +#MIEXT_LAYER_LIB='$(top_builddir)/miext/layer/liblayer.la' +XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la' +CORE_INCS='-I$(top_srcdir)/../../exports/include -I$(top_srcdir)/include -I$(top_builddir)/include' + +PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) +PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) + +XSERVER_CFLAGS="-I`pwd`/../../exports/include -I`pwd`/../../exports/include/nx-X11 -I`pwd`/../../exports/include/nx-X11/extensions -I`pwd`/miext/cw -I`pwd`/../../extras/Mesa/include" +XSERVER_LIBS="-lm -lz" +AC_SUBST([XSERVER_LIBS]) + + +dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so +dnl we need to replicate that here until those can all be fixed +AC_MSG_CHECKING([if SVR4 needs to be defined]) +AC_EGREP_CPP([I_AM_SVR4],[ +#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) + I_AM_SVR4 +#endif +],[ +AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4]) +AC_MSG_RESULT([yes])], AC_MSG_RESULT([no])) + +XSERVER_CFLAGS="$XSERVER_CFLAGS $XSERVER64_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $LBX_INC" +AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order]) + +dnl --------------------------------------------------------------------------- +dnl DDX section. +dnl --------------------------------------------------------------------------- + +dnl DMX DDX + +AC_MSG_CHECKING([whether to build Xdmx DDX]) +PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no]) +if test "x$DMX" = xauto; then + DMX="$have_dmx" +fi +AC_MSG_RESULT([$DMX]) +AM_CONDITIONAL(DMX, [test "x$DMX" = xyes]) + +if test "x$DMX" = xyes; then + if test "x$have_dmx" = xno; then + AC_MSG_ERROR([Xdmx build explicitly requested, but required + modules not found.]) + fi + DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB" + AC_SUBST([XDMX_LIBS]) + +dnl USB sources in DMX require + AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes", + DMX_BUILD_USB="no") +dnl Linux sources in DMX require + AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes", + DMX_BUILD_LNX="no") + if test "x$GLX" = xyes; then + PKG_CHECK_MODULES([GL], [glproto]) + fi + PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) + AC_SUBST(XDMXCONFIG_DEP_CFLAGS) + AC_SUBST(XDMXCONFIG_DEP_LIBS) + PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11]) + AC_SUBST(DMXEXAMPLES_DEP_LIBS) + PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11]) + AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS) + PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11]) + AC_SUBST(DMXXIEXAMPLES_DEP_LIBS) + PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11]) + AC_SUBST(XTSTEXAMPLES_DEP_LIBS) + PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11]) + AC_SUBST(XRESEXAMPLES_DEP_LIBS) + PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11]) + AC_SUBST(X11EXAMPLES_DEP_LIBS) +fi +AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes]) +AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes]) + + +dnl Xvfb DDX + +AC_MSG_CHECKING([whether to build Xvfb DDX]) +AC_MSG_RESULT([$XVFB]) +AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) + +if test "x$XVFB" = xyes; then + XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + AC_SUBST([XVFB_LIBS]) +fi + + +dnl Xnest DDX + +AC_MSG_CHECKING([whether to build Xnest DDX]) +PKG_CHECK_MODULES(XNESTMODULES, [xfont xext x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no]) +if test "x$XNEST" = xauto; then + XNEST="$have_xnest" +fi +AC_MSG_RESULT([$XNEST]) +AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) + +if test "x$XNEST" = xyes; then + XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + AC_SUBST([XNEST_LIBS]) +fi + + +dnl nxagent DDX + +dnl only check if "yes" or "auto" +if test "x$NXAGENT" != xno; then + PKG_CHECK_MODULES(NXAGENTMODULES, [nxcomp nxcompshad xfont2 xext nx-x11 xau xpm xcomposite xrender $XDMCP_MODULES], [have_nxagent=yes], [have_nxagent=no]) + # print result only when it fails (cover strange behaviour of the macro) + if test "x$have_nxagent" != xyes; then + AC_MSG_RESULT([$have_nxagent]) + fi +fi +# if the user explicitely requests nxagent then fail if it cannot be built +if test "x$NXAGENT" = xyes; then + if test "x$have_nxagent" != xyes; then + AC_MSG_FAILURE([nxagent cannot be built because required modules not found.]) + fi +fi + +if test "x$NXAGENT" = xauto; then + NXAGENT="$have_nxagent" +fi +AC_MSG_CHECKING([whether to build nxagent DDX]) +AC_MSG_RESULT([$NXAGENT]) +AM_CONDITIONAL(NXAGENT, [test "x$NXAGENT" = xyes]) + +if test "x$NXAGENT" = xyes; then + NXAGENT_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + AC_SUBST([NXAGENT_LIBS]) + AC_DEFINE(NXAGENT_SERVER, 1, [Include nxagent server specific stuff at several places]) + AC_DEFINE(NX_TRANS_SOCKET, 1, [Include NX transport protocol]) + AC_DEFINE(NX_TRANS_EXIT, 1, [?]) + # the following are referenced in os subdir + AC_DEFINE(NX_TRANS_AUTH, 1, [?]) + AC_DEFINE(NX_TRANS_SLEEP, 1, [?]) + AC_DEFINE(NX_TRANS_FOPEN, 1, [?]) + AC_DEFINE(NX_TRANS_WAKEUP, 1000, [?]) +# AC_DEFINE(NX_TRANS_WARN, 1, []) +# AC_DEFINE(NX_TRANS_INFO, 1, [?]) +# AC_DEFINE(NX_TRANS_TEST, 1, [?]) +# AC_DEFINE(NX_TRANS_DEBUG, 1, [?]) +fi + +dnl Xorg DDX + +dnl as we do not have --enable-xorg the variable needs to be +dnl set manually +XORG=auto + +AC_MSG_CHECKING([whether to build Xorg DDX]) +if test "x$XORG" = xauto; then + XORG="yes" + case $host_os in + cygwin*) XORG="no" ;; + darwin*) XORG="no" ;; + esac +fi +AC_MSG_RESULT([$XORG]) + +# XORG_CORE_LIBS is needed even if you're not building the Xorg DDX +XORG_CORE_LIBS="$DIX_LIB" +AC_SUBST([XORG_CORE_LIBS]) + +xorg_bus_linuxpci=no +xorg_bus_freebsdpci=no +xorg_bus_netbsdpci=no +xorg_bus_ix86pci=no +xorg_bus_ppcpci=no +xorg_bus_sparcpci=no +xorg_bus_sparc=no + +if test "x$XORG" = xyes; then + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' + XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" + XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" + XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + + AC_CHECK_LIB([dl], [dlopen], [XORG_LIBS="$XORG_LIBS -ldl"]) + + case $host_os in + linux*) + XORG_OS="linux" + XORG_OS_SUBDIR="linux" + XORG_OS_KBD="Lnx" + xorg_bus_linuxpci="yes" + case $host_cpu in + ia64*) + linux_ia64=yes + ;; + alpha*) + linux_alpha=yes + XORG_OS_PCI="axp" + xorg_bus_linuxpci="no" + ;; + *) + ;; + esac + ;; + freebsd*) + XORG_OS="freebsd" + XORG_OS_SUBDIR="bsd" + XORG_OS_KBD="BSD" + case $host_cpu in + i*86) + ;; + *) + xorg_bus_freebsdpci="yes" + ;; + esac + ;; + netbsd*) + XORG_OS="netbsd" + XORG_OS_SUBDIR="bsd" + XORG_OS_KBD="BSD" + case $host_cpu in + i*86|amd64*|x86_64*|ia64*) + ;; + *) + xorg_bus_netbsdpci="yes" + ;; + esac + ;; + openbsd*) + XORG_OS="openbsd" + XORG_OS_SUBDIR="bsd" + XORG_OS_KBD="BSD" + case $host_cpu in + i*86|amd64*|x86_64*|ia64*) + ;; + *) + xorg_bus_freebsdpci="yes" + ;; + esac + ;; + solaris*) + XORG_OS="solaris" + XORG_OS_SUBDIR="solaris" + # This really should be tests for specific features, but the #ifdef's + # were done as a simple version check in XFree86 4.x and haven't been + # fixed yet + AC_MSG_CHECKING([Solaris version]) + OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e s'/\..*$//'` + if test "${OS_MINOR}" -ge 7 ; then + AC_MSG_RESULT(Solaris ${OS_MINOR}) + else + AC_MSG_RESULT(Solaris `echo ${host_os}|sed -e 's/^.*solaris//`) + fi + if test "${OS_MINOR}" -ge 8 ; then + AC_DEFINE(__SOL8__,1,[Solaris 8 or later]) + fi + AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) + if test "x$SUNCC" = "xyes"; then + solaris_asm_inline="yes" + fi + AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"]) + + case $host_cpu in + sparc*) + SOLARIS_INOUT_ARCH="sparcv8plus" + ;; + i*86) + if test x$SOLARIS_64 = xyes ; then + SOLARIS_INOUT_ARCH="amd64" + else + SOLARIS_INOUT_ARCH="ia32" + fi + if test "${OS_MINOR}" -lt 8 ; then + solaris_usl_console="yes" + fi + ;; + *) + AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \ + are supported on Solaris in this release. If you are \ + interested in porting Xorg to your platform, please email \ + xorg@lists.freedesktop.org.]) ;; + esac + AC_SUBST([SOLARIS_INOUT_ARCH]) + if test x$solaris_asm_inline = xyes ; then + XORG_CFLAGS="${XORG_CFLAGS} "'$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-${SOLARIS_INOUT_ARCH}.il' + fi + ;; + *) + XORG_OS="unknown" + XORG_OS_SUBDIR="unknown" + AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, \ + Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \ + Xorg to your platform, please email xorg@lists.freedesktop.org.]) + ;; + esac + + case $host_cpu in + i*86) + xorg_bus_ix86pci=yes + ;; + powerpc*) + case $host_os in + linux*|freebsd*|netbsd*|openbsd*) + ;; + *) + xorg_bus_ppcpci="yes" + ;; + esac + ;; + sparc*) + xorg_bus_sparcpci="yes" + xorg_bus_sparc="yes" + ;; + x86_64*|amd64*) + case $host_os in + freebsd*) + # FreeBSD uses the system pci interface + ;; + *) + xorg_bus_ix86pci="yes" + ;; + esac + ;; + esac + + if test "x$XORG_OS_PCI" = x ; then + XORG_OS_PCI=$XORG_OS + fi + AC_SUBST([XORG_LIBS]) + AC_SUBST([XORG_INCS]) + AC_SUBST([XORG_OS]) + AC_SUBST([XORG_OS_SUBDIR]) + AC_SUBST([XORG_OS_KBD]) + + dnl only used in hw/xfree86/scanpci, TTBOMK + AC_PATH_PROG(PERL, perl, no) + dnl unlikely as this may be ... + if test "x$PERL" = xno; then + AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.]) + fi + AC_SUBST(PERL) + + # The Xorg binary needs to export symbols so that they can be used from modules + # Some platforms require extra flags to do this. gcc should set these flags + # when -rdynamic is passed to it, other compilers/linkers may need to be added + # here. + if test "x$GCC" = "xyes"; then + GCC_WARNINGS1="-Wall -Wpointer-arith -Wstrict-prototypes" + GCC_WARNINGS2="-Wmissing-prototypes -Wmissing-declarations" + GCC_WARNINGS3="-Wnested-externs -fno-strict-aliasing" + GCC_WARNINGS="$GCC_WARNINGS1 $GCC_WARNINGS2 $GCC_WARNINGS3" + if test "x$WERROR" = "xyes"; then + GCC_WARNINGS="${GCC_WARNINGS} -Werror" + fi + XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS" + LD_EXPORT_SYMBOLS_FLAG="-rdynamic" + fi + AC_SUBST([XORG_CFLAGS]) + AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) + + dnl these only go in xorg-config.h + XF86CONFIGFILE="xorg.conf" + CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" + LOGPREFIX="$logdir/Xorg." + AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) + AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) + # XXX HACK! if anyone cares about elfloader in 7.0 you need to + # XXX do something smarter here. + AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader]) + AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader]) + AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) + AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)]) + AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)]) + AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file]) + AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) + AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) + AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location]) + AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) + + driverdir="$moduledir/drivers" + AC_SUBST([moduledir]) + AC_SUBST([driverdir]) + extdir="$includedir/X11/extensions" + AC_SUBST([extdir]) + AC_SUBST([logdir]) +fi +# we need those two or the include files cannot be installed +# if --disable-xorg is provided +sdkdir="$includedir/xorg" +AC_SUBST([sdkdir]) + +AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) +AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes]) +AM_CONDITIONAL([XORG_BUS_FREEBSDPCI], [test "x$xorg_bus_freebsdpci" = xyes]) +AM_CONDITIONAL([XORG_BUS_NETBSDPCI], [test "x$xorg_bus_netbsdpci" = xyes]) +AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes]) +AM_CONDITIONAL([XORG_BUS_PPCPCI], [test "x$xorg_bus_ppcpci" = xyes]) +AM_CONDITIONAL([XORG_BUS_SPARCPCI], [test "x$xorg_bus_sparcpci" = xyes]) +AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) +AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes]) +AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes]) +AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) +AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes]) +AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes]) +AM_CONDITIONAL(MFB, [test "x$XORG" = xyes]) +AM_CONDITIONAL(CFB, [test "x$XORG" = xyes]) +AM_CONDITIONAL(AFB, [test "x$XORG" = xyes]) + +dnl Xprint DDX + +AC_MSG_CHECKING([whether to build Xprint DDX]) +AC_MSG_RESULT([$XPRINT]) + +if test "x$XPRINT" = xyes; then + PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau]) + XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS" + XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $OS_LIB" + AC_SUBST([XPRINT_CFLAGS]) + AC_SUBST([XPRINT_LIBS]) + + xpconfigdir=$libdir/X11/xserver + AC_SUBST([xpconfigdir]) + + AC_PATH_PROG(MKFONTSCALE, mkfontscale) + AC_PATH_PROG(MKFONTDIR, mkfontdir) +fi + + +dnl XWin DDX + +AC_MSG_CHECKING([whether to build XWin DDX]) +if test "x$XWIN" = xauto; then + case $host_os in + cygwin*) XWIN="yes" ;; + mingw*) XWIN="yes" ;; + *) XWIN="no" ;; + esac + XWIN_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB" + AC_SUBST([XWIN_LIBS]) +fi +AC_MSG_RESULT([$XWIN]) + +if test "x$XWIN" = xyes; then + XWIN_SERVER_NAME=XWin + case $host_os in + cygwin*) + PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) + AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages]) + AC_DEFINE(ROOTLESS,1,[Build Rootless code]) + CFLAGS="$CFLAGS -DFD_SETSIZE=256" + ;; + mingw*) + PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) + XWIN_SERVER_NAME=Xming + AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location]) + AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets]) + XWIN_SYSTEM_LIBS=-lwinsock2 + ;; + esac + AC_SUBST(XWIN_SERVER_NAME) + AC_SUBST(XWIN_SYSTEM_LIBS) + + if test "x$DEBUGGING" = xyes; then + AC_DEFINE(CYGDEBUG, 1, [Simple debug messages]) + AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling]) + AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager]) + fi + + AC_DEFINE(DDXOSINIT, 1, [Use OsVendorInit]) + AC_DEFINE(DDXTIME, 1, [Use GetTimeInMillis]) + AC_DEFINE(DDXOSFATALERROR, 1, [Use OsVendorFatalError]) + AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF]) + AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ]) + if test "x$XF86VIDMODE" = xyes; then + AC_MSG_NOTICE([Disabling XF86VidMode extension]) + XF86VIDMODE=no + fi + if test "x$XF86MISC" = xyes; then + AC_MSG_NOTICE([Disabling XF86Misc extension]) + XF86MISC=no + fi + if test "x$COMPOSITE" = xyes; then + AC_MSG_NOTICE([Disabling Composite extension]) + COMPOSITE=no + fi +fi +AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes]) +AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes]) +AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && false]) +AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes]) +AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false]) +AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes && false]) +AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes && false]) +AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes]) +AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes]) + + +dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest and nxagent servers) +AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) +AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) +AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir]) + +# Make sure XKM_OUTPUT_DIR is an absolute path + +XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` + +if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then + XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" +fi + +# XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed +# XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused + +XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` +XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` + +AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir]) + +AC_SUBST(XKB_COMPILED_DIR) + +dnl and the rest of these are generic, so they're in config.h +AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) +AC_DEFINE(XF86BIGFONT, 1, [Build XFree86 BigFont extension]) +AC_DEFINE(XResExtension, 1, [Build XRes extension]) +AC_DEFINE(DPMSExtension, 1, [Build DPMS extension]) + +AC_TRY_COMPILE([ +#include +#ifndef __GLIBC__ +#error not glibc +#endif +], [], [AC_DEFINE(_GNU_SOURCE, 1, + [ Enable GNU and other extensions to the C environment for glibc])]) + +AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + +dnl xorgconfig CLI configuration utility +PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) +AC_SUBST(XORGCONFIG_DEP_CFLAGS) +AC_SUBST(XORGCONFIG_DEP_LIBS) + +dnl xorgcfg GUI configuration utility +AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], + [Build xorgcfg GUI configuration utility (default: no)]), + [XORGCFG=$enableval],[XORGCFG=no]) +if test x$XORGCFG = xyes ; then + PKG_CHECK_MODULES([XORGCFG_DEP], + [xkbui xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11]) + AC_CHECK_LIB([curses],[waddstr], + [XORGCFG_DEP_LIBS="$XORGCFG_DEP_LIBS -lcurses"; CURSES=yes], + AC_CHECK_LIB([ncurses],[waddstr], + [XORGCFG_DEP_LIBS="$XORGCFG_DEP_LIBS -lncurses" ; CURSES=yes], + [CURSES=no])) + AC_SUBST(XORGCFG_DEP_CFLAGS) + AC_SUBST(XORGCFG_DEP_LIBS) + + APPDEFAULTDIR=$(pkg-config --variable=appdefaultdir xt) + AC_SUBST(APPDEFAULTDIR) +fi +AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes]) +AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes]) + +AC_ARG_ENABLE(kbd-mode, AS_HELP_STRING([--enable-kbd-mode], + [Build kbd_mode utility (default: disabled)]), + [BUILD_KBD_MODE=$enable_val], [BUILD_KBD_MODE="no"]) +if test x$BUILD_KBD_MODE != xno ; then + case $host_os in + *bsd*) + KBD_MODE_TYPE="bsd" +# BUILD_KBD_MODE="yes" # need to test on BSD before enabling + # by default + ;; + solaris*) + KBD_MODE_TYPE="sun" + BUILD_KBD_MODE="yes" # enabled by default + ;; + *) + BUILD_KBD_MODE="no" # disabled by default + ;; + esac +fi +AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes]) +AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) +AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) + +CFLAGS="$XSERVER_CFLAGS $CFLAGS" +AC_SUBST([CFLAGS]) + +BUILD_DATE="$(date +'%Y%m%d')" +AC_SUBST([BUILD_DATE]) + +DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" +AC_SUBST([DIX_CFLAGS]) + +AC_SUBST([libdir]) +AC_SUBST([exec_prefix]) +AC_SUBST([prefix]) + +# Man page sections - used in config utils & generating man pages +XORG_MANPAGE_SECTIONS + +# XORG in this case refers to the roll-up releases, not the Xorg DDX. +XORG_RELEASE_VERSION + +AC_CONFIG_FILES([ +Makefile +GL/Makefile +GL/glx/Makefile +GL/include/Makefile +GL/include/GL/Makefile +GL/mesa/Makefile +GL/mesa/array_cache/Makefile +GL/mesa/glapi/Makefile +GL/mesa/main/Makefile +GL/mesa/math/Makefile +GL/mesa/shader/Makefile +GL/mesa/shader/grammar/Makefile +GL/mesa/shader/slang/Makefile +GL/mesa/swrast/Makefile +GL/mesa/swrast_setup/Makefile +GL/mesa/tnl/Makefile +GL/mesa/X/Makefile +include/Makefile +composite/Makefile +damageext/Makefile +dbe/Makefile +dix/Makefile +fb/Makefile +record/Makefile +mi/Makefile +miext/Makefile +miext/damage/Makefile +miext/cw/Makefile +os/Makefile +randr/Makefile +render/Makefile +xkb/Makefile +Xext/Makefile +Xi/Makefile +xfixes/Makefile +hw/Makefile +hw/nxagent/Makefile +]) + +dnl Resume configure status +AC_MSG_NOTICE(resume:) +ACX_FEATURE([enable],[werror],$WERROR) +ACX_FEATURE([enable],[debug],$DEBUGGING) +ACX_FEATURE([with],[int10],$INT10) +ACX_FEATURE([with],[vendor-string],$VENDOR_STRING) +ACX_FEATURE([with],[vendor-string-short],$VENDOR_STRING_SHORT) +ACX_FEATURE([with],[release-major],$VERSION_MAJOR) +ACX_FEATURE([with],[release-minor],$VERSION_MINOR) +ACX_FEATURE([with],[release-patch],$VERSION_PATCH) +ACX_FEATURE([with],[release-snap],$VERSION_SNAP) +ACX_FEATURE([with],[release-date],$RELEASE_DATE) +ACX_FEATURE([with],[vendor-web],$VENDOR_WEB) +ACX_FEATURE([with],[log-dir],$logdir) +ACX_FEATURE([with],[builder-addr],$BUILDERADDR) +ACX_FEATURE([with],[os-name],$OSNAME) +ACX_FEATURE([with],[os-vendor],$OSVENDOR) +ACX_FEATURE([with],[mesa-source],$MESA_SOURCE) +ACX_FEATURE([with],[fontdir],$FONTDIR) +ACX_FEATURE([with],[default-font-path],$FONTPATH) +ACX_FEATURE([with],[xkb-path],$XKBPATH) +ACX_FEATURE([with],[xkb-output],$XKBOUTPUT) +ACX_FEATURE([with],[rgb-path],$RGBPATH) +ACX_FEATURE([enable],[builddocs],$BUILDDOCS) +ACX_FEATURE([enable],[install-libxf86config],$INSTALL_LIBXF86CONFIG) +ACX_FEATURE([enable],[composite],$COMPOSITE) +ACX_FEATURE([enable],[shm],$MITSHM) +ACX_FEATURE([enable],[xres],$RES) +ACX_FEATURE([enable],[record],$RECORD) +ACX_FEATURE([enable],[xv],$XV) +ACX_FEATURE([enable],[xvmc],$XVMC) +ACX_FEATURE([enable],[dga],$DGA) +ACX_FEATURE([enable],[screensaver],$SCREENSAVER) +ACX_FEATURE([enable],[xdmcp],$XDMCP) +ACX_FEATURE([enable],[xdm-auth-1],$XDMAUTH) +ACX_FEATURE([enable],[glx],$GLX) +ACX_FEATURE([enable],[xinerama],$XINERAMA) +ACX_FEATURE([enable],[xf86vidmode],$XF86VIDMODE) +ACX_FEATURE([enable],[xf86misc],$XF86MISC) +ACX_FEATURE([enable],[xcsecurity],$XCSECURITY) +ACX_FEATURE([enable],[fontcache],$FONTCACHE) +ACX_FEATURE([enable],[dbe],$DBE) +ACX_FEATURE([enable],[nxagent],$NXAGENT) +ACX_FEATURE([enable],[install-setuid],$SETUID) +ACX_FEATURE([enable],[xorgcfg],$XORGCFG) +ACX_FEATURE([enable],[kbd-mode],$BUILD_KBD_MODE) + +AC_OUTPUT diff --git a/nx-X11/programs/Xserver/cpprules.in b/nx-X11/programs/Xserver/cpprules.in new file mode 100644 index 0000000000..667b133221 --- /dev/null +++ b/nx-X11/programs/Xserver/cpprules.in @@ -0,0 +1,45 @@ +# -*- Makefile -*- +# Rules for generating files using the C pre-processor +# (Replaces CppFileTarget from Imake) + +SED = sed + +SUFFIXES = .pre .man .man.pre + +# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM +# to cpp, because that trick does not work on all ANSI C preprocessors. +# Delete line numbers from the cpp output (-P is not portable, I guess). +# Allow XCOMM to be preceded by whitespace and provide a means of generating +# output lines with trailing backslashes. +# Allow XHASH to always be substituted, even in cases where XCOMM isn't. + +CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ + -e '/^\#line *[0-9][0-9]* *.*$$/d' \ + -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ + -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ + -e '/^[ ]*XHASH/s/XHASH/\#/' \ + -e '/\@\@$$/s/\@\@$$/\\/' + +# Strings to replace in man pages +XORGRELSTRING = @PACKAGE_STRING@ + XORGMANNAME = X Version 11 + XSERVERNAME = Xorg + +MANDEFS = \ + -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ + -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ + -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ + -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ + -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ + -D__projectroot__=$(prefix) \ + -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \ + -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) + +.pre: + $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + +.man.pre.man: + $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/nx-X11/programs/Xserver/damageext/Imakefile b/nx-X11/programs/Xserver/damageext/Imakefile deleted file mode 100644 index b80853f6a4..0000000000 --- a/nx-X11/programs/Xserver/damageext/Imakefile +++ /dev/null @@ -1,28 +0,0 @@ -#include - - NULL = - - SRCS = damageext.c - - OBJS = damageext.o - - INCLUDES = -I../include -I../Xext -I../render -I../xfixes -I../miext/damage \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - `pkg-config --cflags-only-I pixman-1` - - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryTarget(damageext,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(damageext,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/damageext/Makefile.am b/nx-X11/programs/Xserver/damageext/Makefile.am new file mode 100644 index 0000000000..35f7620fba --- /dev/null +++ b/nx-X11/programs/Xserver/damageext/Makefile.am @@ -0,0 +1,8 @@ +noinst_LTLIBRARIES = libdamageext.la + +AM_CFLAGS = $(DIX_CFLAGS) + +libdamageext_la_SOURCES = \ + damageext.c \ + damageext.h \ + damageextint.h diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile deleted file mode 100644 index 3c4f401741..0000000000 --- a/nx-X11/programs/Xserver/dbe/Imakefile +++ /dev/null @@ -1,26 +0,0 @@ -#include - - - SRCS = dbe.c midbe.c - OBJS = dbe.o midbe.o - INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryObjectRule() - -NormalLibraryTarget(dbe,$(OBJS)) - -LintLibraryTarget(dbe,$(SRCS)) -NormalLintTarget($(SRCS)) - - -DependTarget() - diff --git a/nx-X11/programs/Xserver/dbe/Makefile.am b/nx-X11/programs/Xserver/dbe/Makefile.am new file mode 100644 index 0000000000..97f1f35c7a --- /dev/null +++ b/nx-X11/programs/Xserver/dbe/Makefile.am @@ -0,0 +1,13 @@ +noinst_LTLIBRARIES = libdbe.la + +AM_CFLAGS = $(DIX_CFLAGS) + +AM_CPPFLAGS = + +sdk_HEADERS = dbestruct.h + +libdbe_la_SOURCES = \ + dbe.c \ + midbe.c \ + midbe.h \ + midbestr.h diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile deleted file mode 100644 index ccdae3b821..0000000000 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ /dev/null @@ -1,143 +0,0 @@ -NULL = - -#include - -XPSRC = xpstubs.c -XPOBJ = xpstubs.o - -#if !HasFfs -FFS_SRC = ffs.c -FFS_OBJ = ffs.o -#endif - -#if (!(defined(NXAgentServer) && NXAgentServer)) -NXAGENT_SKIP_SRCS = \ - dispatch.c \ - dixfonts.c \ - events.c \ - extension.c \ - glyphcurs.c \ - property.c \ - resource.c \ - window.c \ - $(NULL) -NXAGENT_SKIP_OBJS = \ - dispatch.o \ - dixfonts.o \ - events.o \ - extension.o \ - glyphcurs.o \ - property.o \ - resource.o \ - window.o \ - $(NULL) -#endif - - -SRCS = \ - atom.c \ - colormap.c \ - cursor.c \ - devices.c \ - dixutils.c \ - gc.c \ - globals.c \ - grabs.c \ - main.c \ - region.c \ - swaprep.c \ - swapreq.c \ - tables.c \ - initatoms.c \ - privates.c \ - pixmap.c \ - $(NXAGENT_SKIP_SRCS) \ - $(FFS_SRC) \ - $(NULL) - -OBJS = \ - atom.o \ - colormap.o \ - cursor.o \ - devices.o \ - dixutils.o \ - gc.o \ - globals.o \ - grabs.o \ - main.o \ - region.o \ - swaprep.o \ - swapreq.o \ - tables.o \ - initatoms.o \ - privates.o \ - pixmap.o \ - $(NXAGENT_SKIP_OBJS) \ - $(FFS_OBJ) \ - $(NULL) - - INCLUDES = -I../include \ - -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext \ - -I$(SERVERSRC)/lbx \ - `pkg-config --cflags-only-I pixman-1` \ - $(NULL) - - LINTLIBS = ../os/llib-los.ln - -/* - * The following configuration parameters may be set in the appropriate - * .macros files or site.def in the directory util/imake.includes/: - * - * DefaultFontPath COMPILEDDEFAULTFONTPATH - * - * The sample util/imake.includes/Imake.tmpl will provide generic defaults. - * The values in site.h are simply a last line of defense and should not be - * changed. - */ - -#ifdef DefaultFontPath -DEFAULTFONTPATH = DefaultFontPath -SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\" -#endif - -#ifdef DefaultDisplayClass -DEFAULTDISPLAYCLASS = DefaultDisplayClass - SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\" -#endif - -#ifdef XVendorString -VENDORSTRING = XVendorString - VENDOR_STRING = -DVENDOR_STRING=\"$(VENDORSTRING)\" -#endif - -#ifdef XVendorRelease -VENDORRELEASE = XVendorRelease - VENDOR_RELEASE = -DVENDOR_RELEASE="$(VENDORRELEASE)" -#endif - -#ifdef DarwinArchitecture -#if DarwinQuartzSupport - QUARTZ_DEFINES = -DDARWIN_WITH_QUARTZ -#endif -#endif - -SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_DISPLAY_CLASS) - -VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE) $(QUARTZ_DEFINES) - -NormalLibraryObjectRule() -NormalLibraryTarget(dix,$(OBJS)) -LintLibraryTarget(dix,$(SRCS) $(XPSRC)) -NormalLintTarget($(SRCS) $(XPSRC)) - -SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES) $(EXT_DEFINES)) -SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES)) -SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_)) -SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_)) -SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES)) - -NormalLibraryTarget(xpstubs,$(XPOBJ)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/dix/Makefile.am b/nx-X11/programs/Xserver/dix/Makefile.am new file mode 100644 index 0000000000..b368211d8f --- /dev/null +++ b/nx-X11/programs/Xserver/dix/Makefile.am @@ -0,0 +1,39 @@ +noinst_LTLIBRARIES = libdix.la libxpstubs.la + +AM_CFLAGS = $(DIX_CFLAGS) \ + -DVENDOR_STRING=\""@VENDOR_STRING@"\" \ + -DVENDOR_RELEASE="@VENDOR_RELEASE@" + + +if NXAGENT +SPECIAL = +else +SPECIAL = dispatch.c dixfonts.c events.c extension.c glyphcurs.c property.c resource.c window.c +endif + +libdix_la_SOURCES = \ + atom.c \ + colormap.c \ + cursor.c \ + devices.c \ + dispatch.h \ + dixutils.c \ + ffs.c \ + gc.c \ + globals.c \ + grabs.c \ + initatoms.c \ + main.c \ + pixmap.c \ + privates.c \ + region.c \ + swaprep.c \ + swapreq.c \ + tables.c + +libxpstubs_la_SOURCES = \ + xpstubs.c + +AM_CPPFLAGS = -I$(top_srcdir)/Xprint + +EXTRA_DIST = buildatoms BuiltInAtoms CHANGES diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 3dee81a25d..37047a2aa2 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -73,8 +73,6 @@ SOFTWARE. #include "swaprep.h" #include "dixevents.h" -extern void XkbFreePrivates(DeviceIntPtr device); - DeviceIntPtr AddInputDevice(DeviceProc deviceProc, Bool autoStart) { diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index b16b6b2e6a..6711c67ba6 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -65,7 +65,7 @@ Equipment Corporation. #include "dixfontstr.h" #include "closestr.h" #ifdef HAS_XFONT2 -# include +#include #endif /* HAS_XFONT2 */ #ifdef DEBUG diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 70224c3b8a..0cd078445f 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -247,6 +247,8 @@ static WindowPtr XYToWindow( static Bool CheckMotion(xEvent *xE); +void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff); + extern int lastEvent; static Mask lastEventMask; diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile deleted file mode 100644 index 5daa10c6f0..0000000000 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ /dev/null @@ -1,164 +0,0 @@ -NULL = - -#include - -#ifdef FbNoPixelAddrCode -FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT -#endif - -#if HasShm -SHM_DEFINES = ShmDefines -#endif - -#if BuildRender -RENDERSRC = fbcompose.c -RENDEROBJ = fbcompose.o -#endif - -#if defined(NXAgentServer) && NXAgentServer -NX_DEFINES = -DNXAGENT_SERVER -#endif - -#if defined(NXAgentServer) && NXAgentServer - DEFINES = $(FB_DEFINES) $(NX_DEFINES) -#else - DEFINES = $(FB_DEFINES) -#endif - -SRCS = $(XFMODSRC) \ - fballpriv.c \ - fbbits.c \ - fbblt.c \ - fbbltone.c \ - fbbstore.c \ - fbcmap.c \ - $(RENDERSRC) \ - fbcopy.c \ - fbedge.c \ - fbfill.c \ - fbfillrect.c \ - fbfillsp.c \ - fbgc.c \ - fbgetsp.c \ - fbglyph.c \ - fbimage.c \ - fbline.c \ - fboverlay.c \ - fbpixmap.c \ - fbpoint.c \ - fbpush.c \ - fbscreen.c \ - fbseg.c \ - fbsetsp.c \ - fbsolid.c \ - fbstipple.c \ - fbtile.c \ - fbtrap.c \ - fbutil.c \ - fbwindow.c \ - fb24_32.c \ - fbpict.c \ - $(NULL) - -OBJS = $(XFMODOBJ) \ - fbarc.o \ - fballpriv.o \ - fbbits.o \ - fbblt.o \ - fbbltone.o \ - fbbstore.o \ - fbcmap.o \ - $(RENDEROBJ) \ - fbcopy.o \ - fbedge.o \ - fbfill.o \ - fbfillrect.o \ - fbfillsp.o \ - fbgc.o \ - fbgetsp.o \ - fbglyph.o \ - fbimage.o \ - fbline.o \ - fboverlay.o \ - fbpixmap.o \ - fbpoint.o \ - fbpush.o \ - fbscreen.o \ - fbseg.o \ - fbsetsp.o \ - fbsolid.o \ - fbstipple.o \ - fbtile.o \ - fbtrap.o \ - fbutil.o \ - fbwindow.o \ - fb24_32.o \ - fbpict.o \ - $(NULL) - - INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) \ - -I$(XF86SRC)/common $(EXTRAINCLUDES) \ - -I$(SERVERSRC)/render -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ - $(SERVERSRC)/mi/llib-lmi.ln - -NormalLibraryObjectRule() -NormalLibraryTarget(fb,$(OBJS)) - -LintLibraryTarget(fb,$(SRCS)) - -NormalLintTarget($(SRCS)) - - -DependTarget() - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - -SpecialCObjectRule(fboverlay,$(ICONFIGFILES),$(SHM_DEFINES)) - -#ifdef LinkDirectory -LinkSourceFile(fb24_32.c,LinkDirectory) -LinkSourceFile(fballpriv.c,LinkDirectory) -LinkSourceFile(fbarc.c,LinkDirectory) -LinkSourceFile(fbbits.c,LinkDirectory) -LinkSourceFile(fbblt.c,LinkDirectory) -LinkSourceFile(fbbltone.c,LinkDirectory) -LinkSourceFile(fbbstore.c,LinkDirectory) -LinkSourceFile(fbcmap.c,LinkDirectory) -#if BuildRender -LinkSourceFile(fbcompose.c,LinkDirectory) -#endif -LinkSourceFile(fbcopy.c,LinkDirectory) -LinkSourceFile(fbfill.c,LinkDirectory) -LinkSourceFile(fbfillrect.c,LinkDirectory) -LinkSourceFile(fbfillsp.c,LinkDirectory) -LinkSourceFile(fbgc.c,LinkDirectory) -LinkSourceFile(fbgetsp.c,LinkDirectory) -LinkSourceFile(fbglyph.c,LinkDirectory) -LinkSourceFile(fbimage.c,LinkDirectory) -LinkSourceFile(fbline.c,LinkDirectory) -LinkSourceFile(fbmodule.c,LinkDirectory) -LinkSourceFile(fboverlay.c,LinkDirectory) -LinkSourceFile(fbpict.c,LinkDirectory) -LinkSourceFile(fbpixmap.c,LinkDirectory) -LinkSourceFile(fbpoint.c,LinkDirectory) -LinkSourceFile(fbpush.c,LinkDirectory) -LinkSourceFile(fbscreen.c,LinkDirectory) -LinkSourceFile(fbseg.c,LinkDirectory) -LinkSourceFile(fbsetsp.c,LinkDirectory) -LinkSourceFile(fbsolid.c,LinkDirectory) -LinkSourceFile(fbstipple.c,LinkDirectory) -LinkSourceFile(fbtile.c,LinkDirectory) -LinkSourceFile(fbtrap.c,LinkDirectory) -LinkSourceFile(fbutil.c,LinkDirectory) -LinkSourceFile(fbwindow.c,LinkDirectory) -#endif - -InstallDriverSDKLibraryModule(fb,$(DRIVERSDKMODULEDIR),.) -InstallDriverSDKNonExecFile(fb.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(fbrop.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/fb/Makefile.am b/nx-X11/programs/Xserver/fb/Makefile.am new file mode 100644 index 0000000000..a87776f218 --- /dev/null +++ b/nx-X11/programs/Xserver/fb/Makefile.am @@ -0,0 +1,53 @@ +NULL = + +noinst_LTLIBRARIES = libfb.la + +AM_CPPFLAGS = \ + $(NULL) + +AM_CFLAGS = $(DIX_CFLAGS) -DFree86Server + +sdk_HEADERS = fb.h fbrop.h fboverlay.h + +libfb_la_SOURCES = \ + fb.h \ + fb24_32.c \ + fb24_32.h \ + fballpriv.c \ + fbarc.c \ + fbbits.c \ + fbbits.h \ + fbblt.c \ + fbbltone.c \ + fbbstore.c \ + fbcompose.c \ + fbcopy.c \ + fbfill.c \ + fbfillrect.c \ + fbfillsp.c \ + fbgc.c \ + fbgetsp.c \ + fbglyph.c \ + fbimage.c \ + fbline.c \ + fboverlay.c \ + fboverlay.h \ + fbpict.c \ + fbpict.h \ + fbpixmap.c \ + fbpoint.c \ + fbpush.c \ + fbrop.h \ + fbscreen.c \ + fbseg.c \ + fbsetsp.c \ + fbsolid.c \ + fbstipple.c \ + fbtile.c \ + fbtrap.c \ + fbutil.c \ + fbwindow.c \ + fbedge.c \ + fbedgeimp.h + +EXTRA_DIST = fbcmap.c diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c index ec8ddff4f1..b7ae950c9a 100644 --- a/nx-X11/programs/Xserver/fb/fbcmap.c +++ b/nx-X11/programs/Xserver/fb/fbcmap.c @@ -43,6 +43,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XFree86Server ColormapPtr FbInstalledMaps[MAXSCREENS]; +Bool fbHasVisualTypes (int depth); + int fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { diff --git a/nx-X11/programs/Xserver/hw/Makefile.am b/nx-X11/programs/Xserver/hw/Makefile.am new file mode 100644 index 0000000000..47aa77c8f3 --- /dev/null +++ b/nx-X11/programs/Xserver/hw/Makefile.am @@ -0,0 +1,11 @@ +NULL = + +if NXAGENT +NXAGENT_SUBDIRS = nxagent +endif + +SUBDIRS = \ + $(NXAGENT_SUBDIRS) \ + $(NULL) + +DIST_SUBDIRS = nxagent diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index af8b62810a..ab9253a09d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -109,7 +109,9 @@ typedef XID KeySym64; #endif /*_XSERVER64*/ +#ifndef NX_TRANS_SOCKET #define NX_TRANS_SOCKET +#endif #define GC XlibGC #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index abdb650a49..981fa84acf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index d9d203faa7..642ea6a978 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "Agent.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h index cbbb7bd1dc..e24ce1a5ee 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h @@ -41,7 +41,7 @@ extern Bool nxagentWMIsRunning; * to the agent server. */ -void nxagentInitAtoms(); +void nxagentInitAtoms(void); /* * Query and create all the required atoms diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c index 1a6c4e9690..a1853b8cda 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c b/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c index b889d2a629..e6da4cd523 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c +++ b/nx-X11/programs/Xserver/hw/nxagent/BitmapUtils.c @@ -34,6 +34,10 @@ in this Software without prior written authorization from The Open Group. /* Utility functions for reformating font bitmaps */ +void nxagentBitOrderInvert(unsigned char *buf, int nbytes); +void nxagentTwoByteSwap(unsigned char *buf, int nbytes); +void nxagentFourByteSwap(unsigned char *buf, int nbytes); + static const unsigned char _reverse_byte[0x100] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 6ea0c4fcfa..455974fec2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + /* * Used in handling of karma on lost focus. */ @@ -37,7 +41,7 @@ #include "dixstruct.h" #include "scrnintstr.h" #include "windowstr.h" -#include "osdep.h" +#include "../os/osdep.h" /* * NX specific includes and definitions. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 5f7bdab4ec..c8a0ce9f1f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "Xproto.h" #include "Xatom.h" @@ -146,6 +150,37 @@ static char szAgentCOMPOUND_TEXT[] = "COMPOUND_TEXT"; static char szAgentUTF8_STRING[] = "UTF8_STRING"; static char szAgentNX_CUT_BUFFER_CLIENT[] = "NX_CUT_BUFFER_CLIENT"; +/* + * Save the values queried from X server. + */ + +Bool nxagentValidServerTargets(Atom target); +void nxagentSendSelectionNotify(Atom property); +void nxagentTransferSelection(int resource); +void nxagentCollectPropertyEvent(int resource); +void nxagentResetSelectionOwner(void); +void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, + Atom selection, Atom target, Time time); +int nxagentSendNotify(xEvent *event); + +void nxagentPrintClipboardStat(char *); +const char * GetXErrorString(int code); +void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data, void *args); + +Status SendSelectionNotifyEventToServer(XSelectionEvent *event_to_send); +int SendEventToClient(ClientPtr client, xEvent *pEvents); +int SendSelectionNotifyEventToClient(ClientPtr client, + Time time, + Window requestor, + Atom selection, + Atom target, + Atom property); +void nxagentClearSelectionOwner(SelectionOwner *owner); +void nxagentStoreSelectionOwner(SelectionOwner *owner, Selection *sel); +int nxagentFindLastSelectionOwnerIndex(Atom sel); +void nxagentReplyRequestSelection(XEvent *X, Bool success); +void nxagentInitSelectionOwner(SelectionOwner *owner, Atom selection); + /* * some helpers for debugging output */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index c2e783cb9a..0454092251 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -62,9 +62,11 @@ extern void nxagentSetSelectionOwner(Selection *pSelection); extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, Window requestor, Atom property, Atom target, Time time); -void nxagentClearSelection(); -void nxagentRequestSelection(); -void nxagentHandleSelectionNotifyFromXServer(); +#ifdef _X11_XLIB_H_ +void nxagentClearSelection(XEvent *X); +void nxagentRequestSelection(XEvent *X); +void nxagentHandleSelectionNotifyFromXServer(XEvent *X); +#endif int nxagentFindCurrentSelectionIndex(Atom sel); #endif /* __Clipboard_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index b049778871..695ee220fa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "Xproto.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index e48671879c..b6ea8835c2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "windowstr.h" @@ -43,6 +47,11 @@ #undef TEST #undef DEBUG +void nxagentCompositeExtensionInit(void); +void nxagentRedirectDefaultWindows(void); +void nxagentRedirectWindow(WindowPtr pWin); +void nxagentUnredirectWindow(WindowPtr pWin); + /* * Set if the composite extension is supported * by the remote display. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index 75382d4e89..f63703c19f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "Xproto.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 0dcdda5a4d..19ffbf26de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index c6412f38aa..31e04665e4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 7574ec7b0d..1ccb46a960 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "dixstruct.h" #include "../../fb/fb.h" #include "misc.h" @@ -122,6 +126,10 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel); unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable); unsigned long nxagentGetRegionColor(DrawablePtr pDrawable, RegionPtr pRegion); +void nxagentPointsToDirtyRegion(DrawablePtr pDrawable, int mode, int nPoints, xPoint *pPoints); +void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPtr pExpose); +int nxagentClipAndSendClearExpose(WindowPtr pWin, void * ptr); + int nxagentSkipImage = 0; static int nxagentTooManyImageData(void) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c index 0d4ef31070..d4c1059b87 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Error.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include @@ -103,6 +107,11 @@ void nxagentGetClientsPath(void); static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp); +static void nxagentOpenClientsLogFile(void); +static void nxagentCloseClientsLogFile(void); +static char *nxagentGetHomePath(void); +static char *nxagentGetRootPath(void); + /* declare an error handler that does not exit when an error * event is caught. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index cbdf17a226..7bcba1d50b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "signal.h" #include "unistd.h" @@ -39,7 +43,7 @@ #include "keysym.h" #include "fb.h" #include "mibstorest.h" -#include "osdep.h" +#include "../os/osdep.h" #include "Agent.h" #include "Args.h" @@ -289,6 +293,9 @@ int nxagentCheckWindowConfiguration(XConfigureEvent* X); void nxagentRemoveDuplicatedKeys(XEvent *X); +void nxagentShadowSwitchResizeMode(ScreenPtr pScreen); +int nxagentHandleRRScreenChangeNotify(XEvent *X); + void ProcessInputEvents(void) { #ifdef NX_DEBUG_INPUT diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 239d84b85d..b1e88c3523 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "micmap.h" #include "scrnintstr.h" #include "../../randr/randrstr.h" @@ -74,6 +78,9 @@ static Bool nxagentRandRCrtcSet (ScreenPtr pScreen, RRCrtcPtr crtc, RRModePtr mode, int x, int y, Rotation rotation, int numOutputs, RROutputPtr *outputs); + +static void nxagentRandRSetWindowsSize(int width, int height); + #endif #ifdef __DARWIN__ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 09ad471c82..a57efc25cf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "dixstruct.h" #include @@ -72,7 +76,7 @@ is" without express or implied warranty. #undef DEBUG const char * nxagentFontDirs[] = { - SYSTEMFONTDIR, + COMPILEDDEFAULTFONTPATH, "/usr/share/nx/fonts", "/usr/share/X11/fonts", "/usr/share/fonts/X11", @@ -105,6 +109,9 @@ static Bool nxagentGetFontServerPath(char * fontServerPath, int size); static char * nxagentMakeScalableFontName(const char *fontName, int scalableResolution); +Bool nxagentReconnectFailedFonts(void *p0); +static void nxagentVerifySingleFontPath(char **dest, const char *fontDir); + RESTYPE RT_NX_FONT; #ifdef NXAGENT_RECONNECT_FONT_DEBUG diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index b53428f964..6629091fb3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "Xproto.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 6ab46c4246..d58b8b0661 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" @@ -100,6 +104,60 @@ RegionPtr nxagentBitBlitHelper(GC *pGC); * X server's graphics functions. */ +void nxagentFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, + xPoint *pPoints, int *pWidths, int fSorted); +void nxagentSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc, + xPoint *pPoints, int *pWidths, int nSpans, int fSorted); +void nxagentGetSpans(DrawablePtr pDrawable, int maxWidth, xPoint *pPoints, + int *pWidths, int nSpans, char *pBuffer); +void nxagentQueryBestSize(int class, unsigned short *pwidth, + unsigned short *pheight, ScreenPtr pScreen); +RegionPtr nxagentBitBlitHelper(GC *pGC); +int nxagentWindowIsPopup(DrawablePtr pDrawable); +int nxagentDeferCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int srcx, int srcy, int width, + int height, int dstx, int dsty); +RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int srcx, int srcy, int width, + int height, int dstx, int dsty); +RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty, unsigned long plane); +void nxagentPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, + int nPoints, xPoint *pPoints); +void nxagentPolyLines(DrawablePtr pDrawable, GCPtr pGC, int mode, + int nPoints, xPoint *pPoints); +void nxagentPolySegment(DrawablePtr pDrawable, GCPtr pGC, + int nSegments, xSegment *pSegments); +void nxagentPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, + int nRectangles, xRectangle *pRectangles); +void nxagentPolyArc(DrawablePtr pDrawable, GCPtr pGC, + int nArcs, xArc *pArcs); +void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, + int mode, int nPoints, xPoint *pPoints); +void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, + int nRectangles, xRectangle *pRectangles); +void nxagentPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, + int nArcs, xArc *pArcs); +int nxagentPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, + int y, int count, char *string); +int nxagentPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, + int y, int count, unsigned short *string); +void nxagentImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, + int y, int count, char *string); +void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, + int y, int count, unsigned short *string); +void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nGlyphs, CharInfoPtr *pCharInfo, + void * pGlyphBase); +void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nGlyphs, CharInfoPtr *pCharInfo, + void * pGlyphBase); +void nxagentPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, + int width, int height, int x, int y); + + + void nxagentFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, xPoint *pPoints, int *pWidths, int fSorted) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 7311889b73..e9306494db 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -23,10 +23,14 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "dixstruct.h" #include "scrnintstr.h" #include "windowstr.h" -#include "osdep.h" +#include "../os/osdep.h" #include "Agent.h" #include "Handlers.h" @@ -115,6 +119,9 @@ extern unsigned long nxagentLastInputDevicesDumpTime; extern void nxagentDumpInputDevicesState(void); #endif +void nxagentHandleCollectInputFocusEvent(int resource); +Bool nxagentCollectInputFocusPredicate(Display *display, XEvent *X, XPointer ptr); + /* * Used in the handling of the X desktop * manager protocol. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c index c27f67818b..c0192ee349 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index e55ed2dd23..72eba11440 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile deleted file mode 100644 index ff9538f3eb..0000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ /dev/null @@ -1,287 +0,0 @@ -#include - - -NULL = - -SUBDIRS = compext \ - $(NULL) - -SRCS = \ - NXwindow.c \ - NXevents.c \ - NXproperty.c \ - NXdixfonts.c \ - NXglyphcurs.c \ - NXdispatch.c \ - NXrender.c \ - NXglyph.c \ - NXpicture.c \ - NXextension.c \ - NXshm.c \ - NXglxext.c \ - NXxvdisp.c \ - NXresource.c \ - NXdamage.c \ - NXmitrap.c \ - Args.c \ - Binder.c \ - BitmapUtils.c \ - Colormap.c \ - Cursor.c \ - Dialog.c \ - Display.c \ - Events.c \ - Font.c \ - GC.c \ - GCOps.c \ - Millis.c \ - Handlers.c \ - Init.c \ - Keyboard.c \ - Keystroke.c \ - Pointer.c \ - Screen.c \ - Visual.c \ - Drawable.c \ - Window.c \ - Pixmap.c \ - Render.c \ - Client.c \ - Rootless.c \ - Extensions.c \ - Options.c \ - Clipboard.c \ - Splash.c \ - Split.c \ - Holder.c \ - Reconnect.c \ - Error.c \ - Atoms.c \ - Trap.c \ - Image.c \ - Composite.c \ - Pixels.c \ - stubs.c \ - xpstubs.c \ - miinitext.c \ - $(NULL) - -OBJS = \ - NXwindow.o \ - NXevents.o \ - NXproperty.o \ - NXdixfonts.o \ - NXglyphcurs.o \ - NXdispatch.o \ - NXrender.o \ - NXglyph.o \ - NXpicture.o \ - NXextension.o \ - NXshm.o \ - NXglxext.o \ - NXxvdisp.o \ - NXresource.o \ - NXdamage.o \ - NXmitrap.o \ - Args.o \ - Binder.o \ - BitmapUtils.o \ - Colormap.o \ - Cursor.o \ - Dialog.o \ - Display.o \ - Events.o \ - Font.o \ - GC.o \ - GCOps.o \ - Millis.o \ - Handlers.o \ - Init.o \ - Keyboard.o \ - Keystroke.o \ - Pointer.o \ - Screen.o \ - Visual.o \ - Drawable.o \ - Window.o \ - Pixmap.o \ - Render.o \ - Client.o \ - Rootless.o \ - Extensions.o \ - Options.o \ - Clipboard.o \ - Splash.o \ - Split.o \ - Holder.o \ - Reconnect.o \ - Error.o \ - Atoms.o \ - Trap.o \ - Image.o \ - Composite.o \ - Pixels.o \ - stubs.o \ - xpstubs.o \ - miinitext.o \ - $(NULL) - -VFBINCLUDES = \ - -I../../fb \ - -I../../mfb \ - -I../../render \ - $(NULL) - -INCLUDES = \ - -I. \ - -I../../../../extras/Mesa/include \ - -I$(XBUILDINCDIR) \ - -I../../mi \ - -I../../include \ - -I../../os \ - -I../../miext/damage \ - -I../../miext/cw \ - -I../../GL/glx \ - -I../../GL/include \ - -I../../../../lib/GL/include \ - -I../../Xext \ - -I../../../../lib/include/X11 \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) \ - `pkg-config --cflags-only-I libxml-2.0` \ - `pkg-config --cflags-only-I pixman-1` \ - $(NULL) -#ifdef SunArchitecture -INCLUDES = \ - -I. \ - -I../../../../extras/Mesa/include \ - -I$(XBUILDINCDIR) \ - -I/usr/sfw/include \ - -I../../mi \ - -I../../include \ - -I../../os \ - -I../../GL/glx \ - -I../../GL/include \ - -I../../../../lib/GL/include \ - -I../../Xext \ - -I../../miext/damage \ - -I../../miext/cw \ - -I../../../../lib/include/X11 \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) \ - `pkg-config --cflags-only-I libxml-2.0` \ - `pkg-config --cflags-only-I pixman-1` \ - $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \ - `pkg-config --cflags-only-I libpng` \ - $(NULL) -#else -#ifdef cygwinArchitecture -INCLUDES = \ - -I. -I$(XBUILDINCDIR) \ - -I../../mi \ - -I../../include \ - -I../../os \ - -I../../GL/glx \ - -I../../GL/include \ - -I../../../../lib/GL/include \ - -I../../Xext \ - -I../../miext/damage \ - -I../../miext/cw \ - -I../../../../../nxcomp \ - -I../../../../../nxcompshad \ - -I../../../../extras/Mesa/include \ - -I../../../../lib/include/X11 \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) \ - `pkg-config --cflags-only-I libxml-2.0` \ - `pkg-config --cflags-only-I pixman-1` \ - $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \ - `pkg-config --cflags-only-I libpng` \ - $(NULL) -#endif -#endif - -### NXAGENT Defines: -# -# NXAGENT_SHAPE Old shape code -# NXAGENT_SHAPE2 New shape code -# NXAGENT_FIXKEYS Force the release of pressed key when losing focus -# NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers. -# NXAGENT_RANDR_MODE_PREFIX Prefix for RandR modes (i.e., nx_x) (default: nx_) -# NXAGENT_RANDR_XINERAMA_CLIPPING cut off invisible window parts in xinerama mode (you probably do not want this) -# NXAGENT_TIMESTAMP print duration for some routines -# -### macros not investigated yet: -# -# NXAGENT_PICTURE_ALWAYS_POINTS_TO_VIRTUAL -# NXAGENT_RENDER_CLEANUP -# NXAGENT_WAKEUP= -# NXAGENT_ONSTART -# NXAGENT_SPLASH -# NXAGENT_ARTSD -# -### Debug macros: -# -# DEBUG_COLORMAP -# DEBUG_TREE -# NXAGENT_DEBUG -# NXAGENT_FIXKEYS_DEBUG -# NXAGENT_FONTCACHE_DEBUG -# NXAGENT_FONTMATCH_DEBUG -# NXAGENT_LOGO_DEBUG -# NXAGENT_RECONNECT_COLORMAP_DEBUG -# NXAGENT_RECONNECT_CURSOR_DEBUG -# NXAGENT_RECONNECT_DEBUG -# NXAGENT_RECONNECT_DISPLAY_DEBUG -# NXAGENT_RECONNECT_FONT_DEBUG -# NXAGENT_RECONNECT_PICTFORMAT_DEBUG -# NXAGENT_RECONNECT_PICTURE_DEBUG -# NXAGENT_RECONNECT_SCREEN_DEBUG -# NXAGENT_RECONNECT_WINDOW_DEBUG -# NXAGENT_XKBD_DEBUG -# NX_DEBUG_INPUT - -#if nxVersion -NX_DEFINES = \ - -DNX_VERSION_CURRENT="$(NX_VERSION_CURRENT)" \ - -DNX_VERSION_CURRENT_STRING="\"$(NX_VERSION_CURRENT_STRING)\"" \ - $(NULL) -#endif - -DEFINES = \ - -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \ - -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI \ - -DNXAGENT_SERVER \ - -DNXAGENT_RENDER_CLEANUP \ - -DNXAGENT_SHAPE2 \ - -DNXAGENT_FIXKEYS \ - -DNXAGENT_CLIPBOARD \ - -DNXAGENT_WAKEUP=1000 \ - -DNXAGENT_ONSTART \ - -DNXAGENT_ARTSD \ - -UNX_DEBUG_INPUT \ - -DRANDR_10_INTERFACE=1 \ - -DRANDR_12_INTERFACE=1 \ - -DRANDR_13_INTERFACE=1 \ - -DRANDR_14_INTERFACE=1 \ - -DRANDR_15_INTERFACE=1 \ - -DPANORAMIX \ - -UDEBUG_TREE \ - -DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \ - $(NULL) - -all:: $(OBJS) - -LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) -LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix) -LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) -SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_)) - -NormalLibraryObjectRule() -NormalLibraryTarget(nxagent,$(OBJS)) - -DependTarget() - -#define IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 0b4ffd601b..2f00d8ad0f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include @@ -127,13 +131,13 @@ extern int OsVendorVErrorFFatal; * different file */ -extern void (*OsVendorStartRedirectErrorFProc)(); -extern void (*OsVendorEndRedirectErrorFProc)(); +extern void (*OsVendorStartRedirectErrorFProc)(void); +extern void (*OsVendorEndRedirectErrorFProc)(void); extern void SetVendorRelease(int release); -void OsVendorStartRedirectErrorFFunction(); -void OsVendorEndRedirectErrorFFunction(); +void OsVendorStartRedirectErrorFFunction(void); +void OsVendorEndRedirectErrorFFunction(void); /* * Called by InitGlobals() in the diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h index 1bea17600c..ce03965ccd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h @@ -52,4 +52,6 @@ extern ServerGrabInfoRec nxagentGrabServerInfo; void nxagentNotifyConnection(int fd, int ready, void *data); +void ddxBeforeReset(void); + #endif /* __Init_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 0ebaf677b2..1bd2b41cc3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -36,6 +36,11 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ + +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include #include @@ -87,6 +92,9 @@ void nxagentKeycodeConversionSetup(void); static void nxagentWriteKeyboardDir(void); static void nxagentWriteKeyboardFile(char *rules, char *model, char *layout, char *variant, char *options); +int ProcXkbInhibited(register ClientPtr client); +static void nxagentXkbClearNames(void); + #endif /* XKB */ /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index b6d8f5817c..3612e88dfa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "keysym.h" @@ -46,6 +50,8 @@ extern Bool nxagentWMIsRunning; extern char *nxagentKeystrokeFile; +static char *checkKeystrokeFile(char *filename); + #ifdef NX_DEBUG_INPUT int nxagentDebugInputDevices = False; unsigned long nxagentLastInputDevicesDumpTime = 0; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Makefile.am b/nx-X11/programs/Xserver/hw/nxagent/Makefile.am new file mode 100644 index 0000000000..65bc82764f --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/Makefile.am @@ -0,0 +1,240 @@ +AUTOMAKE_OPTIONS = dist-bzip2 foreign subdir-objects + +AM_LIBTOOLFLAGS = --preserve-dup-deps + +bin_PROGRAMS = nxagent + +nxagent_SOURCES = Agent.h \ + Args.c \ + Args.h \ + Atoms.c \ + Atoms.h \ + Binder.c \ + Binder.h \ + BitmapUtils.c \ + Client.c \ + Client.h \ + Clipboard.c \ + Clipboard.h \ + Colormap.c \ + Colormap.h \ + Composite.c \ + Composite.h \ + Cursor.c \ + Cursor.h \ + Dialog.c \ + Dialog.h \ + Display.c \ + Display.h \ + Drawable.c \ + Drawable.h \ + Error.c \ + Error.h \ + Events.h \ + Font.c \ + Font.h \ + GC.c \ + GCOps.c \ + GCOps.h \ + GCs.h \ + Handlers.c \ + Handlers.h \ + Holder.c \ + Holder.h \ + Icons.h \ + Image.c \ + Image.h \ + Init.c \ + Init.h \ + Literals.h \ + Millis.c \ + Millis.h \ + NXdamage.c \ + NXdixfonts.c \ + NXevents.c \ + NXextension.c \ + NXglyph.c \ + NXglyphcurs.c \ + NXglyphstr.h \ + NXmitrap.c \ + NXpicture.c \ + NXpicturestr.h \ + NXproperty.c \ + NXrender.c \ + NXresource.c \ + NXshm.c \ + NXxvdisp.c \ + Options.c \ + Options.h \ + Pixels.c \ + Pixels.h \ + Pixmap.c \ + Pixmaps.h \ + Pointer.c \ + Pointer.h \ + Reconnect.c \ + Reconnect.h \ + Render.h \ + Rootless.c \ + Rootless.h \ + Screen.h \ + Splash.c \ + Splash.h \ + Split.c \ + Split.h \ + Trap.c \ + Trap.h \ + Utils.h \ + Visual.c \ + Visual.h \ + Window.c \ + Windows.h \ + Extensions.c \ + Extensions.h \ + Keyboard.c \ + Keyboard.h \ + Keystroke.c \ + Keystroke.h \ + NXdispatch.c \ + Events.c \ + NXglxext.c \ + NXwindow.c \ + Render.c \ + Screen.c \ + nxagent-config.h \ + compext/Alpha.c \ + compext/Alpha.h \ + compext/Bitmap.c \ + compext/Bitmap.h \ + compext/Clean.c \ + compext/Clean.h \ + compext/Colormap.c \ + compext/Colormap.h \ + compext/Compext.c \ + compext/Compext.h \ + compext/Jpeg.c \ + compext/Jpeg.h \ + compext/Mask.c \ + compext/Mask.h \ + compext/Png.c \ + compext/Png.h \ + compext/Rgb.c \ + compext/Rgb.h \ + compext/Rle.c \ + compext/Rle.h \ + compext/Z.c \ + compext/Z.h \ + X11/include/Xcomposite_nxagent.h \ + X11/include/Xfixes_nxagent.h \ + X11/include/Xinerama_nxagent.h \ + X11/include/xpm_nxagent.h \ + X11/include/Xrandr_nxagent.h \ + X11/include/Xrenderint_nxagent.h \ + X11/include/Xrender_nxagent.h \ + ../../Xi/stubs.c \ + ../../mi/miinitext.c \ + ../../fb/fbcmap.c + +nxagent_LDADD = -lX11 \ + $(XORG_CORE_LIBS) \ + $(NXAGENT_LIBS) \ + $(NXAGENTMODULES_LIBS) + +# don't warn during linking when a symbol is defined more than once. +# This is a fundamental principle in nxagent: Replace upstream functions +# with own functions. +nxagent_LDFLAGS = -Wl,-zmuldefs -R '$(libdir)/nx/X11' + +### NXAGENT Defines: +# +# NXAGENT_SHAPE Old shape code +# NXAGENT_SHAPE2 New shape code +# NXAGENT_FIXKEYS Force the release of pressed key when losing focus +# NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers. +# NXAGENT_RANDR_MODE_PREFIX Use prefix for RandR modes (i.e., nx_x) +# NXAGENT_RANDR_XINERAMA_CLIPPING cut off invisible window parts in xinerama mode (you probably do not want this) +# NXAGENT_TIMESTAMP print duration for some routines +# +### macros not investigated yet: +# +# NXAGENT_PICTURE_ALWAYS_POINTS_TO_VIRTUAL +# NXAGENT_RENDER_CLEANUP +# NXAGENT_WAKEUP= +# NXAGENT_ONSTART +# NXAGENT_SPLASH +# NXAGENT_ARTSD +# +### Debug macros: +# +# DEBUG_COLORMAP +# DEBUG_TREE +# NXAGENT_DEBUG +# NXAGENT_FIXKEYS_DEBUG +# NXAGENT_FONTCACHE_DEBUG +# NXAGENT_FONTMATCH_DEBUG +# NXAGENT_LOGO_DEBUG +# NXAGENT_RECONNECT_COLORMAP_DEBUG +# NXAGENT_RECONNECT_CURSOR_DEBUG +# NXAGENT_RECONNECT_DEBUG +# NXAGENT_RECONNECT_DISPLAY_DEBUG +# NXAGENT_RECONNECT_FONT_DEBUG +# NXAGENT_RECONNECT_PICTFORMAT_DEBUG +# NXAGENT_RECONNECT_PICTURE_DEBUG +# NXAGENT_RECONNECT_SCREEN_DEBUG +# NXAGENT_RECONNECT_WINDOW_DEBUG +# NXAGENT_XKBD_DEBUG +# NX_DEBUG_INPUT + +#FIXME: move these to configure.ac +#FIXME: -UXF86DRI can probably be removed +AM_CFLAGS = -DHAVE_NXAGENT_CONFIG_H \ + -UXF86DRI \ + -DNXAGENT_SERVER \ + -DNXAGENT_RENDER_CLEANUP \ + -DNXAGENT_SHAPE2 \ + -DNXAGENT_FIXKEYS \ + -DNXAGENT_CLIPBOARD \ + -DNXAGENT_WAKEUP=1000 \ + -DNXAGENT_ONSTART \ + -DNXAGENT_SPLASH \ + -DNXAGENT_ARTSD \ + -DNXAGENT_RANDR_MODE_PREFIX \ + -UNX_DEBUG_INPUT \ + -DRANDR_10_INTERFACE=1 \ + -DRANDR_12_INTERFACE=1 \ + -DRANDR_13_INTERFACE=1 \ + -DRANDR_14_INTERFACE=1 \ + -DRANDR_15_INTERFACE=1 \ + -UPANORAMIX \ + -UDEBUG_TREE \ + $(NXAGENTMODULES_CFLAGS) \ + $(DIX_CFLAGS) \ + -I../../GL/include \ + -IX11/include \ + -I$(top_srcdir)/include + +EXTRA_DIST = os2Stub.c \ + nxagent.xpm \ + nxmissing.xpm \ + screensaver + +# Man page +include $(top_srcdir)/cpprules.in + +appmandir = $(APP_MAN_DIR) + +appman_PRE = +appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) + +EXTRAMANDEFS = \ + -D__XCONFIGFILE__=$(__XCONFIGFILE__) \ + -D__XSERVERNAME__=$(XSERVERNAME) + +BUILT_SOURCES = $(appman_PRE) +CLEANFILES = $(appman_PRE) $(appman_DATA) + +SUFFIXES += .$(APP_MAN_SUFFIX) .man + +.man.$(APP_MAN_SUFFIX): + -rm -f $@ + $(LN_S) $< $@ diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c index ef50edbee1..bf790928a7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c @@ -47,6 +47,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ + +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "regionstr.h" #include "../../miext/damage/damage.h" #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 4a9ae73ae0..1ad187895f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -99,6 +99,9 @@ Equipment Corporation. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif #ifdef __sun #define False 0 @@ -200,8 +203,6 @@ extern int nxagentClipboardSelection; extern int nxagentMaxSelections; #endif -extern int nxOpenFont(ClientPtr, XID, Mask, unsigned, char*); - void InitSelections() { @@ -757,6 +758,8 @@ ProcConvertSelection(register ClientPtr client) } +extern int nxOpenFont(ClientPtr, XID, Mask, unsigned, char*); + int ProcOpenFont(register ClientPtr client) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 992a6674f4..2dee461ea0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -73,11 +73,18 @@ Equipment Corporation. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "dixstruct.h" #include "dixfontstr.h" static Bool doOpenFont(ClientPtr client, OFclosurePtr c); static Bool doListFontsAndAliases(ClientPtr client, LFclosurePtr c); +int nxOpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontname); + +extern RESTYPE RT_NX_FONT; #include "../../dix/dixfonts.c" @@ -304,8 +311,6 @@ doOpenFont(ClientPtr client, OFclosurePtr c) } if( nxagentFontPriv(pfont) -> mirrorID == 0 ) { - extern RESTYPE RT_NX_FONT; - nxagentFontPriv(pfont) -> mirrorID = FakeClientID(0); if (!AddResource(nxagentFontPriv(pfont) -> mirrorID, RT_NX_FONT, (void *) pfont)) { FreeResource(c->fontid, RT_NONE); @@ -1373,12 +1378,7 @@ nxdoListFontsAndAliases(client, fss) } int -nxOpenFont(client, fid, flags, lenfname, pfontname) - ClientPtr client; - XID fid; - Mask flags; - unsigned lenfname; - char *pfontname; +nxOpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontname) { nxFsPtr fss; LFclosurePtr c; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 031e62431c..7bee524e77 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -132,6 +132,9 @@ of the copyright holder. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif #include @@ -156,7 +159,6 @@ extern int nxagentShadowInit(ScreenPtr, WindowPtr); extern int nxagentSendNotify(xEvent*); #endif - void ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, TimeStamp time, Bool autoGrab) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index 0b832cc7de..a74e3f8765 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -70,6 +70,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "Trap.h" #include "../../dix/extension.c" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c index 9d0f4f7198..0187811846 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c @@ -43,6 +43,10 @@ ** */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "../../GL/glx/glxext.c" #include "Trap.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c index 72d8242bd1..b535db8819 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c @@ -46,6 +46,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "../../render/glyph.c" #ifdef NXAGENT_SERVER diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c index 549ab4333a..d356abb7de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c @@ -70,6 +70,9 @@ SOFTWARE. ************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif #include "../../dix/glyphcurs.c" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c index 1988ca1028..633a681493 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c @@ -45,6 +45,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "Render.h" #include "../../render/mitrap.c" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c index 7ccc04bc8c..d30de7a450 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c @@ -46,6 +46,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "picturestr.h" #include "Screen.h" @@ -66,9 +70,11 @@ PicturePtr CreatePicture (Picture pid, int *error); static PicturePtr createSourcePicture(void); int FreePicture (void *value, XID pid); +Bool nxagentReconnectAllPictFormat(void *p); -#include "../../render/picture.c" +extern int nxagentPicturePrivateIndex; +#include "../../render/picture.c" #define PANIC #define WARNING diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 9799d80d51..0157fb030c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -70,6 +70,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "../../dix/property.c" #include "Options.h" @@ -101,6 +105,20 @@ extern WindowPtr nxagentGetClipboardWindow(Atom, WindowPtr); extern Atom mcop_local_atom; #endif +int +GetWindowProperty(WindowPtr pWin, Atom property, long longOffset, long longLength, + Bool delete, Atom type, Atom *actualType, int *format, + unsigned long *nItems, unsigned long *bytesAfter, + unsigned char **propData); + +#ifdef NXAGENT_CLIPBOARD +extern WindowPtr nxagentGetClipboardWindow(Atom, WindowPtr); +#endif + +#ifdef NXAGENT_ARTSD +extern Atom mcop_local_atom; +#endif + int ProcChangeProperty(ClientPtr client) { @@ -556,19 +574,10 @@ ProcGetProperty(ClientPtr client) /* FIXME: should be moved to a different file, is not derived from dix */ int -GetWindowProperty(pWin, property, longOffset, longLength, delete, - type, actualType, format, nItems, bytesAfter, propData ) - WindowPtr pWin; - Atom property; - long longOffset; - long longLength; - Bool delete; - Atom type; - Atom *actualType; - int *format; - unsigned long *nItems; - unsigned long *bytesAfter; - unsigned char **propData; +GetWindowProperty(WindowPtr pWin, Atom property, long longOffset, long longLength, + Bool delete, Atom type, Atom *actualType, int *format, + unsigned long *nItems, unsigned long *bytesAfter, + unsigned char **propData) { PropertyPtr pProp, prevProp; unsigned long n, len, ind; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 105d7048b4..773a30bcef 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -46,6 +46,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "../render/render.c" #include "Trap.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index e05b36877b..b5ef259e64 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -123,6 +123,10 @@ Equipment Corporation. * resource "owned" by the client. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "../../dix/resource.c" #include "Agent.h" @@ -137,9 +141,10 @@ Equipment Corporation. #ifdef NXAGENT_SERVER static int nxagentResChangedFlag = 0; -#endif -#ifdef NXAGENT_SERVER +int nxagentFindClientResource(int client, RESTYPE type, void * value); +int nxagentSwitchResourceType(int client, RESTYPE type, void * value); + int nxagentFindClientResource(int client, RESTYPE type, void * value) { ResourcePtr pResource; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index e1b55f561f..98545d808b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -51,6 +51,9 @@ in this Software without prior written authorization from The Open Group. /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif #include #include "Trap.h" @@ -83,6 +86,8 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, extern int nxagentImageLength(int, int, int, int, int); +void ShmExtensionInit(void); + void ShmExtensionInit(void) { @@ -164,12 +169,8 @@ ShmExtensionInit(void) } static void -nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; +nxagent_miShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format, int w, int h, + int sx, int sy, int sw, int sh, int dx, int dy, char *data) { PixmapPtr pmap; GCPtr putGC; @@ -200,12 +201,8 @@ nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, dat } static void -miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; +miShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format, int w, int h, + int sx, int sy, int sw, int sh, int dx, int dy, char *data) { /* Careful! This wrapper DEACTIVATES the trap! */ @@ -219,13 +216,11 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) } +extern int nxagentImageLength(int, int, int, int, int); + static void -fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; +fbShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format, int w, int h, + int sx, int sy, int sw, int sh, int dx, int dy, char *data) { #ifdef NXAGENT_SERVER int length; @@ -295,8 +290,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) } static int -ProcShmPutImage(client) - register ClientPtr client; +ProcShmPutImage(register ClientPtr client) { register GCPtr pGC; register DrawablePtr pDraw; @@ -432,12 +426,7 @@ ProcShmPutImage(client) static PixmapPtr -nxagent_fbShmCreatePixmap (pScreen, width, height, depth, addr) - ScreenPtr pScreen; - int width; - int height; - int depth; - char *addr; +nxagent_fbShmCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, char *addr) { register PixmapPtr pPixmap; @@ -468,12 +457,7 @@ nxagent_fbShmCreatePixmap (pScreen, width, height, depth, addr) } static PixmapPtr -fbShmCreatePixmap (pScreen, width, height, depth, addr) - ScreenPtr pScreen; - int width; - int height; - int depth; - char *addr; +fbShmCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, char *addr) { PixmapPtr result; @@ -488,8 +472,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr) static int -nxagent_ProcShmDispatch (client) - register ClientPtr client; +nxagent_ProcShmDispatch (register ClientPtr client) { REQUEST(xReq); @@ -564,8 +547,7 @@ ProcShmDispatch (register ClientPtr client) } static int -SProcShmDispatch (client) - register ClientPtr client; +SProcShmDispatch (register ClientPtr client) { REQUEST(xReq); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 88e68e463d..38e2b60bbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -101,6 +101,9 @@ Equipment Corporation. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif #include "selection.h" @@ -115,6 +118,8 @@ Equipment Corporation. #include "../../dix/window.c" +void nxagentClearSplash(WindowPtr pW); + extern Bool nxagentWMIsRunning; extern Bool nxagentScreenTrap; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c index 336ec10604..32da50e7a7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #if !defined(__sun) && !defined(__CYGWIN__) #include "Trap.h" @@ -56,6 +60,9 @@ SOFTWARE. #undef TEST #undef DEBUG +int nxagent_ProcXvDispatch(ClientPtr client); +int nxagent_SProcXvDispatch(ClientPtr client); + /* ** ProcXvDispatch ** diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c index 5c3a44c233..5d8f93ef46 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c index 93038eab6a..c1260c777c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include @@ -46,6 +50,8 @@ void Put16(unsigned int value, char *buffer, int order); void Put24(unsigned int value, char *buffer, int order); void Put32(unsigned int value, char *buffer, int order); +int nxagentUniquePixels(XImage *image); + static int nxagentComparePixels(const void *p1, const void *p2) { int pixel1 = *((int *) p1); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 7a0fcd535d..7728ac7c3b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "miscstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h index 00cc39c5f3..546ef79ff1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h @@ -140,6 +140,6 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, int wPict, int hPict); Bool nxagentPixmapOnShadowDisplay(PixmapPtr pMap); -Bool nxagentFbOnShadowDisplay(); +Bool nxagentFbOnShadowDisplay(void); #endif /* __Pixmap_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c index d344f34b07..8760efb49b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "Xproto.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index e29fc32009..c2fe97b361 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include "X.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 6113a419a5..883a893bfd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "picturestr.h" #include "glyphstr.h" @@ -180,6 +184,32 @@ Bool nxagentReconnectAllPicture(void *); Bool nxagentDisconnectAllPicture(void); +void nxagentCleanGlyphs(xGlyphInfo *gi, int nglyphs, CARD8 *images, + int depth, Display *dpy); + +Bool nxagentFillGlyphSet(GlyphSetPtr pGly); + +void nxagentRenderCreateSolidFill(PicturePtr pPicture, xRenderColor *color); + +void nxagentRenderCreateLinearGradient(PicturePtr pPicture, xPointFixed *p1, + xPointFixed *p2, int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner, + xPointFixed *outer, + xFixed innerRadius, + xFixed outerRadius, + int nStops, + xFixed *stops, + xRenderColor *colors); + +void nxagentRenderCreateConicalGradient(PicturePtr pPicture, + xPointFixed *center, + xFixed angle, int nStops, + xFixed *stops, + xRenderColor *colors); + #ifdef NXAGENT_RENDER_CLEANUP #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 6908799b66..fd4b49c10c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "X.h" #include "../../include/window.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 2b1146496f..90970a6805 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -41,6 +41,10 @@ is" without express or implied warranty. * Used by the auto-disconnect feature. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include "scrnintstr.h" @@ -141,6 +145,8 @@ extern Bool useXpmIcon; extern Bool nxagentReportWindowIds; +extern char *nxagentKeyboard; + #ifdef NXAGENT_TIMESTAMP extern unsigned long startTime; #endif @@ -181,6 +187,19 @@ WindowPtr nxagentViewportFrameBelow; Bool nxagentCreateScreenResources(ScreenPtr pScreen); void nxagentPrintAgentGeometry(char *hdrMessage, char *prefix); +static Bool nxagentIsParentOf(Display *d, XlibWindow possible_parent, XlibWindow candidate); +static void freeDepths(DepthPtr depths, int num); +static void nxagentShadowSetWindowOptions(void); +int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin); +static Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah, + int bx1, int by1, unsigned int bw, unsigned int bh, + int *x, int *y, unsigned int *w, unsigned int *h); +static Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah, + int bx1, int by1, unsigned int bw, unsigned int bh, + int bbx1, int bby1, int bbx2, int bby2, + int *x, int *y, unsigned int *w, unsigned int *h); +static void nxagentAdjustCustomMode(ScreenPtr pScreen); +static void nxagentDropOutput(RROutputPtr o); /* * These variables are for shadowing feature. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index bf5d8894e8..bc8f742bf9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -72,7 +72,7 @@ extern short nxagentShadowUid; void nxagentSetScreenInfo(ScreenInfo *screenInfo); void nxagentSetPixmapFormats(ScreenInfo *screenInfo); -void nxagentPrintGeometry(); +void nxagentPrintGeometry(void); extern Window nxagentDefaultWindows[MAXSCREENS]; extern Window nxagentInputWindows[MAXSCREENS]; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 8f3bc1ede0..2cfb231ba2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "windowstr.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h index a43801469f..e09e33fa0a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h @@ -40,6 +40,6 @@ extern int nxagentXdmcpUp; extern Window nxagentSplashWindow; extern void nxagentShowSplashWindow(Window); -extern void nxagentRemoveSplashWindow(); +extern void nxagentRemoveSplashWindow(void); #endif /* __Splash_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 33005e86de..8a81dbf8c3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.h b/nx-X11/programs/Xserver/hw/nxagent/Split.h index 65db133bd4..aa2a8810fd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.h @@ -54,13 +54,13 @@ typedef UnpackResourceRec *UnpackResourcePtr; extern UnpackResourceRec nxagentUnpackResources[]; -void nxagentInitSplitResources(); -void nxagentInitUnpackResources(); +void nxagentInitSplitResources(void); +void nxagentInitUnpackResources(void); -SplitResourcePtr nxagentAllocSplitResource(); +SplitResourcePtr nxagentAllocSplitResource(void); void nxagentFreeSplitResource(SplitResourcePtr pResource); -UnpackResourcePtr nxagentAllocUnpackResource(); +UnpackResourcePtr nxagentAllocUnpackResource(void); void nxagentFreeUnpackResource(UnpackResourcePtr pResource); #define nxagentSplitResource(pDrawable) \ @@ -89,4 +89,8 @@ void nxagentReleaseAllSplits(void); void nxagentSetCorruptedTimestamp(DrawablePtr pDrawable); void nxagentResetCorruptedTimestamp(DrawablePtr pDrawable); +void nxagentFreeSplit(int resource); +void nxagentWaitDrawable(DrawablePtr pDrawable); +void nxagentWaitCommitEvent(int resource); + #endif /* __Split_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c index a29560d43c..fe6ed025c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c @@ -37,6 +37,10 @@ is" without express or implied warranty. */ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include "scrnintstr.h" #include "dix.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.h b/nx-X11/programs/Xserver/hw/nxagent/Visual.h index 70799f3f8a..8cdf90e063 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Visual.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.h @@ -76,6 +76,6 @@ Colormap nxagentDefaultVisualColormap(Visual *visual); Visual nxagentAlphaVisual; -void nxagentInitAlphaVisual(); +void nxagentInitAlphaVisual(void); #endif /* __Visual_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index fadf6ffb12..96fcd8698e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -23,6 +23,10 @@ /* */ /**************************************************************************/ +#ifdef HAVE_NXAGENT_CONFIG_H +#include +#endif + #include #include "X.h" @@ -164,6 +168,10 @@ static void nxagentReconnectWindow(void *, XID, void *); static void nxagentReconfigureWindow(void *, XID, void *); static int nxagentForceExposure(WindowPtr pWin, void * ptr); +void nxagentSetVersionProperty(WindowPtr pWin); +void nxagentSetWMState(WindowPtr pWin, CARD32 desired); +void nxagentEmptyBackingStoreRegion(void * param0, XID param1, void * data_buffer); + /* by dimbor */ typedef struct { diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile deleted file mode 100644 index 407baab80d..0000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile +++ /dev/null @@ -1,49 +0,0 @@ -NULL = - -#include - -SRCS = \ - Alpha.c \ - Bitmap.c \ - Clean.c \ - Colormap.c \ - Compext.c \ - Jpeg.c \ - Mask.c \ - Png.c \ - Rgb.c \ - Rle.c \ - Z.c \ - $(NULL) - -OBJS = \ - Alpha.o \ - Bitmap.o \ - Clean.o \ - Colormap.o \ - Compext.o \ - Jpeg.o \ - Mask.o \ - Png.o \ - Rgb.o \ - Rle.o \ - Z.o \ - $(NULL) - - INCLUDES = -I$(SERVERSRC)/include \ - -I$(XBUILDINCDIR) \ - -I../../../../../lib/include/X11 \ - `pkg-config --cflags-only-I pixman-1` \ - $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \ - `pkg-config --cflags-only-I libpng` \ - $(NULL) - - LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln \ - $(NULL) - -NormalLibraryObjectRule() -NormalLibraryTarget(compext,$(OBJS)) -LintLibraryTarget(compext,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/hw/nxagent/nxagent-config.h b/nx-X11/programs/Xserver/hw/nxagent/nxagent-config.h new file mode 100644 index 0000000000..3d5a78a05c --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/nxagent-config.h @@ -0,0 +1,36 @@ +/* + * Copyright 2005 Red Hat Inc., Raleigh, North Carolina. + * + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation on the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef NXAGENT_CONFIG_H +#define NXAGENT_CONFIG_H + +#include +#include + +#undef MITSHM + +#endif /* NXAGENT_CONFIG_H */ diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile deleted file mode 100644 index 4c168edf10..0000000000 --- a/nx-X11/programs/Xserver/include/Imakefile +++ /dev/null @@ -1,55 +0,0 @@ -HEADERS = os.h misc.h - -#if defined(XorgVersion) \ - || defined(BSDOSArchitecture) -#endif - -LinkSourceFile(osdep.h,../os) -#ifdef cygwinArchitecture -LinkFile(xxwindow.h,window.h) -#endif - -all:: - -depend:: - -InstallDriverSDKNonExecFile(XIstubs.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xprintf.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(bstore.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(bstorestr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(client.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(colormap.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(colormapst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(cursor.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(cursorstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(dix.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(dixstruct.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(exevents.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(extension.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(extnsionst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(gc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(gcstruct.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(globals.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(input.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(inputstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(list.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(misc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(miscstruct.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(opaque.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(os.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(pixmap.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(pixmapstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(property.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(propertyst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(region.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(regionstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(resource.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(screenint.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(scrnintstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(servermd.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR)) - -BuildIncludes($(HEADERS),nx-X11,..) -InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) diff --git a/nx-X11/programs/Xserver/include/Makefile.am b/nx-X11/programs/Xserver/include/Makefile.am new file mode 100644 index 0000000000..cd38f2813b --- /dev/null +++ b/nx-X11/programs/Xserver/include/Makefile.am @@ -0,0 +1,55 @@ +NULL = + +sdk_HEADERS = \ + XIstubs.h \ + bstore.h \ + bstorestr.h \ + closestr.h \ + closure.h \ + colormap.h \ + colormapst.h \ + cursor.h \ + cursorstr.h \ + dix.h \ + dixevents.h \ + dixfont.h \ + dixfontstr.h \ + dixgrabs.h \ + dixstruct.h \ + exevents.h \ + extension.h \ + extinit.h \ + extnsionst.h \ + gc.h \ + gcstruct.h \ + globals.h \ + input.h \ + inputstr.h \ + misc.h \ + miscstruct.h \ + opaque.h \ + os.h \ + pixmap.h \ + pixmapstr.h \ + property.h \ + propertyst.h \ + region.h \ + regionstr.h \ + resource.h \ + rgb.h \ + screenint.h \ + scrnintstr.h \ + selection.h \ + servermd.h \ + site.h \ + swaprep.h \ + swapreq.h \ + validate.h \ + window.h \ + windowstr.h \ + xorg-server.h \ + $(NULL) + +AM_CFLAGS = $(DIX_CFLAGS) + +EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h diff --git a/nx-X11/programs/Xserver/include/dix-config.h.in b/nx-X11/programs/Xserver/include/dix-config.h.in new file mode 100644 index 0000000000..d4d64573d8 --- /dev/null +++ b/nx-X11/programs/Xserver/include/dix-config.h.in @@ -0,0 +1,549 @@ +/* dix-config.h.in: not at all generated. -*- c -*- */ + +#ifndef _DIX_CONFIG_H_ +#define _DIX_CONFIG_H_ + +/* Support BigRequests extension */ +#undef BIGREQS + +/* Builder address */ +#undef BUILDERADDR + +/* Operating System Name */ +#undef OSNAME + +/* Operating System Vendor */ +#undef OSVENDOR + +/* Builder string */ +#undef BUILDERSTRING + +/* Default font path */ +#undef COMPILEDDEFAULTFONTPATH + +/* Miscellaneous server configuration files path */ +#undef SERVER_MISC_CONFIG_PATH + +/* Support Composite Extension */ +#undef COMPOSITE + +/* Support Damage extension */ +#undef DAMAGE + +/* Use OsVendorVErrorF */ +#undef DDXOSVERRORF + +/* Use ddxBeforeReset */ +#undef DDXBEFORERESET + +/* Build DPMS extension */ +#undef DPMSExtension + +/* Build DRI3 extension */ +#undef DRI3 + +/* Build GLX extension */ +#undef GLXEXT + +/* Build GLX DRI loader */ +#undef GLX_DRI + +/* Path to DRI drivers */ +#undef DRI_DRIVER_PATH + +/* Support XDM-AUTH*-1 */ +#undef HASXDMAUTH + +/* Support SHM */ +#undef HAS_SHM + +/* Has backtrace support */ +#undef HAVE_BACKTRACE + +/* Has libunwind support */ +#undef HAVE_LIBUNWIND + +/* Define to 1 if you have the `cbrt' function. */ +#undef HAVE_CBRT + +/* Define to 1 if you have the declaration of `program_invocation_short_name', and + to 0 if you don't. */ +#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Have execinfo.h */ +#undef HAVE_EXECINFO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `getdtablesize' function. */ +#undef HAVE_GETDTABLESIZE + +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the `getpeereid' function. */ +#undef HAVE_GETPEEREID + +/* Define to 1 if you have the `getpeerucred' function. */ +#undef HAVE_GETPEERUCRED + +/* Define to 1 if you have the `getprogname' function. */ +#undef HAVE_GETPROGNAME + +/* Define to 1 if you have the `getzoneid' function. */ +#undef HAVE_GETZONEID + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Have Quartz */ +#undef XQUARTZ + +/* Support application updating through sparkle. */ +#undef XQUARTZ_SPARKLE + +/* Prefix to use for bundle identifiers */ +#undef BUNDLE_ID_PREFIX + +/* Build a standalone xpbproxy */ +#undef STANDALONE_XPBPROXY + +/* Define to 1 if you have the `bsd' library (-lbsd). */ +#undef HAVE_LIBBSD + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the libdispatch (GCD) available */ +#undef HAVE_LIBDISPATCH + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_AGPGART_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_APM_BIOS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_FB_H + +/* Define to 1 if you have the `mkostemp' function. */ +#undef HAVE_MKOSTEMP + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the function pthread_setname_np(const char*) */ +#undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID + +/* Define to 1 if you have the function pthread_setname_np(pthread_t, const char*) */ +#undef HAVE_PTHREAD_SETNAME_NP_WITH_TID + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the `reallocarray' function. */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `arc4random_buf' function. */ +#undef HAVE_ARC4RANDOM_BUF + +/* Define to use libc SHA1 functions */ +#undef HAVE_SHA1_IN_LIBC + +/* Define to use CommonCrypto SHA1 functions */ +#undef HAVE_SHA1_IN_COMMONCRYPTO + +/* Define to use CryptoAPI SHA1 functions */ +#undef HAVE_SHA1_IN_CRYPTOAPI + +/* Define to use libmd SHA1 functions */ +#undef HAVE_SHA1_IN_LIBMD + +/* Define to use libgcrypt SHA1 functions */ +#undef HAVE_SHA1_IN_LIBGCRYPT + +/* Define to use libnettle SHA1 functions */ +#undef HAVE_SHA1_IN_LIBNETTLE + +/* Define to use libsha1 for SHA1 */ +#undef HAVE_SHA1_IN_LIBSHA1 + +/* Define to 1 if you have the `shmctl64' function. */ +#undef HAVE_SHMCTL64 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if libsystemd-daemon is available */ +#undef HAVE_SYSTEMD_DAEMON + +/* Define to 1 if SYSV IPC is available */ +#undef HAVE_SYSV_IPC + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_AGPIO_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define to 1 if you have the `timingsafe_memcmp' function. */ +#undef HAVE_TIMINGSAFE_MEMCMP + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FNMATCH_H + +/* Have /dev/urandom */ +#undef HAVE_URANDOM + +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Support IPv6 for TCP connections */ +#undef IPv6 + +/* Support os-specific local connections */ +#undef LOCALCONN + +/* Support MIT-SHM Extension */ +#undef MITSHM + +/* Enable some debugging code */ +#undef DEBUG + +/* Name of package */ +#undef PACKAGE + +/* Internal define for Xinerama */ +#undef PANORAMIX + +/* Support Present extension */ +#undef PRESENT + +/* Support pixmap privates */ +#undef PIXPRIV + +/* Overall prefix */ +#undef PROJECTROOT + +/* Support RANDR extension */ +#undef RANDR + +/* Support Record extension */ +#undef XRECORD + +/* Support RENDER extension */ +#undef RENDER + +/* Support X resource extension */ +#undef RES + +/* Support client ID tracking in X resource extension */ +#undef CLIENTIDS + +/* Support MIT-SCREEN-SAVER extension */ +#undef SCREENSAVER + +/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ +#undef SECURE_RPC + +/* Use a lock to prevent multiple servers on a display */ +#undef SERVER_LOCK + +/* Support SHAPE extension */ +#undef SHAPE + +/* Where to install Xorg.bin and Xorg.wrap */ +#undef SUID_WRAPPER_DIR + +/* Define to 1 on systems derived from System V Release 4 */ +#undef SVR4 + +/* sysconfdir */ +#undef SYSCONFDIR + +/* Support TCP socket connections */ +#undef TCPCONN + +/* Support UNIX socket connections */ +#undef UNIXCONN + +/* unaligned word accesses behave as expected */ +#undef WORKING_UNALIGNED_INT + +/* Build X string registry */ +#undef XREGISTRY + +/* Build X-ACE extension */ +#undef XACE + +/* Build SELinux extension */ +#undef XSELINUX + +/* Support XCMisc extension */ +#undef XCMISC + +/* Build Security extension */ +#undef XCSECURITY + +/* Support Xdmcp */ +#undef XDMCP + +/* Build XFree86 BigFont extension */ +#undef XF86BIGFONT + +/* Support XFixes extension */ +#undef XFIXES + +/* Support Xinerama extension */ +#undef XINERAMA + +/* Vendor release */ +#undef XORG_RELEASE + +/* Current Xorg version */ +#undef XORG_VERSION_CURRENT + +/* Build Xv Extension */ +#undef XvExtension + +/* Build XvMC Extension */ +#undef XvMCExtension + +/* Build XRes extension */ +#undef XResExtension + +/* Support XSync extension */ +#undef XSYNC + +/* Support XTest extension */ +#undef XTEST + +/* Support Xv extension */ +#undef XV + +/* Support DRI extension */ +#undef XF86DRI + +/* Build DRI2 extension */ +#undef DRI2 + +/* Build DBE support */ +#undef DBE + +/* Vendor name */ +#undef XVENDORNAME + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Enable GNU and other extensions to the C environment for GLIBC */ +#undef _GNU_SOURCE + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Build Rootless code */ +#undef ROOTLESS + +/* Define to 1 if unsigned long is 64 bits. */ +#undef _XSERVER64 + +/* System is BSD-like */ +#undef CSRG_BASED + +/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ +#undef BSD44SOCKETS + +/* Support D-Bus */ +#undef HAVE_DBUS + +/* Use libudev for input hotplug */ +#undef CONFIG_UDEV + +/* Use libudev for kms enumeration */ +#undef CONFIG_UDEV_KMS + +/* Use udev_monitor_filter_add_match_tag() */ +#undef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG + +/* Use udev_enumerate_add_match_tag() */ +#undef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG + +/* Enable D-Bus core */ +#undef NEED_DBUS + +/* Support HAL for hotplug */ +#undef CONFIG_HAL + +/* Enable systemd-logind integration */ +#undef SYSTEMD_LOGIND 1 + +/* Have a monotonic clock from clock_gettime() */ +#undef MONOTONIC_CLOCK + +/* Support X Input extension */ +#undef XINPUT + +/* Define to 1 if we want to build the X keyboard extension */ +#undef XKB + +/* Disable XKB per default */ +#undef XKB_DFLT_DISABLED + +/* Define to 1 if the DTrace Xserver provider probes should be built in */ +#undef XSERVER_DTRACE + +/* Define to 1 if typeof works with your compiler. */ +#undef HAVE_TYPEOF + +/* Define to __typeof__ if your compiler spells it that way. */ +#undef typeof + +/* Correctly set _XSERVER64 for OSX fat binaries */ +#ifdef __APPLE__ +#include "dix-config-apple-verbatim.h" +#endif + +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE + +/* Have support for X shared memory fence library (xshmfence) */ +#undef HAVE_XSHMFENCE + +/* Use XTrans FD passing support */ +#undef XTRANS_SEND_FDS + +/* Wrap SIGBUS to catch MIT-SHM faults */ +#undef BUSFAULT + +/* Directory for shared memory temp files */ +#undef SHMDIR + +/* Don't let Xdefs.h define 'pointer' */ +#define _XTYPEDEF_POINTER 1 + +/* Don't let XIproto define 'Pointer' */ +#define _XITYPEDEF_POINTER 1 + +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 0 + +/* Build GLAMOR */ +#undef GLAMOR + +/* Build glamor's GBM-based EGL support */ +#undef GLAMOR_HAS_GBM + +/* Build glamor/gbm has linear support */ +#undef GLAMOR_HAS_GBM_LINEAR + +/* Build glamor use new drmGetDeviceNameFromFD2 */ +#undef GLAMOR_HAS_DRM_NAME_FROM_FD_2 + +/* byte order */ +#undef X_BYTE_ORDER + +/* Listen on TCP socket */ +#undef LISTEN_TCP + +/* Listen on Unix socket */ +#undef LISTEN_UNIX + +/* Listen on local socket */ +#undef LISTEN_LOCAL + +/* Define if no local socket credentials interface exists */ +#undef NO_LOCAL_CLIENT_CRED + +/* Have setitimer support */ +#undef HAVE_SETITIMER + +/* Have posix_fallocate() */ +#undef HAVE_POSIX_FALLOCATE + +/* Use input thread */ +#undef INPUTTHREAD + +/* Have poll() */ +#undef HAVE_POLL + +/* Have epoll_create1() */ +#undef HAVE_EPOLL_CREATE1 + +/* use xfont2 instead of xfont1 */ +#undef HAS_XFONT2 + +/* FIXME: these are only required on the os directory, so move them + there */ +#undef NX_TRANS_EXIT +#undef NX_TRANS_SOCKET +#undef NX_TRANS_AUTH +#undef NX_TRANS_SLEEP +#undef NX_TRANS_FOPEN +#undef NX_TRANS_WAKEUP +#undef NX_TRANS_WARN +#undef NX_TRANS_INFO +#undef NX_TRANS_TEST +#undef NX_TRANS_DEBUG + +#endif /* _DIX_CONFIG_H_ */ diff --git a/nx-X11/programs/Xserver/include/xkb-config.h.in b/nx-X11/programs/Xserver/include/xkb-config.h.in new file mode 100644 index 0000000000..7b6a671b8c --- /dev/null +++ b/nx-X11/programs/Xserver/include/xkb-config.h.in @@ -0,0 +1,32 @@ +/* xkb-config.h.in: not at all generated. -*- c -*- + * + */ + +#ifndef _XKB_CONFIG_H_ +#define _XKB_CONFIG_H_ + +/* Default set of XKB rules. */ +#undef XKB_DFLT_RULES + +/* Default XKB model. */ +#undef XKB_DFLT_MODEL + +/* Default XKB layout. */ +#undef XKB_DFLT_LAYOUT + +/* Default XKB variant. */ +#undef XKB_DFLT_VARIANT + +/* Default XKB options. */ +#undef XKB_DFLT_OPTIONS + +/* Path to XKB definitions. */ +#undef XKB_BASE_DIRECTORY + +/* Path to xkbcomp. */ +#undef XKB_BIN_DIRECTORY + +/* XKB output dir for compiled keymaps. */ +#undef XKM_OUTPUT_DIR + +#endif /* _XKB_CONFIG_H_ */ diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h index a3f8718cb6..72632fbea8 100644 --- a/nx-X11/programs/Xserver/include/xkbsrv.h +++ b/nx-X11/programs/Xserver/include/xkbsrv.h @@ -346,6 +346,8 @@ extern int XkbProcessArguments( extern void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc); +extern void XkbFreePrivates(DeviceIntPtr device); + extern void XkbFreeCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, diff --git a/nx-X11/programs/Xserver/include/xorg-config.h.in b/nx-X11/programs/Xserver/include/xorg-config.h.in new file mode 100644 index 0000000000..bf555eb95b --- /dev/null +++ b/nx-X11/programs/Xserver/include/xorg-config.h.in @@ -0,0 +1,157 @@ +/* xorg-config.h.in: not at all generated. -*- c -*- + * + * This file differs from xorg-server.h.in in that -server is installed + * with the rest of the SDK for external drivers/modules to use, whereas + * -config is for internal use only (i.e. building the DDX). + * + */ + +#ifndef _XORG_CONFIG_H_ +#define _XORG_CONFIG_H_ + +#include +#include + +/* Building Xorg server. */ +#undef XORGSERVER + +/* Current X.Org version. */ +#undef XORG_VERSION_CURRENT + +/* Name of X server. */ +#undef __XSERVERNAME__ + +/* URL to go to for support. */ +#undef __VENDORDWEBSUPPORT__ + +/* Built-in output drivers. */ +#undef DRIVERS + +/* Built-in input drivers. */ +#undef IDRIVERS + +/* Path to configuration file. */ +#undef XF86CONFIGFILE + +/* Path to configuration file. */ +#undef XCONFIGFILE + +/* Name of configuration directory. */ +#undef XCONFIGDIR + +/* Path to loadable modules. */ +#undef DEFAULT_MODULE_PATH + +/* Path to installed libraries. */ +#undef DEFAULT_LIBRARY_PATH + +/* Default log location */ +#undef DEFAULT_LOGDIR + +/* Default logfile prefix */ +#undef DEFAULT_LOGPREFIX + +/* Default XDG_DATA dir under HOME */ +#undef DEFAULT_XDG_DATA_HOME + +/* Default log dir under XDG_DATA_HOME */ +#undef DEFAULT_XDG_DATA_HOME_LOGDIR + +/* Building DRI-capable DDX. */ +#undef XF86DRI + +/* Build DRI2 extension */ +#undef DRI2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STROPTS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_KD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_VT_H + +/* Define to 1 if you have the `walkcontext' function (used on Solaris for + xorg_backtrace in hw/xfree86/common/xf86Events.c */ +#undef HAVE_WALKCONTEXT + +/* Define to 1 if unsigned long is 64 bits. */ +#undef _XSERVER64 + +/* Building vgahw module */ +#undef WITH_VGAHW + +/* NetBSD PIO alpha IO */ +#undef USE_ALPHA_PIO + +/* BSD AMD64 iopl */ +#undef USE_AMD64_IOPL + +/* BSD /dev/io */ +#undef USE_DEV_IO + +/* BSD i386 iopl */ +#undef USE_I386_IOPL + +/* System is BSD-like */ +#undef CSRG_BASED + +/* System has PC console */ +#undef PCCONS_SUPPORT + +/* System has PCVT console */ +#undef PCVT_SUPPORT + +/* System has syscons console */ +#undef SYSCONS_SUPPORT + +/* System has wscons console */ +#undef WSCONS_SUPPORT + +/* System has /dev/xf86 aperture driver */ +#undef HAS_APERTURE_DRV + +/* Has backtrace support */ +#undef HAVE_BACKTRACE + +/* Name of the period field in struct kbd_repeat */ +#undef LNX_KBD_PERIOD_NAME + +/* Have execinfo.h */ +#undef HAVE_EXECINFO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MKDEV_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSMACROS_H + +/* Path to text files containing PCI IDs */ +#undef PCI_TXT_IDS_PATH + +/* Build with libdrm support */ +#undef WITH_LIBDRM + +/* Use libpciaccess */ +#undef XSERVER_LIBPCIACCESS + +/* Have setugid */ +#undef HAVE_ISSETUGID + +/* Have getresuid */ +#undef HAVE_GETRESUID + +/* Have X server platform bus support */ +#undef XSERVER_PLATFORM_BUS + +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID + +/* Support APM/ACPI power management in the server */ +#undef XF86PM + +/* Fallback input driver if the assigned driver fails */ +#undef FALLBACK_INPUT_DRIVER + +#endif /* _XORG_CONFIG_H_ */ diff --git a/nx-X11/programs/Xserver/include/xorg-server.h.in b/nx-X11/programs/Xserver/include/xorg-server.h.in new file mode 100644 index 0000000000..2d447ef1b8 --- /dev/null +++ b/nx-X11/programs/Xserver/include/xorg-server.h.in @@ -0,0 +1,222 @@ +/* xorg-server.h.in -*- c -*- + * + * This file is the template file for the xorg-server.h file which gets + * installed as part of the SDK. The #defines in this file overlap + * with those from config.h, but only for those options that we want + * to export to external modules. Boilerplate autotool #defines such + * as HAVE_STUFF and PACKAGE_NAME is kept in config.h + * + * It is still possible to update config.h.in using autoheader, since + * autoheader only creates a .h.in file for the first + * AM_CONFIG_HEADER() line, and thus does not overwrite this file. + * + * However, it should be kept in sync with this file. + */ + +#ifndef _XORG_SERVER_H_ +#define _XORG_SERVER_H_ + +#ifdef HAVE_XORG_CONFIG_H +#error Include xorg-config.h when building the X server +#endif + +/* Support BigRequests extension */ +#undef BIGREQS + +/* Default font path */ +#undef COMPILEDDEFAULTFONTPATH + +/* Support Composite Extension */ +#undef COMPOSITE + +/* Build DPMS extension */ +#undef DPMSExtension + +/* Build DRI3 extension */ +#undef DRI3 + +/* Build GLX extension */ +#undef GLXEXT + +/* Support XDM-AUTH*-1 */ +#undef HASXDMAUTH + +/* Support SHM */ +#undef HAS_SHM + +/* Define to 1 if you have the `reallocarray' function. */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + +/* Define to 1 if you have the `strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Support IPv6 for TCP connections */ +#undef IPv6 + +/* Support MIT-SHM Extension */ +#undef MITSHM + +/* Internal define for Xinerama */ +#undef PANORAMIX + +/* Support Present extension */ +#undef PRESENT + +/* Support RANDR extension */ +#undef RANDR + +/* Support RENDER extension */ +#undef RENDER + +/* Support X resource extension */ +#undef RES + +/* Support MIT-SCREEN-SAVER extension */ +#undef SCREENSAVER + +/* Support SHAPE extension */ +#undef SHAPE + +/* Define to 1 on systems derived from System V Release 4 */ +#undef SVR4 + +/* Support TCP socket connections */ +#undef TCPCONN + +/* Support UNIX socket connections */ +#undef UNIXCONN + +/* unaligned word accesses behave as expected */ +#undef WORKING_UNALIGNED_INT + +/* Support XCMisc extension */ +#undef XCMISC + +/* Support Xdmcp */ +#undef XDMCP + +/* Build XFree86 BigFont extension */ +#undef XF86BIGFONT + +/* Support Xinerama extension */ +#undef XINERAMA + +/* Support X Input extension */ +#undef XINPUT + +/* XKB default rules */ +#undef XKB_DFLT_RULES + +/* Support loadable input and output drivers */ +#undef XLOADABLE + +/* Build DRI extension */ +#undef XF86DRI + +/* Build DRI2 extension */ +#undef DRI2 + +/* Build Xorg server */ +#undef XORGSERVER + +/* Vendor release */ +#undef XORG_RELEASE + +/* Current Xorg version */ +#undef XORG_VERSION_CURRENT + +/* Build Xv Extension */ +#undef XvExtension + +/* Build XvMC Extension */ +#undef XvMCExtension + +/* Support XSync extension */ +#undef XSYNC + +/* Support XTest extension */ +#undef XTEST + +/* Support Xv Extension */ +#undef XV + +/* Vendor name */ +#undef XVENDORNAME + +/* BSD-compliant source */ +#undef _BSD_SOURCE + +/* POSIX-compliant source */ +#undef _POSIX_SOURCE + +/* X/Open-compliant source */ +#undef _XOPEN_SOURCE + +/* Vendor web address for support */ +#undef __VENDORDWEBSUPPORT__ + +/* Location of configuration file */ +#undef XCONFIGFILE + +/* Name of X server */ +#undef __XSERVERNAME__ + +/* Building vgahw module */ +#undef WITH_VGAHW + +/* System is BSD-like */ +#undef CSRG_BASED + +/* System has PC console */ +#undef PCCONS_SUPPORT + +/* System has PCVT console */ +#undef PCVT_SUPPORT + +/* System has syscons console */ +#undef SYSCONS_SUPPORT + +/* System has wscons console */ +#undef WSCONS_SUPPORT + +/* Use libpciaccess */ +#undef XSERVER_LIBPCIACCESS + +/* X Access Control Extension */ +#undef XACE + +/* Have X server platform bus support */ +#undef XSERVER_PLATFORM_BUS + +#ifdef _LP64 +#define _XSERVER64 1 +#endif + +/* Have support for X shared memory fence library (xshmfence) */ +#undef HAVE_XSHMFENCE + +/* Use XTrans FD passing support */ +#undef XTRANS_SEND_FDS + +/* Ask fontsproto to make font path element names const */ +#define FONT_PATH_ELEMENT_NAME_CONST 1 + +/* byte order */ +#undef X_BYTE_ORDER + +#endif /* _XORG_SERVER_H_ */ diff --git a/nx-X11/programs/Xserver/m4/ac_define_dir.m4 b/nx-X11/programs/Xserver/m4/ac_define_dir.m4 new file mode 120000 index 0000000000..05552e443e --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ac_define_dir.m4 @@ -0,0 +1 @@ +../../../../m4/ac_define_dir.m4 \ No newline at end of file diff --git a/nx-X11/programs/Xserver/m4/ac_include.m4 b/nx-X11/programs/Xserver/m4/ac_include.m4 new file mode 100644 index 0000000000..0d4ff6a320 --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ac_include.m4 @@ -0,0 +1,9 @@ +dnl dnl +dnl dnl @author Brian Stafford +dnl dnl +dnl dnl based on version by Caolan McNamara +dnl dnl based on David Arnold's autoconf suggestion in the threads faq +dnl dnl +dnl @synopsis ACX_FEATURE(ENABLE_OR_WITH,NAME[,VALUE]) +AC_DEFUN([ACX_FEATURE], + [echo "builtin([substr],[ ],len(--$1-$2))--$1-$2: ifelse($3,,[$]translit($1-$2,-,_),$3)"]) diff --git a/nx-X11/programs/Xserver/m4/ax_pthread.m4 b/nx-X11/programs/Xserver/m4/ax_pthread.m4 new file mode 120000 index 0000000000..9ecbe17754 --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ax_pthread.m4 @@ -0,0 +1 @@ +../../../../m4/ax_pthread.m4 \ No newline at end of file diff --git a/nx-X11/programs/Xserver/m4/libtool.m4 b/nx-X11/programs/Xserver/m4/libtool.m4 new file mode 100644 index 0000000000..f2d1f3983a --- /dev/null +++ b/nx-X11/programs/Xserver/m4/libtool.m4 @@ -0,0 +1,8394 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996-2001, 2003-2019 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +]) + +# serial 58 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + +# _LT_CC_BASENAME(CC) +# ------------------- +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. +m4_defun([_LT_CC_BASENAME], +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). +libext=a + +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from 'configure', and 'config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain=$ac_aux_dir/ltmain.sh +])# _LT_PROG_LTMAIN + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the 'libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags='_LT_TAGS'dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# '#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test 0 = "$lt_write_fail" && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +'$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test 0 != $[#] +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try '$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try '$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test yes = "$silent" && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +_LT_COPYING +_LT_LIBTOOL_TAGS + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS=$save_LDFLAGS + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and where our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test no = "$enable_libtool_lock" || enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi + ;; +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks=$enable_libtool_lock +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +_LT_DECL([], [AR], [1], [The archiver]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +]) + +if test yes = "[$]$2"; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes = "$cross_compiling"; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen=dlopen], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else + enable_dlopen=yes + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + + # We can hardcode non-existent directories. + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) +else + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac + fi +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl* | *,icl*) + # Native MSVC or ICC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test no = "$dynamic_linker" && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program that can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac]) +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program that can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + +# _LT_CHECK_MAGIC_METHOD +# ---------------------- +# how to check for library dependencies +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_MAGIC_METHOD], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +AC_CACHE_CHECK([how to recognize dependent libraries], +lt_cv_deplibs_check_method, +[lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi]) +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64, which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test yes = "$GCC"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl* | icl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++ or Intel C++ Compiler. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GCC"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++ or Intel C++ Compiler. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl* | icl*) + # Native MSVC or ICC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC and ICC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + osf3*) + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test yes,yes = "$GCC,$enable_shared"; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC=$CC +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC=$lt_save_CC +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_caught_CXX_error"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test yes = "$GXX"; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac + + if test yes = "$GXX"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test yes != "$_lt_caught_CXX_error" + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test x-L = "$p" || + test x-R = "$p"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test no = "$pre_test_object_deps_done"; then + case $prev in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)=$prev$p + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)=$p + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)=$p + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_FC" + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code=$lt_simple_compile_test_code + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f "$lt_ac_sed" && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` + if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine what file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/nx-X11/programs/Xserver/m4/ltoptions.m4 b/nx-X11/programs/Xserver/m4/ltoptions.m4 new file mode 100644 index 0000000000..c1664256b8 --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ltoptions.m4 @@ -0,0 +1,437 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004-2005, 2007-2009, 2011-2019 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 8 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option '$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' +# LT_INIT options. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [pic_mode=m4_default([$1], [default])]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/nx-X11/programs/Xserver/m4/ltsugar.m4 b/nx-X11/programs/Xserver/m4/ltsugar.m4 new file mode 100644 index 0000000000..e652d5a1b0 --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ltsugar.m4 @@ -0,0 +1,124 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007-2008, 2011-2019 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59, which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) diff --git a/nx-X11/programs/Xserver/m4/ltversion.m4 b/nx-X11/programs/Xserver/m4/ltversion.m4 new file mode 100644 index 0000000000..fa04b52a3b --- /dev/null +++ b/nx-X11/programs/Xserver/m4/ltversion.m4 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 4179 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.6' +macro_revision='2.4.6' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff --git a/nx-X11/programs/Xserver/m4/lt~obsolete.m4 b/nx-X11/programs/Xserver/m4/lt~obsolete.m4 new file mode 100644 index 0000000000..6c846b8f35 --- /dev/null +++ b/nx-X11/programs/Xserver/m4/lt~obsolete.m4 @@ -0,0 +1,99 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019 Free Software +# Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile deleted file mode 100644 index 46e5191ad5..0000000000 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ /dev/null @@ -1,191 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -NULL = - -#include - -#if ! HasCbrt -CBRT_SRC = cbrt.c -CBRT_OBJ = cbrt.o -#endif - -#if HasFfs -FFS_DEFINES = -DHAS_FFS -#endif - -MIINITEXTSRC = miinitext.c -MIINITEXTOBJ = miinitext.o - -SRCS = $(CBRT_SRC) \ - mivaltree.c \ - mipolyseg.c \ - mipolyrect.c \ - mipoly.c \ - mipolycon.c \ - mipolygen.c \ - mipolyutil.c \ - mifillrct.c \ - miwideline.c \ - mispans.c \ - miarc.c \ - mizerarc.c \ - mifillarc.c \ - miwindow.c \ - micursor.c \ - mipolytext.c \ - mibitblt.c \ - mipolypnt.c \ - mipushpxl.c \ - miglblt.c \ - mizerline.c \ - mizerclip.c \ - mifpolycon.c \ - midash.c \ - mibstore.c \ - $(MIINITEXTSRC) \ - mieq.c \ - mipointer.c \ - misprite.c \ - midispcur.c \ - miscrinit.c \ - migc.c \ - micmap.c \ - mioverlay.c \ - miexpose.c \ - $(NULL) - -OBJS = $(CBRT_OBJ) \ - mivaltree.o \ - mipolyseg.o \ - mipolyrect.o \ - mipoly.o \ - mipolycon.o \ - mipolygen.o \ - mipolyutil.o \ - mifillrct.o \ - miwideline.o \ - mispans.o \ - miarc.o \ - mizerarc.o \ - mifillarc.o \ - miwindow.o \ - micursor.o \ - mipolytext.o \ - mibitblt.o \ - mipolypnt.o \ - mipushpxl.o \ - miglblt.o \ - mizerline.o \ - mizerclip.o \ - mifpolycon.o \ - midash.o \ - mibstore.o \ - $(MIINITEXTOBJ) \ - mieq.o \ - mipointer.o \ - misprite.o \ - midispcur.o \ - miscrinit.o \ - migc.o \ - micmap.o \ - mioverlay.o \ - miexpose.o \ - $(NULL) - -#if defined(XorgVersion) -/* - * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o - * used by Xnest, Xvfb - */ - -#if NXLibraries - -/* - * To build the NX agent we need the XINPUT symbol - * in order to build the XInputExtension, since we - * don't use the XF86 module loader. - */ -EXT_DEFINES = ExtensionDefines \ - $(NULL) -#else -EXT_DEFINES = ExtensionDefines \ - -UXINPUT \ - $(NULL) -#endif - -#endif - -INCLUDES = -I. \ - -I../include \ - -I../render \ - -I../xfixes \ - -I../damageext \ - -I../miext/damage \ - -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext \ - `pkg-config --cflags-only-I pixman-1` \ - $(NULL) - -LINTLIBS = \ - ../dix/llib-ldix.ln \ - ../os/llib-los.ln \ - $(NULL) - -DEFINES = $(FFS_DEFINES) - -NormalLibraryObjectRule() -NormalLibraryTarget(mi,$(OBJS)) -LintLibraryTarget(mi,$(SRCS)) -NormalLintTarget($(SRCS)) - -#ifndef Win32Architecture -NormalLibraryTarget(cbrt,cbrt.o) -#endif - -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES)) - -#ifdef ItsyCompilerBug -SpecialCObjectRule(mipolycon,$(_NOOP_),-O0) -#endif -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -SpecialCObjectRule(mizerclip,NullParameter,-O0) -#endif - -AllTarget($(EXTRAMIINITEXTOBJ)) - -DependTarget() - -InstallDriverSDKNonExecFile(mi.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mibstore.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micmap.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(migc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(miline.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mizerarc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micoord.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/mi/Makefile.am b/nx-X11/programs/Xserver/mi/Makefile.am new file mode 100644 index 0000000000..2d9ae48cac --- /dev/null +++ b/nx-X11/programs/Xserver/mi/Makefile.am @@ -0,0 +1,70 @@ +noinst_LTLIBRARIES = libminimi.la libmi.la + +sdk_HEADERS = micmap.h miline.h mipointer.h mi.h mibstore.h \ + migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ + mispans.h miwideline.h mistruct.h mifpoly.h + +AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server + +# libminimi is for dmx - it has different defines for miinitext.c +libminimi_la_SOURCES = \ + cbrt.c \ + mi.h \ + miarc.c \ + mibitblt.c \ + mibstore.c \ + mibstore.h \ + mibstorest.h \ + micmap.c \ + micmap.h \ + micoord.h \ + micursor.c \ + midash.c \ + midispcur.c \ + mieq.c \ + miexpose.c \ + mifillarc.c \ + mifillarc.h \ + mifillrct.c \ + mifpolycon.c \ + mifpoly.h \ + migc.c \ + migc.h \ + miglblt.c \ + miline.h \ + mioverlay.c \ + mioverlay.h \ + mipointer.c \ + mipointer.h \ + mipointrst.h \ + mipoly.c \ + mipoly.h \ + mipolycon.c \ + mipolygen.c \ + mipolypnt.c \ + mipolyrect.c \ + mipolyseg.c \ + mipolytext.c \ + mipolyutil.c \ + mipushpxl.c \ + miscanfill.h \ + miscrinit.c \ + mispans.c \ + mispans.h \ + misprite.c \ + misprite.h \ + mispritest.h \ + mistruct.h \ + mivaltree.c \ + mivalidate.h \ + miwideline.c \ + miwideline.h \ + miwindow.c \ + mizerarc.c \ + mizerarc.h \ + mizerclip.c \ + mizerline.c + +libmi_la_SOURCES = $(libminimi_la_SOURCES) + +AM_CPPFLAGS = -I$(top_srcdir)/mfb diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c index 67d36a7423..cfaffa237a 100644 --- a/nx-X11/programs/Xserver/mi/mibitblt.c +++ b/nx-X11/programs/Xserver/mi/mibitblt.c @@ -358,7 +358,7 @@ miGetPlane( * Now get the bit and insert into a bitmap in XY format. */ bit = (pixel >> planeNum) & 1; -#ifndef XFree86Server +#if 0 /* XXX assuming bit order == byte order */ #if BITMAP_BIT_ORDER == LSBFirst bit <<= k; diff --git a/nx-X11/programs/Xserver/mi/mieq.c b/nx-X11/programs/Xserver/mi/mieq.c index fefb222c4b..1a4835f57a 100644 --- a/nx-X11/programs/Xserver/mi/mieq.c +++ b/nx-X11/programs/Xserver/mi/mieq.c @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. * */ +#if HAVE_DIX_CONFIG_H +#include +#endif + # include # include # include diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c index 2bea5ef854..362b23fddd 100644 --- a/nx-X11/programs/Xserver/mi/mipushpxl.c +++ b/nx-X11/programs/Xserver/mi/mipushpxl.c @@ -108,7 +108,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) Bool fInBox; DDXPointRec pt[NPT], ptThisLine; int width[NPT]; -#ifdef XFree86Server +#if 1 MiBits startmask; if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -148,7 +148,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) while(pw < pwEnd) { w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -181,7 +181,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) @@ -204,7 +204,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) { /* Process final partial word on line */ w = *pw; -#ifdef XFree86Server +#if 1 msk = startmask; #else msk = (MiBits)(-1) ^ SCRRIGHT((MiBits)(-1), 1); @@ -237,7 +237,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) fInBox = FALSE; } } -#ifdef XFree86Server +#if 1 /* This is not quite right, but it'll do for now */ if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) if (screenInfo.bitmapBitOrder == LSBFirst) diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index 8d73eb9791..ba10bf080d 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -2070,7 +2070,7 @@ miWideDash (pDrawable, pGC, mode, npt, pPts) Bool endIsFg = FALSE, startIsFg = FALSE; Bool firstIsFg = FALSE, prevIsFg = FALSE; -#ifndef XFree86Server +#if 0 /* XXX backward compatibility */ if (pGC->lineWidth == 0) { diff --git a/nx-X11/programs/Xserver/miext/Makefile.am b/nx-X11/programs/Xserver/miext/Makefile.am new file mode 100644 index 0000000000..27013f0a04 --- /dev/null +++ b/nx-X11/programs/Xserver/miext/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = damage +if COMPOSITE +SUBDIRS += cw +endif +DIST_SUBDIRS = damage cw diff --git a/nx-X11/programs/Xserver/miext/cw/Imakefile b/nx-X11/programs/Xserver/miext/cw/Imakefile deleted file mode 100644 index 395e60a48e..0000000000 --- a/nx-X11/programs/Xserver/miext/cw/Imakefile +++ /dev/null @@ -1,22 +0,0 @@ -#include - -SRCS = cw.c cw_ops.c cw_render.c - -OBJS = cw.o cw_ops.o cw_render.o - - INCLUDES = -I../../mi -I../../fb -I../../render -I../../composite \ - -I../../include -I$(XINCLUDESRC) $(EXTRAINCLUDES) \ - -I$(EXTINCSRC) \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \ - ../../mi/llib-lmi.ln - -NormalLibraryObjectRule() -NormalLibraryTarget(cw,$(OBJS)) -LintLibraryTarget(cw,$(SRCS)) - -NormalLintTarget($(SRCS)) - -DependTarget() - -InstallDriverSDKNonExecFile(cw.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/miext/cw/Makefile.am b/nx-X11/programs/Xserver/miext/cw/Makefile.am new file mode 100644 index 0000000000..78fce30cdf --- /dev/null +++ b/nx-X11/programs/Xserver/miext/cw/Makefile.am @@ -0,0 +1,11 @@ +noinst_LTLIBRARIES = libcw.la + +AM_CFLAGS = $(DIX_CFLAGS) + +AM_CPPFLAGS = + +libcw_la_SOURCES = \ + cw.c \ + cw_ops.c \ + cw_render.c \ + cw.h diff --git a/nx-X11/programs/Xserver/miext/damage/Imakefile b/nx-X11/programs/Xserver/miext/damage/Imakefile deleted file mode 100644 index 900f52add9..0000000000 --- a/nx-X11/programs/Xserver/miext/damage/Imakefile +++ /dev/null @@ -1,29 +0,0 @@ -#define IHaveModules -#include - -#if BuildRootless -DEFINES = -DROOTLESS_WORKAROUND -#endif - -#if (!(defined(NXAgentServer) && NXAgentServer)) -SRCS = damage.c - -OBJS = damage.o - - INCLUDES = -I. -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \ - -I$(XF86SRC)/common $(EXTRAINCLUDES) \ - -I../../render -I../cw -I$(EXTINCSRC) \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \ - ../../mi/llib-lmi.ln - -NormalLibraryObjectRule() -NormalLibraryTarget(damage,$(OBJS)) -LintLibraryTarget(damage,$(SRCS)) - -NormalLintTarget($(SRCS)) -#endif - -DependTarget() - -InstallDriverSDKNonExecFile(damage.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/miext/damage/Makefile.am b/nx-X11/programs/Xserver/miext/damage/Makefile.am new file mode 100644 index 0000000000..50efaa2dfa --- /dev/null +++ b/nx-X11/programs/Xserver/miext/damage/Makefile.am @@ -0,0 +1,16 @@ +noinst_LTLIBRARIES = libdamage.la + +AM_CFLAGS = $(DIX_CFLAGS) + +AM_CPPFLAGS = -I$(srcdir)/../cw + +if NXAGENT +DAMAGEC = +else +DAMAGEC = damage.c +endif + +libdamage_la_SOURCES = \ + $(DAMAGEC) \ + damage.h \ + damagestr.h diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile deleted file mode 100644 index da39c57ba9..0000000000 --- a/nx-X11/programs/Xserver/os/Imakefile +++ /dev/null @@ -1,270 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -#include - -NULL = - -/* - * If you have any extra files to be put into the library, define them here. - */ - -ZONEID_DEFINES = -UHAVE_GETZONEID - -#if NXLibraries - -NX_INCLUDES = -I../../../../nxcomp - -NX_DEFINES = -DNX_TRANS_SOCKET \ - -DNX_TRANS_AUTH \ - -DNX_TRANS_FOPEN \ - -DNX_TRANS_SLEEP \ - -DNX_TRANS_EXIT \ - -DNX_TRANS_WAKEUP=1000 \ - -DNXAGENT_SERVER \ - $(NULL) - -# -DNX_TRANS_WARN \ -# -DNX_TRANS_INFO \ -# -DNX_TRANS_TEST \ -# -DNX_TRANS_DEBUG \ - -#endif - -/* - * do not modify the following two definitions - */ - -#ifndef OtherSources -#define OtherSources -#endif - -#ifndef OtherObjects -#define OtherObjects -#endif - -#if HasXdmAuth -XDMAUTHDEFS = -DHASXDMAUTH -XDMAUTHOBJS = xdmauth.o -XDMAUTHSRCS = xdmauth.c -#else -XDMAUTHDEFS = -XDMAUTHOBJS = -XDMAUTHSCRS = -#endif - -TIRPC_INCLUDES = - -#if HasSecureRPC -RPCDEFS = -DSECURE_RPC -RPCOBJS = rpcauth.o -RPCSRCS = rpcauth.c - -#if UseTIRPC -TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc') -#endif - -#else -RPCDEFS = -RPCOBJS = -RPCSRCS = -#endif - -#if HasBSD44Sockets - SOCK_DEFINES = -DBSD44SOCKETS -#endif - -#if HasGetIfAddrs - IFADDRS_DEFINES = -DHAS_GETIFADDRS -#endif - -#if !defined(DDXOsColor) -COLOR_SRCS=oscolor.c -COLOR_OBJS=oscolor.o -#endif - -#if !HasSnprintf -SNPRINTF_SRCS = snprintf.c -SNPRINTF_OBJS = snprintf.o -#endif - -#if !HasStrlcat -STRLCAT_SRCS = strlcat.c strlcpy.c -STRLCAT_OBJS = strlcat.o strlcpy.o -#endif - -#if !HasReallocarray -REALLOCARRAY_SRCS = reallocarray.c -REALLOCARRAY_OBJS = reallocarray.o -#endif - -#if HasGetpeerucred -GETPEER_DEFINES = -DHAS_GETPEERUCRED -#else -# if HasGetpeereid -GETPEER_DEFINES = -DHAS_GETPEEREID -# endif -#endif - -#if !HasTimingsafeMemcmp -TMEMCMP_SRCS = timingsafe_memcmp.c -TMEMCMP_OBJS = timingsafe_memcmp.o -#endif - -BOOTSTRAPCFLAGS = - SRCS = WaitFor.c \ - access.c \ - client.c \ - connection.c \ - io.c \ - $(COLOR_SRCS) \ - osinit.c \ - utils.c \ - log.c \ - auth.c \ - mitauth.c \ - secauth.c \ - $(XDMAUTHSRCS) \ - $(RPCSRCS) \ - xdmcp.c \ - OtherSources \ - xstrans.c \ - $(SNPRINTF_SRCS) \ - $(STRLCAT_SRCS) \ - $(REALLOCARRAY_SRCS) \ - xprintf.c \ - $(TMEMCMP_SRCS) \ - $(NULL) - - OBJS = WaitFor.o \ - access.o \ - client.o \ - connection.o \ - io.o \ - $(COLOR_OBJS) \ - osinit.o \ - utils.o \ - log.o \ - auth.o \ - mitauth.o \ - secauth.o \ - $(XDMAUTHOBJS) \ - $(RPCOBJS) \ - xdmcp.o \ - OtherObjects \ - xstrans.o \ - $(SNPRINTF_OBJS) \ - $(STRLCAT_OBJS) \ - $(REALLOCARRAY_OBJS) \ - xprintf.o \ - $(TMEMCMP_OBJS) \ - $(NULL) - -#if UseMemLeak - MEM_DEFINES = -DMEMBUG -#endif - ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\" - XDMCP_DEFINES = ServerXdmcpDefines - ERROR_DEFINES = ServerErrorDefines -#if HasPam && HasPamMisc - PAM_DEFINES = -DUSE_PAM -#endif - XTRANS_DEFINES = -DXTRANS_SEND_FDS=0 - - DEFINES = $(CONNECTION_FLAGS) \ - $(MEM_DEFINES) \ - $(XDMAUTHDEFS) \ - $(RPCDEFS) \ - $(SIGNAL_DEFINES) \ - $(OS_DEFINES) \ - $(GETPEER_DEFINES) \ - $(RANDOM_DEFINES) \ - $(BUGMSG) \ - $(XTRANS_FAILDEFINES) \ - $(XTRANS_DEFINES) \ - $(NX_DEFINES) \ - $(NULL) - - INCLUDES = -I. \ - -I../include \ - -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext \ - -I$(SERVERSRC)/render \ - -I$(TOP)/lib/Xau \ - $(NX_INCLUDES) \ - `pkg-config --cflags-only-I pixman-1` \ - $(TIRPC_INCLUDES) \ - $(NULL) - - DEPEND_DEFINES = $(XDMCP_DEFINES) \ - $(EXT_DEFINES) \ - $(TRANS_INCLUDES) \ - $(CONNECTION_FLAGS) \ - $(GETPEER_DEFINES) \ - DependDefines \ - $(NULL) - - LINTLIBS = ../dix/llib-ldix.ln - -#ifdef NEED_ALLOCA_FROM_LIBPW - PWLIB = /lib/libPW.a -#endif /* NEED_ALLOCA_FROM_LIBPW */ - -NormalLibraryObjectRule() -NormalLibraryTarget(os,$(OBJS)) -LintLibraryTarget(os,$(SRCS)) -NormalLintTarget($(SRCS)) - -#ifdef NEED_ALLOCA_FROM_LIBPW -XCOMM -XCOMM And this one is to get the version of alloca that lives in /lib/libPW.a -XCOMM without getting all of the rest of the stuff in there. -XCOMM -alloca.o: $(PWLIB) - rm -f alloca.o - ar x $(PWLIB) alloca.o -#endif /* NEED_ALLOCA_FROM_LIBPW */ - -SpecialCObjectRule(access,$(ICONFIGFILES),$(XDMCP_DEFINES) $(SOCK_DEFINES) $(IFADDRS_DEFINES) $(ZONEID_DEFINES)) -SpecialCObjectRule(auth,$(ICONFIGFILES),$(XDMCP_DEFINES)) -SpecialCObjectRule(xdmauth,$(ICONFIGFILES),$(XDMCP_DEFINES)) -SpecialCObjectRule(xdmcp,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES)) -SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES)) -SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES)) -SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES)) -#if defined(SparcArchitecture) && HasGcc && !HasGcc2 -oscolor.o: oscolor.c $(ICONFIGFILES) - $(RM) $@ - cc -c $(CDEBUGFLAGS) $(ALLDEFINES) $*.c -#endif - -#if !HasSnprintf -LinkSourceFile(snprintf.c,$(LIBSRC)/misc) -#endif - -DependTarget() diff --git a/nx-X11/programs/Xserver/os/Makefile.am b/nx-X11/programs/Xserver/os/Makefile.am new file mode 100644 index 0000000000..f5b1eb5696 --- /dev/null +++ b/nx-X11/programs/Xserver/os/Makefile.am @@ -0,0 +1,47 @@ +AUTOMAKE_OPTIONS = subdir-objects + +noinst_LTLIBRARIES = libos.la + +AM_CFLAGS = $(DIX_CFLAGS) + +# FIXME: Add support for these in configure.ac +SECURERPC_SRCS = rpcauth.c + +XCSECURITY_SRCS = secauth.c +XDMCP_SRCS = xdmcp.c +STRLCAT_SRCS = strlcat.c strlcpy.c +XORG_SRCS = log.c + +libos_la_SOURCES = \ + WaitFor.c \ + access.c \ + auth.c \ + client.c \ + connection.c \ + io.c \ + mitauth.c \ + oscolor.c \ + osdep.h \ + osinit.c \ + reallocarray.c \ + rpcauth.c \ + timingsafe_memcmp.c \ + utils.c \ + xdmauth.c \ + xstrans.c \ + xprintf.c \ + $(XORG_SRCS) + +if XCSECURITY +libos_la_SOURCES += $(XCSECURITY_SRCS) +endif + +if XDMCP +libos_la_SOURCES += $(XDMCP_SRCS) +endif + +if NEED_STRLCAT +libos_la_SOURCES += $(STRLCAT_SRCS) +endif + +EXTRA_DIST = $(SECURERPC_SRCS) $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS) diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index c5ebeea1e6..e55b500dd5 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -152,6 +152,8 @@ static fd_set SavedAllSockets; static fd_set SavedClientsWithInput; int GrabInProgress = 0; +void RejectWellKnownSockets(void); + static void QueueNewConnections(int curconn, int ready, void *data); @@ -506,7 +508,7 @@ CreateWellKnownSockets(void) extern void _XSERVTransSocketRejectConnection(XtransConnInfo); void -RejectWellKnownSockets () +RejectWellKnownSockets (void) { int i; @@ -521,7 +523,7 @@ RejectWellKnownSockets () #else /* #ifdef NX_TRANS_SOCKET */ void -RejectWellKnownSockets () +RejectWellKnownSockets (void) { } diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c index 678bedf6c2..c9d8a27056 100644 --- a/nx-X11/programs/Xserver/os/rpcauth.c +++ b/nx-X11/programs/Xserver/os/rpcauth.c @@ -56,6 +56,15 @@ extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); #include #endif +XID SecureRPCCheck (unsigned short data_length, char *data, + ClientPtr client, char **reason); +void SecureRPCInit (void); +int SecureRPCAdd (unsigned short data_length, char *data, XID id); +int SecureRPCReset (void); +XID SecureRPCToID (unsigned short data_length, char *data); +int SecureRPCFromID (XID id, unsigned short *data_lenp, char **datap); +int SecureRPCRemove (unsigned short data_length, char *data); + static enum auth_stat why; static char * diff --git a/nx-X11/programs/Xserver/os/strlcat.c b/nx-X11/programs/Xserver/os/strlcat.c index fc137cabb5..a9b340e74f 100644 --- a/nx-X11/programs/Xserver/os/strlcat.c +++ b/nx-X11/programs/Xserver/os/strlcat.c @@ -21,6 +21,8 @@ #include #include +size_t strlcat(char *dst, const char *src, size_t siz); + /* * Appends src to string dst of size siz (unlike strncat, siz is the * full size of dst, not space left). At most siz-1 characters diff --git a/nx-X11/programs/Xserver/os/strlcpy.c b/nx-X11/programs/Xserver/os/strlcpy.c index 989d0385e9..9aa8887ea2 100644 --- a/nx-X11/programs/Xserver/os/strlcpy.c +++ b/nx-X11/programs/Xserver/os/strlcpy.c @@ -21,6 +21,8 @@ #include #include +size_t strlcpy(char *dst, const char *src, size_t siz); + /* * Copy src to string dst of size siz. At most siz-1 characters * will be copied. Always NUL terminates (unless siz == 0). diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index f9b06de2d6..418975083f 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -240,8 +240,8 @@ Bool noXvExtension = FALSE; #ifdef NX_TRANS_EXIT -void (*OsVendorStartRedirectErrorFProc)() = NULL; -void (*OsVendorEndRedirectErrorFProc)() = NULL; +void (*OsVendorStartRedirectErrorFProc)(void) = NULL; +void (*OsVendorEndRedirectErrorFProc)(void) = NULL; #endif @@ -285,6 +285,10 @@ extern char dispatchExceptionAtReset; extern Bool EnableDisableExtension(char *name, Bool enable); extern void EnableDisableExtensionError(char *name, Bool enable); +extern size_t strlcat(char *dst, const char *src, size_t siz); + +int SmartScheduleEnable (void); + OsSigHandlerPtr OsSignal(sig, handler) int sig; diff --git a/nx-X11/programs/Xserver/randr/Imakefile b/nx-X11/programs/Xserver/randr/Imakefile deleted file mode 100644 index 2e21efe4cb..0000000000 --- a/nx-X11/programs/Xserver/randr/Imakefile +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ -/* Copyright (c) 2008-2014 Oleksandr Shneyder */ -/* Copyright (c) 2011-2016 Mike Gabriel */ -/* Copyright (c) 2014-2016 Mihai Moldovan */ -/* Copyright (c) 2014-2016 Ulrich Sibiller */ -/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ -/* */ -/* nx-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of the aforementioned persons and companies. */ -/* */ -/* Redistribution and use of the present software is allowed according */ -/* to terms specified in the file LICENSE which comes in the source */ -/* distribution. */ -/* */ -/* All rights reserved. */ -/* */ -/* NOTE: This software has received contributions from various other */ -/* contributors, only the core maintainers and supporters are listed as */ -/* copyright holders. Please contact us, if you feel you should be listed */ -/* as copyright holder, as well. */ -/* */ -/**************************************************************************/ - -#include - - NULL = - - SRCS = randr.c \ - rrcrtc.c \ - rrdispatch.c \ - rrinfo.c \ - rrmode.c \ - rrmonitor.c \ - rroutput.c \ - rrpointer.c \ - rrproperty.c \ - rrprovider.c \ - rrproviderproperty.c \ - rrscreen.c \ - rrsdispatch.c \ - rrtransform.c \ - rrxinerama.c \ - $(NULL) - - OBJS = randr.o \ - rrcrtc.o \ - rrdispatch.o \ - rrinfo.o \ - rrmode.o \ - rrmonitor.o \ - rroutput.o \ - rrpointer.o \ - rrproperty.o \ - rrprovider.o \ - rrproviderproperty.o \ - rrscreen.o \ - rrsdispatch.o \ - rrtransform.o \ - rrxinerama.o \ - $(NULL) - - INCLUDES = -I../include -I../mi \ - -I../fb -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I../render \ - `pkg-config --cflags-only-I pixman-1` - -#if defined(BuildXinerama) - PNRX_DEFINES = -DXINERAMA -DPANORAMIX -#endif - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - - DEFINES = \ - $(PNRX_DEFINES) \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryTarget(randr,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(randr,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/randr/Makefile.am b/nx-X11/programs/Xserver/randr/Makefile.am new file mode 100644 index 0000000000..f9538ac23f --- /dev/null +++ b/nx-X11/programs/Xserver/randr/Makefile.am @@ -0,0 +1,26 @@ +noinst_LTLIBRARIES = librandr.la + +AM_CFLAGS = $(DIX_CFLAGS) -DNXAGENT_SERVER + +if XORG +sdk_HEADERS = randrstr.h +endif + +librandr_la_SOURCES = \ + randr.c \ + randrstr.h \ + rrcrtc.c \ + rrdispatch.c \ + rrinfo.c \ + rrmode.c \ + rrmonitor.c \ + rroutput.c \ + rrpointer.c \ + rrproperty.c \ + rrprovider.c \ + rrproviderproperty.c \ + rrscreen.c \ + rrtransform.c \ + rrsdispatch.c \ + rrxinerama.c + diff --git a/nx-X11/programs/Xserver/record/Imakefile b/nx-X11/programs/Xserver/record/Imakefile deleted file mode 100644 index 40c29fe6fa..0000000000 --- a/nx-X11/programs/Xserver/record/Imakefile +++ /dev/null @@ -1,26 +0,0 @@ - NULL = - - -#include - - SRCS = record.c set.c - OBJS = record.o set.o - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = \ - -DNDEBUG \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryObjectRule() -NormalLibraryTarget(record,$(OBJS)) -LintLibraryTarget(record,$(SRCS)) -NormalLintTarget($(SRCS)) - - -DependTarget() diff --git a/nx-X11/programs/Xserver/record/Makefile.am b/nx-X11/programs/Xserver/record/Makefile.am new file mode 100644 index 0000000000..eb4babe363 --- /dev/null +++ b/nx-X11/programs/Xserver/record/Makefile.am @@ -0,0 +1,9 @@ +noinst_LTLIBRARIES = librecord.la + +AM_CFLAGS = $(DIX_CFLAGS) + +AM_CPPFLAGS = + +librecord_la_SOURCES = record.c set.c + +EXTRA_DIST = set.h diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index 31803a2891..21584b821c 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -136,6 +136,8 @@ static int numEnabledRCAPs; } \ } +void RecordExtensionInit(void); + static int RecordDeleteContext( void * /*value*/, XID /*id*/ diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile deleted file mode 100644 index 2246a35d98..0000000000 --- a/nx-X11/programs/Xserver/render/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ - NULL = - -#include - -#if (!(defined(NXAgentServer) && NXAgentServer)) -NXAGENT_SKIP_SRCS = \ - glyph.c \ - mitrap.c \ - picture.c \ - render.c \ - $(NULL) -NXAGENT_SKIP_OBJS = \ - glyph.o \ - mitrap.o \ - picture.o \ - render.o \ - $(NULL) -#else - NX_DEFINES = -DNXAGENT_SERVER -#endif - - SRCS = animcur.c \ - filter.c \ - glyph.c \ - matrix.c \ - miindex.c \ - mipict.c \ - mirect.c \ - mitri.c \ - renderedge.c \ - $(NXAGENT_SKIP_SRCS) \ - $(NULL) - - OBJS = animcur.o \ - filter.o \ - glyph.o \ - matrix.o \ - miindex.o \ - mipict.o \ - mirect.o \ - mitri.o \ - renderedge.o \ - $(NXAGENT_SKIP_OBJS) \ - $(NULL) - - INCLUDES = -I. -I../include -I../mi \ - -I../fb -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I../Xext \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - - DEFINES = \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryTarget(render,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(render,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() - -InstallDriverSDKNonExecFile(glyphstr.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipict.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/render/Makefile.am b/nx-X11/programs/Xserver/render/Makefile.am new file mode 100644 index 0000000000..d444883739 --- /dev/null +++ b/nx-X11/programs/Xserver/render/Makefile.am @@ -0,0 +1,24 @@ +noinst_LTLIBRARIES = librender.la + +AM_CFLAGS = $(DIX_CFLAGS) + +if NXAGENT +SPECIAL = +else +SPECIAL = picture.c render.c mitrap.c +endif + + +librender_la_SOURCES = \ + animcur.c \ + filter.c \ + glyph.c \ + matrix.c \ + miindex.c \ + mipict.c \ + mirect.c \ + mitri.c \ + $(SPECIAL) \ + renderedge.c + +sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h renderedge.h diff --git a/nx-X11/programs/Xserver/render/glyph.c b/nx-X11/programs/Xserver/render/glyph.c index 93aed401bc..6a53ebb304 100644 --- a/nx-X11/programs/Xserver/render/glyph.c +++ b/nx-X11/programs/Xserver/render/glyph.c @@ -83,6 +83,8 @@ const CARD8 glyphDepths[GlyphFormatNum] = { 1, 4, 8, 16, 32 }; GlyphHashRec globalGlyphs[GlyphFormatNum]; +void GlyphExtents(int nlist, GlyphListPtr list, GlyphPtr * glyphs, BoxPtr extents); + GlyphHashSetPtr FindGlyphHashSet (CARD32 filled) { diff --git a/nx-X11/programs/Xserver/xfixes/Imakefile b/nx-X11/programs/Xserver/xfixes/Imakefile deleted file mode 100644 index 83e368488d..0000000000 --- a/nx-X11/programs/Xserver/xfixes/Imakefile +++ /dev/null @@ -1,28 +0,0 @@ -#include - - NULL = - - SRCS = cursor.c region.c saveset.c select.c xfixes.c - - OBJS = cursor.o region.o saveset.o select.o xfixes.o - - INCLUDES = -I. -I../include -I../Xext -I../fixes -I../render \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - `pkg-config --cflags-only-I pixman-1` - - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DEFINES = \ - $(NX_DEFINES) \ - $(NULL) - -NormalLibraryTarget(xfixes,$(OBJS)) -NormalLibraryObjectRule() -LintLibraryTarget(xfixes,$(SRCS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/programs/Xserver/xfixes/Makefile.am b/nx-X11/programs/Xserver/xfixes/Makefile.am new file mode 100644 index 0000000000..2a95c065ba --- /dev/null +++ b/nx-X11/programs/Xserver/xfixes/Makefile.am @@ -0,0 +1,12 @@ +noinst_LTLIBRARIES = libxfixes.la + +AM_CFLAGS = $(DIX_CFLAGS) + +libxfixes_la_SOURCES = \ + cursor.c \ + region.c \ + saveset.c \ + select.c \ + xfixes.c \ + xfixes.h \ + xfixesint.h diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile deleted file mode 100644 index 3725b25628..0000000000 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ /dev/null @@ -1,69 +0,0 @@ -#define SGIHyperOpt -#include - -#if BuildXInputExt -XKBXI_SRCS = xkbPrOtherEv.c -XKBXI_OBJS = xkbPrOtherEv.o -#endif - -#ifdef DfltDisableXKB -XKB_DISABLE = -DXKB_DFLT_DISABLED=1 -#else -XKB_DISABLE = -DXKB_DFLT_DISABLED=0 -#endif - -XKB_DDXDEFS = XkbServerDefines - -#if defined(NXAgentServer) && NXAgentServer - NX_DEFINES = -DNXAGENT_SERVER -#endif - - DDX_SRCS = ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c \ - ddxKillSrv.c ddxLEDs.c ddxVT.c ddxLoad.c \ - ddxList.c ddxDevBtn.c ddxPrivate.c - DDX_OBJS = ddxBeep.o ddxCtrls.o ddxFakeBtn.o ddxFakeMtn.o \ - ddxKillSrv.o ddxLEDs.o ddxVT.o ddxLoad.o \ - ddxList.o ddxDevBtn.o ddxPrivate.o - SRCS = xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \ - xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c \ - xkmread.c xkbtext.c xkbfmisc.c xkberrs.c maprules.c \ - XKBMisc.c XKBMAlloc.c XKBAlloc.c XKBGAlloc.c xkbout.c \ - $(XKBXI_SRCS) $(DDX_SRCS) - OBJS = xkb.o xkbUtils.o xkbEvents.o xkbAccessX.o xkbSwap.o \ - xkbLEDs.o xkbInit.o xkbActions.o xkbPrKeyEv.o \ - xkmread.o xkbtext.o xkbfmisc.o xkberrs.o maprules.o \ - XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o xkbout.o \ - $(XKBXI_OBJS) $(DDX_OBJS) - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \ - -I$(SERVERSRC)/mi $(XF86INCLUDES) \ - `pkg-config --cflags-only-I pixman-1` - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -DEFINES = $(XKB_DDXDEFS) $(NX_DEFINES) -XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(SYSTEMXKBCONFDIR)\" -DXKB_BIN_DIRECTORY=\"$(SYSTEMXKBBINDIR)\" -DXKB_DFLT_RULES_FILE=\"base\" -DXKB_DFLT_KB_LAYOUT=\"us\" -DXKB_DFLT_KB_MODEL=\"pc102\" $(XKB_DISABLE) - -NormalLibraryObjectRule() -NormalLibraryTarget(xkb,$(OBJS)) -LintLibraryTarget(xkb,$(SRCS)) -NormalLintTarget($(SRCS)) - -SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES)) - -#if BuildLibraries -#if UseConfDirForXkb -LinkConfDirectory(xkb,.,xkb,.) -ODIR = $(CONFDIR) -#else -ODIR = $(LIBDIR) -#endif -#ifdef VarDbDirectory -NDIR = $(VARDBDIR) -#else -NDIR = $(CONFDIR) -#endif -#if !UseConfDirForXkb || defined(VarDbDirectory) -LinkConfDirectoryLong(xkb,xkb,compiled,compiled,$(ODIR),$(NDIR)) -#endif -#endif - -DependTarget() diff --git a/nx-X11/programs/Xserver/xkb/Makefile.am b/nx-X11/programs/Xserver/xkb/Makefile.am new file mode 100644 index 0000000000..f07c568818 --- /dev/null +++ b/nx-X11/programs/Xserver/xkb/Makefile.am @@ -0,0 +1,50 @@ +noinst_LTLIBRARIES = libxkb.la libxkbstubs.la + +AM_CFLAGS = $(DIX_CFLAGS) \ + -DHAVE_XKB_CONFIG_H + +DDX_SRCS = \ + ddxBeep.c \ + ddxCtrls.c \ + ddxFakeBtn.c \ + ddxFakeMtn.c \ + ddxLEDs.c \ + ddxLoad.c \ + ddxList.c \ + ddxDevBtn.c + +DIX_SRCS = \ + xkb.c \ + xkbUtils.c \ + xkbEvents.c \ + xkbAccessX.c \ + xkbSwap.c \ + xkbLEDs.c \ + xkbInit.c \ + xkbActions.c \ + xkbPrKeyEv.c + +# this should be replaced by a common library or something, ideally -d +XKBFILE_SRCS = \ + maprules.c \ + xkmread.c \ + xkbtext.c \ + xkbfmisc.c \ + xkberrs.c \ + xkbout.c + +X11_SRCS = \ + XKBMisc.c \ + XKBAlloc.c \ + XKBGAlloc.c \ + XKBMAlloc.c + +XI_SRCS = xkbPrOtherEv.c + +libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \ + $(X11_SRCS) +libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c + +EXTRA_DIST = xkb.h xkbDflts.h + +xkbcompileddir = $(XKB_COMPILED_DIR) diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index 941bb40388..27b9ec3ac8 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -48,6 +48,8 @@ extern Bool noKME; /* defined in os/utils.c */ int XkbDisableLockActions = 0; +void XkbComputeCompatState(XkbSrvInfoPtr xkbi); + /***====================================================================***/ #ifndef RETURN_SHOULD_REPEAT diff --git a/nx-X11/programs/Xserver/xorg-server.m4 b/nx-X11/programs/Xserver/xorg-server.m4 new file mode 100644 index 0000000000..2d16438e17 --- /dev/null +++ b/nx-X11/programs/Xserver/xorg-server.m4 @@ -0,0 +1,48 @@ +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_DRIVER_CHECK_EXT() +# -------------------------- +# Checks for the $1 define in xorg-server.h (from the sdk). If it +# is defined, then add $1 to $REQUIRED_MODULES. + +AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "xorg-server.h" +#if !defined $1 +#error $1 not defined +#endif + ]])], + [_EXT_CHECK=yes], + [_EXT_CHECK=no]) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_CHECKING([if $1 is defined]) + AC_MSG_RESULT([$_EXT_CHECK]) + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES $2" + fi +]) diff --git a/nx-X11/programs/buildit.sh b/nx-X11/programs/buildit.sh new file mode 100755 index 0000000000..c39edded46 --- /dev/null +++ b/nx-X11/programs/buildit.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +set -x + +NULL= + +PKG_CONFIG_DEFAULT_LIBDIR=$(pkg-config --variable pc_path pkg-config) +export PKG_CONFIG_LIBDIR="../../../nxcomp:../../lib/:../../../nxcompshad:$PKG_CONFIG_DEFAULT_LIBDIR" + +SRC=./Xserver + +export CONFIGURE + +build() { + [ -d ${SRC} ] || return 0 + + OPT="$@" + + [ -e Makefile ] && make distclean + pushd "${SRC}" + + [ -e configure ] && rm -f configure + + if [ ! -e configure ]; then + ./autogen.sh $OPT || exit 1 + fi + + make + + popd +} + +export CONFFLAGS="--enable-ipv6 \ + --enable-secure-rpc \ + ${NULL}" + +export NXAGENTMODULES_LIBS="-L`pwd`/../../nxcomp/src/.libs \ + -L`pwd`/../../nxcompshad/src/.libs \ + -lXcomp -lXcompshad -lNX_X11 \ + ${NULL}" + +build $CONFFLAGS PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" || exit 1 + +( + # create the binaries at the same location imake did. Also create + # development binaries and links. + cd ${SRC} + if [ -e hw/nxagent/.libs/nxagent ]; then + ln -snf hw/nxagent/.libs/nxagent nxagent-relink + cp -f --suffix=.previous --backup=simple hw/nxagent/.libs/nxagent nxagent + patchelf --set-rpath '$ORIGIN/../../exports/lib:$ORIGIN/../../../nxcomp/src/.libs:$ORIGIN/../../../nxcompshad/src/.libs' nxagent + ln -snf nxagent x2goagent + fi +) diff --git a/nx-libs.spec b/nx-libs.spec index 408c68390a..ce08ef1518 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -29,11 +29,6 @@ BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkgconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1210 -BuildRequires: xorg-x11-util-devel -%else -BuildRequires: imake -%endif # For xkbcomp.pc. %if 0%{?suse_version} # Earlier versions don't have xkbcomp.pc at all. @@ -415,13 +410,7 @@ chmod a+x my_configure; SHLIBGLOBALSFLAGS="%{__global_ldflags}" LOCAL_LDFLAGS="%{__global_ldflags}" CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags} %{?optflags}" -IMAKE_DEFINES='' -FORCE_TIRPC='NO' -%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 -FORCE_TIRPC='YES' -%endif -IMAKE_DEFINES="-DUseTIRPC=${FORCE_TIRPC}" -make CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" IMAKE_DEFINES="${IMAKE_DEFINES}" +make CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" %install make install \ diff --git a/nxcompshad/include/Shadow.h b/nxcompshad/include/Shadow.h index c59d91eeb0..ab2ca9e6ce 100644 --- a/nxcompshad/include/Shadow.h +++ b/nxcompshad/include/Shadow.h @@ -65,7 +65,7 @@ typedef struct _ShadowOptions extern ShadowOptions NXShadowOptions; -extern void NXShadowResetOptions(); +extern void NXShadowResetOptions(void); extern int NXShadowCreate(void *, char *, char *, void **); extern void NXShadowDestroy(void);