Changeset 3176

Timestamp:

May 17, 2010 4:09:12 PM (14 years ago)

Author:

bennylp

Message:

Re #1050: fixed aconfigure error caused by iPhone merging

Location:

pjproject/trunk

Files:

• aconfigure (modified) (4 diffs)
• aconfigure.ac (modified) (2 diffs)

pjproject/trunk/aconfigure

@@ -621 +621 @@
 ac_build_mak_vars
 ac_pjdir
+CC_CFLAGS
+CC_OPTIMIZE
+CC_DEF
+CC_INC
+CC_OUT
+LIBEXT2
+LIBEXT
+RANLIB
+LDOUT
+LD
+AR
 ac_ct_CXX
 CXXFLAGS
@@ -3327 +3338 @@
 
 
-if test "$AR" = ""; then AR="$(CROSS_COMPILE)ar rv"; fi
+if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
 
 if test "$LD" = ""; then LD="$CC"; fi
@@ -3333 +3344 @@
 if test "$LDOUT" = ""; then LDOUT="-o"; fi
 
-if test "$RANLIB" = ""; then RANLIB="$(CROSSCOMPILE)ranlib"; fi
+if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
 
 if test "$OBJEXT" = ""; then OBJEXT='o'; fi
@@ -5414 +5425 @@
   arm-apple-darwin*)
         LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox"
-        { echo "$as_me:$LINENO: result: Checking sound device backend... AudioUnit" >&5
-echo "${ECHO_T}Checking sound device backend... AudioUnit" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5
+$as_echo "Checking sound device backend... AudioUnit" >&6; }
         ;;
   *darwin*)

pjproject/trunk/aconfigure.ac

@@ -42 +42 @@
 AC_LANG_C
 
-if test "$AR" = ""; then AR="$(CROSS_COMPILE)ar rv"; fi
+if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
 AC_SUBST(AR)
 if test "$LD" = ""; then LD="$CC"; fi
@@ -48 +48 @@
 if test "$LDOUT" = ""; then LDOUT="-o"; fi
 AC_SUBST(LDOUT)
-if test "$RANLIB" = ""; then RANLIB="$(CROSSCOMPILE)ranlib"; fi
+if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
 AC_SUBST(RANLIB)
 if test "$OBJEXT" = ""; then OBJEXT='o'; fi