diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
| commit | 3fb7b207726aa7500b761c7056f7dbf82ac5015d (patch) | |
| tree | ca9641fb466f01651cbbd8d619fa6da5fac32976 /aconfigure.ac | |
| parent | 49aea0237b6e2134fe31c551f21e8148c884e140 (diff) | |
Merge #1050, #1052, #1053, #1054 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/aconfigure.ac b/aconfigure.ac index 185ee0de..1e804912 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -13,6 +13,7 @@ AC_CONFIG_HEADER([pjlib/include/pj/compat/os_auto.h ]) AC_CONFIG_FILES([build.mak build/os-auto.mak + build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak @@ -33,10 +34,40 @@ fi 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) AC_SUBST(ac_build_mak_vars) case $target in @@ -487,6 +518,10 @@ if test "$enable_sound" = "no"; then true; 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" if test "`uname -r`" = "6.8"; then |