Changeset 5264

Timestamp:

Mar 17, 2016 2:56:27 AM (9 years ago)

Author:

ming

Message:

Fixed #1909: GUID implementation for Android.

Thanks to Johan Lantz for the contribution.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjlib/src/pj/guid_android.c (added)

pjproject/trunk/aconfigure

@@ -5734 +5734 @@
         esac
         # UUID
-        if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
-                ac_os_objs="$ac_os_objs guid_uuid.o"
-        else
-                ac_os_objs="$ac_os_objs guid_simple.o"
-        fi
+        case $target in
+          *android*)
+                ac_os_objs="$ac_os_objs guid_android.o"
+                ;;
+          *)
+                if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+                        ac_os_objs="$ac_os_objs guid_uuid.o"
+                else
+                        ac_os_objs="$ac_os_objs guid_simple.o"
+                fi
+                ;;
+        esac
         ;;
 esac

pjproject/trunk/aconfigure.ac

@@ -456 +456 @@
         esac
         # UUID
-        if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
-                ac_os_objs="$ac_os_objs guid_uuid.o"
-        else
-                ac_os_objs="$ac_os_objs guid_simple.o"
-        fi
+        case $target in
+          *android*)
+                ac_os_objs="$ac_os_objs guid_android.o"
+                ;;
+          *)
+                if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+                        ac_os_objs="$ac_os_objs guid_uuid.o"
+                else
+                        ac_os_objs="$ac_os_objs guid_simple.o"
+                fi
+                ;;
+        esac
         ;;
 esac