casa-mp-base

diff -Naur ../vnc_unixsrc/Xvnc/config/cf/vnclibs.def Xvnc/config/cf/vnclibs.def

--- ../vnc_unixsrc/Xvnc/config/cf/vnclibs.def   2003-05-03 09:31:55.000000000 +0000

+++ Xvnc/config/cf/vnclibs.def  2007-05-15 02:18:22.000000000 +0000

@@ -11,7 +11,7 @@

 /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */

 VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt

 #else

-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt

+VNCSYSLIBS = -L@PREFIX@/lib -ljpeg -lz

 #endif

-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include

+VNCCPPFLAGS = -I$(TOP)/../include -I@PREFIX@/include

diff -Naur ../vnc_unixsrc/Xvnc/config/imake/imakemdep.h Xvnc/config/imake/imakemdep.h

--- ../vnc_unixsrc/Xvnc/config/imake/imakemdep.h    2003-02-19 16:39:54.000000000 +0000

+++ Xvnc/config/imake/imakemdep.h   2007-05-15 03:59:11.000000000 +0000

@@ -270,8 +270,12 @@

 #define DEFAULT_CPP "cpp"

 #endif

 #ifdef __MACH__

-#define DEFAULT_CPP "/usr/bin/cpp"

-#endif

+# ifdef __APPLE__

+# define DEFAULT_CPP "::CPPCMD::"

+# else

+# define DEFAULT_CPP "/usr/bin/cpp"

+# endif /* __APPLE__ */

+#endif /* __MACH__ */

 /*

  * Step 5:  cpp_argv

@@ -555,6 +559,9 @@

    "-traditional",

    "-Demxos2",

 #endif

+#if defined(__APPLE__)

+    "-D__APPLE__",

+#endif

 };

@@ -614,6 +621,12 @@

 # define DEFAULT_OS_MINOR_REV  "r %*d.%[0-9]"

 # define DEFAULT_OS_TEENY_REV  "r %*d.%*d.%[0-9]"

 # define DEFAULT_OS_NAME   "srm %[^\n]"

+#elif defined(__APPLE__)   

+/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */

+# define DEFAULT_OS_MAJOR_REV  "r %[0-9]"

+# define DEFAULT_OS_MINOR_REV  "r %*d.%[0-9]"

+# define DEFAULT_OS_TEENY_REV  "r %*d.%*d.%[0-9]" /* this will just get 0 */

+# define DEFAULT_OS_NAME   "s %[^\n]"

 #elif defined(ISC)

 /* ISC all Versions ? */

 /* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */

@@ -923,6 +936,33 @@

 #ifdef __EMX__

    {"__EMX__", "1"},

 #endif

+#ifdef __APPLE__

+    {"__APPLE__", "1"},

+#endif

+#ifdef __MACH__

+    {"__MACH__", "1"},