add support for separate com_err and ss libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1081 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index e63db4038cf03c71514311d17a887ead941d27ec..fef9d19e2c3eda183849c92ec69626cdb3e33646 100644 (file)
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -144,17 +144,22 @@ libdir/lib/**/libname.a:                                          @@\
             IMAKE = imake              /* assume BINDIR in path */
            DEPEND = makedepend         /* assume BINDIR in path */
         MKDIRHIER = BourneShell $(BINDIR)/mkdirhier.sh
-       COMPILE_ET = compile_et
-          MK_CMDS = mk_cmds
-            SSLIB = -lss
-        COMERRLIB = -lcom_err
 #else
             IMAKE = $(IMAKESRC)/imake
            DEPEND = DependCmd
         MKDIRHIER = BourneShell $(SCRIPTSRC)/mkdirhier.sh
-       COMPILE_ET = CompileEtCmd
-          MK_CMDS = MkCmdsCmd
+#endif
+#ifdef UseSSInstalled
+            SSLIB = -lss
+          MK_CMDS = mk_cmds
+#else
             SSLIB = SSLib
+          MK_CMDS = MkCmdsCmd
+#endif
+#ifdef UseComErrInstalled
+        COMERRLIB = -lcom_err
+       COMPILE_ET = compile_et
+#else
         COMERRLIB = ComErrLib
+       COMPILE_ET = CompileEtCmd
 #endif
-

diff --git a/src/config/site.def b/src/config/site.def
index 0204847bcad16d6a0fbd795e0e0828b8fe319d52..78c2971ad4a929f7182ef791a076c999909f3ba0 100644 (file)
--- a/src/config/site.def
+++ b/src/config/site.def
@@ -262,4 +262,11 @@
 #define IsodeLib /mit/isode/isode-6.0/@sys/lib/libisode.a
 #define IsodeDir /mit/isode/isode-6.0
 
-/* #define HasVfprintf -- turn on if you have vfprintf/vsprintf in libc */
+/* #define HasVfprintf -- turn on if you have vfprintf/vsprintf in libc
+                         (might want to be in the architecture-specific
+                          configuration file) */
+
+#define UseSSInstalled /* -- turn on if you have the SS library &c installed */
+                       
+#define UseComErrInstalled /* -- turn on if you have the com_err library
+                                &c installed */