Changeset 757 in vbox

Timestamp:

Feb 7, 2007 5:30:10 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18416

Message:

support Debian/sarge

File:

• trunk/configure (modified) (10 diffs)

trunk/configure

@@ -47 +47 @@
 LIBPTHREAD="-lpthread"
 LIBXCURSOR="-lXcursor"
-LIBX11="-lXext -lX11"
+LIBX11="-L/usr/X11R6/lib -lXext -lX11"
 INCZ=""
 LIBZ="-lz"
@@ -75 +75 @@
 function cleanup()
 {
-  rm -f .tmp_src.cc .tmp_src.c .tmp_out
+  rm -f .tmp_src.cc .tmp_src.c .tmp_out .test_execute.log
 }
 
@@ -176 +176 @@
 {
   echo "executing the binary" >> $LOG
-  log=`./.tmp_out`
+  ./.tmp_out > .test_execute.log
   rc=$?
-  echo $log | tee -a $LOG
+  cat .test_execute.log | tee -a $LOG
   if (($rc!=0)); then
     fail $1
@@ -430 +430 @@
   printf("found version %d.%d.%d",
          XALAN_VERSION_MAJOR, XALAN_VERSION_MINOR, XALAN_VERSION_REVISION);
-#if _XALAN_VERSION >= 11000
+#if _XALAN_VERSION >= 10800
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 1.10.0 or higher\n");
+  printf(", expected version 1.8.0 or higher\n");
   return 1;
 #endif
@@ -460 +460 @@
   printf("found version %d.%d.%d",
          XERCES_VERSION_MAJOR, XERCES_VERSION_MINOR, XERCES_VERSION_REVISION);
-#if _XERCES_VERSION >= 20600
+#if _XERCES_VERSION >= 20500
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 2.6.0 or higher");
+  printf(", expected version 2.5.0 or higher");
   return 1;
 #endif
@@ -656 +656 @@
 # Check for pam, needed by VRDPAuth
 # Version 79 was introduced in 9/2005, do we support older versions?
+# Debian/sarge uses 76
 #
 function check_pam()
@@ -666 +667 @@
 {
   printf("found version %d", __LIBPAM_VERSION);
-  if (__LIBPAM_VERSION >= 79)
+  if (__LIBPAM_VERSION >= 76)
   {
     printf(", OK.\n");
@@ -673 +674 @@
   else
   {
-    printf(", expected version 79 or higher\n");
+    printf(", expected version 76 or higher\n");
     return 1;
   }
@@ -725 +726 @@
 #include <cstdio>
 #include <SDL/SDL_ttf.h>
+#ifndef SDL_TTF_MAJOR_VERSION
+#define SDL_TTF_MAJOR_VERSION TTF_MAJOR_VERSION
+#define SDL_TTF_MINOR_VERSION TTF_MINOR_VERSION
+#define SDL_TTF_PATCHLEVEL    TTF_PATCHLEVEL
+#endif
 extern "C" int main(void)
 {
@@ -823 +829 @@
     cat .tmp_src.cc >> $LOG
     echo "using the following command line:" >> $LOG
-    echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"-I$q/include -L$q/lib -lqt-mt\"" >> $LOG
+    echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt" >> $LOG
     $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1
     if (($?==0)); then