Changeset 3175 for pjproject/trunk/aconfigure.ac

Timestamp:

May 17, 2010 1:07:39 PM (14 years ago)

Author:

ming

Message:

Merge #1050, #1052, #1053, #1054 into the main trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• aconfigure.ac (modified) (3 diffs)

pjproject/trunk/aconfigure.ac

@@ -14 +14 @@
 AC_CONFIG_FILES([build.mak 
                  build/os-auto.mak 
+                 build/cc-auto.mak
                  pjlib/build/os-auto.mak 
                  pjlib-util/build/os-auto.mak 
@@ -34 +35 @@
 CXXFLAGS="$CFLAGS $CXXFLAGS"
 
+dnl #
+dnl # Configure tools
+dnl #
 AC_PROG_CC
 AC_PROG_CXX
 AC_LANG_C
+
+if test "$AR" = ""; then AR="$(CROSS_COMPILE)ar rv"; fi
+AC_SUBST(AR)
+if test "$LD" = ""; then LD="$CC"; fi
+AC_SUBST(LD)
+if test "$LDOUT" = ""; then LDOUT="-o"; fi
+AC_SUBST(LDOUT)
+if test "$RANLIB" = ""; then RANLIB="$(CROSSCOMPILE)ranlib"; fi
+AC_SUBST(RANLIB)
+if test "$OBJEXT" = ""; then OBJEXT='o'; fi
+AC_SUBST(OBJEXT)
+if test "$LIBEXT" = ""; then LIBEXT='a'; fi
+AC_SUBST(LIBEXT)
+if test "$LIBEXT2" = ""; then LIBEXT2=""; fi
+AC_SUBST(LIBEXT2)
+if test "$CC_OUT" = ""; then CC_OUT="-o"; fi
+AC_SUBST(CC_OUT)
+if test "$CC_INC" = ""; then CC_INC="-I"; fi
+AC_SUBST(CC_INC)
+if test "$CC_DEF" = ""; then CC_DEF="-D"; fi
+AC_SUBST(CC_DEF)
+if test "$CC_OPTIMIZE" = ""; then CC_OPTIMIZE="-O2"; fi
+AC_SUBST(CC_OPTIMIZE)
+if test "$CC_CFLAGS" = ""; then CC_CFLAGS="-Wall"; fi
+AC_SUBST(CC_CFLAGS)
+
+
 
 AC_SUBST(ac_pjdir)
@@ -488 +519 @@
 else
  case $target in
+  arm-apple-darwin*)
+        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox"
+        AC_MSG_RESULT([Checking sound device backend... AudioUnit])
+        ;;
   *darwin*)
         LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox"