diff options
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/Makefile.in | 17 | ||||
| -rw-r--r-- | xorg-server/include/do-not-use-config.h.in | 20 | ||||
| -rw-r--r-- | xorg-server/include/resource.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/xorg-config.h.in | 3 |
4 files changed, 35 insertions, 7 deletions
diff --git a/xorg-server/include/Makefile.in b/xorg-server/include/Makefile.in index caef87dcd..1420c30ed 100644 --- a/xorg-server/include/Makefile.in +++ b/xorg-server/include/Makefile.in @@ -144,6 +144,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -174,6 +175,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -184,6 +192,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -233,6 +242,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -257,6 +268,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -347,7 +360,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -450,7 +462,8 @@ AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ dix-config-apple-verbatim.h \ eventconvert.h eventstr.h \ - protocol-versions.h + protocol-versions.h \ + xsha1.h all: do-not-use-config.h xorg-server.h dix-config.h xorg-config.h xkb-config.h xwin-config.h kdrive-config.h version-config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/xorg-server/include/do-not-use-config.h.in b/xorg-server/include/do-not-use-config.h.in index 19ca8a2a8..213f5d502 100644 --- a/xorg-server/include/do-not-use-config.h.in +++ b/xorg-server/include/do-not-use-config.h.in @@ -283,9 +283,21 @@ /* Define to 1 if you have the <selinux/selinux.h> header file. */ #undef HAVE_SELINUX_SELINUX_H -/* Use libmd SHA1 functions instead of OpenSSL libcrypto */ +/* Use CommonCrypto SHA1 functions */ +#undef HAVE_SHA1_IN_COMMONCRYPTO + +/* Use libc SHA1 functions */ +#undef HAVE_SHA1_IN_LIBC + +/* Use libgcrypt SHA1 functions */ +#undef HAVE_SHA1_IN_LIBGCRYPT + +/* Use libmd SHA1 functions */ #undef HAVE_SHA1_IN_LIBMD +/* Use libsha1 for SHA1 */ +#undef HAVE_SHA1_IN_LIBSHA1 + /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 @@ -384,9 +396,6 @@ /* Build Kdrive X server */ #undef KDRIVESERVER -/* Build VESA-based kdrive servers */ -#undef KDRIVEVESA - /* Prefix to use for launchd identifiers */ #undef LAUNCHD_ID_PREFIX @@ -525,6 +534,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Support PC98 */ +#undef SUPPORT_PC98 + /* Define to 1 on systems derived from System V Release 4 */ #undef SVR4 diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index 8ed4e569e..7948af50e 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -155,7 +155,7 @@ typedef Bool (*FindComplexResType)( pointer /*cdata*/); extern _X_EXPORT RESTYPE CreateNewResourceType( - DeleteType /*deleteFunc*/); + DeleteType /*deleteFunc*/, char * /*name*/); extern _X_EXPORT RESTYPE CreateNewResourceClass(void); diff --git a/xorg-server/include/xorg-config.h.in b/xorg-server/include/xorg-config.h.in index 794de7ae3..9fe7cdef5 100644 --- a/xorg-server/include/xorg-config.h.in +++ b/xorg-server/include/xorg-config.h.in @@ -133,4 +133,7 @@ /* Use SIGIO handlers for input device events by default */ #undef USE_SIGIO_BY_DEFAULT +/* Support PC98 */ +#undef SUPPORT_PC98 + #endif /* _XORG_CONFIG_H_ */ |