File xine-ui-various.diff of Package xine-ui

--- m4/aa.m4
+++ m4/aa.m4	2005/07/28 12:50:58
@@ -140,6 +140,22 @@
 #include <stdlib.h>
 #include <aalib.h>
 
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
 int main () {
   int major, minor;
    char *tmp_version;
@@ -147,7 +163,7 @@
   system ("touch conf.aalibtest");
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *) strdup("$min_aalib_version");
+  tmp_version = my_strdup("$min_aalib_version");
   if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
      printf("%s, bad version string\n", "$min_aalib_version");
      exit(1);
@@ -210,6 +226,22 @@
 #include <stdlib.h>
 #include <aalib.h>
 
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
 int main () {
   int major, minor;
    char *tmp_version;
@@ -217,7 +249,7 @@
   system ("touch conf.aalibtest");
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *) strdup("$min_aalib_version");
+  tmp_version = my_strdup("$min_aalib_version");
   if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
      printf("%s, bad version string\n", "$min_aalib_version");
      exit(1);
--- misc/xine-check.sh.in
+++ misc/xine-check.sh.in	2005/07/28 12:50:58
@@ -470,7 +470,16 @@
     msg found-xine 0
   fi
 else
-  msg no-xine 0
+  if search -x bin/kaffeine; then
+   xine_executables="$found"
+   if [ `echo "$xine_executables" | wc -l` -gt 1 ]; then
+     msg several-xine 1
+   else
+     msg found-xine 0
+   fi
+  else
+   msg no-xine 0
+  fi
 fi