aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-23 10:46:48 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 15:17:42 +0200
commit20454528656dbe98a538de7c67ce89e50841bd5f (patch)
treeba1bf29ee69e8ae391b0773161ff3baf58707761 /nx-X11/config/cf
parent26bf48bab8f6ca72d20f5375a4cbc02dbefcb359 (diff)
downloadnx-libs-20454528656dbe98a538de7c67ce89e50841bd5f.tar.gz
nx-libs-20454528656dbe98a538de7c67ce89e50841bd5f.tar.bz2
nx-libs-20454528656dbe98a538de7c67ce89e50841bd5f.zip
nxagent Xserver: Drop Kerberos code. Not used in nxagent.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/Imake.tmpl29
-rw-r--r--nx-X11/config/cf/README7
-rw-r--r--nx-X11/config/cf/X11.tmpl14
3 files changed, 1 insertions, 49 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index f40864ced..d540f418b 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -566,12 +566,6 @@ X_BYTE_ORDER = ByteOrder
#ifndef HasSecureRPC
#define HasSecureRPC NO /* if you have Secure RPC */
#endif
-#ifndef HasKrbIV
-#define HasKrbIV NO /* if you have Kerberos IV */
-#endif
-#ifndef HasKrb5
-#define HasKrb5 NO /* if you have Kerberos V5 */
-#endif
#ifndef HasLatex
#define HasLatex NO
#endif
@@ -591,27 +585,6 @@ X_BYTE_ORDER = ByteOrder
#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
#define GzipLibrary -lz
#endif
-#if HasKrbIV
-#ifndef KrbIVIncludes
-#define KrbIVIncludes /**/
-#endif
-#ifndef KrbIVLibraries
-#define KrbIVLibraries -lkrb -ldes
-#endif
-#endif
-#if HasKrb5
-#ifndef Krb5Includes
-#define Krb5Includes -I/krb5/include
-#endif
-#ifndef Krb5Libraries
-#define Krb5Libraries -L/krb5/lib -L/usr/isode/lib -lkrb5 -lcrypto -lisode -lcom_err -ldbm
-#endif
-#else
-#undef Krb5Includes
-#define Krb5Includes /**/
-#undef Krb5Libraries
-#define Krb5Libraries /**/
-#endif
#ifndef UseGnuMalloc
#define UseGnuMalloc NO
#endif
@@ -1878,7 +1851,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
STD_DEFINES = StandardDefines $(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags
EXTRA_LDOPTIONS = ExtraLoadOptions
- EXTRA_LIBRARIES = MallocLibraries ExtraLibraries Krb5Libraries
+ EXTRA_LIBRARIES = MallocLibraries ExtraLibraries
TAGS = TagsCmd
#if ConstructMFLAGS
MFLAGS = -$(MAKEFLAGS)
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 41ff36a01..0cd37245a 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -68,8 +68,6 @@ Imake.tmpl provides defaults for the following variables:
HasGnuMake use the GNU make program?
HasGhostPCL boolean for system has GhostPCL
HasGhostScript boolean for system has GhostScript
- HasKrbIV system has Kerberos version IV support?
- HasKrb5 system has Kerberos version 5 support?
HasLargeTmp boolean for system has /tmp space
HasLatex system has LaTeX document preparation software
HasLibCrypt boolean for system has libcrypt
@@ -105,10 +103,6 @@ Imake.tmpl provides defaults for the following variables:
InstPgmFlags install flags for normal programs
InstUidFlags install flags for xterm to chown /dev/ptys
InstallCmd command to install files
- KrbIVIncludes where to include KerberosIV header files from
- KrbIVLibraries where to load KerberosIV libraries from
- Krb5Includes where to include Kerberos header files from
- Krb5Libraries where to load Kerberos libraries from
LdCmd command to run loader
LdCombineFlags flags for incremental loading
LexCmd command to run lex
@@ -207,7 +201,6 @@ X11.tmpl provides defaults for the following variables:
needs Wraphelp.c, see Release Notes
InstallLibManPages boolean for installing library man pages
InstallSecurityConfig install server security policy file over old?
- KrbIVDefines defines for use with KerberosIV
LibDir directory in which to install X11 support files
LibManSuffix man suffix for library pages
LibmanDir directory in which to install library man pages
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index a40df9fa2..ce952fb68 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -739,20 +739,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef ServerOSDefines
#define ServerOSDefines /**/
#endif
-#if HasKrbIV
-#ifndef KrbIVDefines
-#define KrbIVDefines -DKERBEROS
-#endif
-#else
-#define KrbIVDefines /**/
-#endif
-#if HasKrb5
-#ifndef Krb5Defines
-#define Krb5Defines -DK5AUTH
-#endif
-#else
-#define Krb5Defines /**/
-#endif
#ifndef ServerExtraDefines
#define ServerExtraDefines /* -DPIXPRIV */
#endif