[asterisk-commits] qwell: branch qwell/pjproject-cleanup r380103 - in /team/qwell/pjproject-clea...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jan 25 11:49:25 CST 2013
Author: qwell
Date: Fri Jan 25 11:49:21 2013
New Revision: 380103
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380103
Log:
Remove some weird cross compile stuff in configure script. autoconf tools handle this.
Modified:
team/qwell/pjproject-cleanup/res/pjproject/aconfigure
team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac
team/qwell/pjproject-cleanup/res/pjproject/build/cc-auto.mak.in
team/qwell/pjproject-cleanup/res/pjproject/build/rules.mak
Modified: team/qwell/pjproject-cleanup/res/pjproject/aconfigure
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/aconfigure?view=diff&rev=380103&r1=380102&r2=380103
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/aconfigure (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/aconfigure Fri Jan 25 11:49:21 2013
@@ -649,10 +649,12 @@
CC_OUT
LIBEXT2
LIBEXT
-RANLIB
LDOUT
LD
+AR_FLAGS
+ac_ct_AR
AR
+RANLIB
ac_ct_CXX
CXXFLAGS
CXX
@@ -3468,17 +3470,204 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -z "$CROSS_COMPILE"; then
- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
-fi
-
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar gar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar gar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+
+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
if test "$LD" = ""; then LD="$CC"; fi
if test "$LDOUT" = ""; then LDOUT="-o "; fi
-
-if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
if test "$OBJEXT" = ""; then OBJEXT='o'; fi
Modified: team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac?view=diff&rev=380103&r1=380102&r2=380103
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/aconfigure.ac Fri Jan 25 11:49:21 2013
@@ -41,21 +41,15 @@
AC_PROG_CXX
AC_LANG_C
-dnl #
-dnl # Setup CROSS_COMPILE variable
-dnl #
-if test -z "$CROSS_COMPILE"; then
- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
-fi
-
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
-AC_SUBST(AR)
+AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR], [ar gar], :)
+
+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
+AC_SUBST(AR_FLAGS)
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="${CROSS_COMPILE}ranlib"; fi
-AC_SUBST(RANLIB)
if test "$OBJEXT" = ""; then OBJEXT='o'; fi
AC_SUBST(OBJEXT)
if test "$LIBEXT" = ""; then LIBEXT='a'; fi
Modified: team/qwell/pjproject-cleanup/res/pjproject/build/cc-auto.mak.in
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/build/cc-auto.mak.in?view=diff&rev=380103&r1=380102&r2=380103
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/build/cc-auto.mak.in (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/build/cc-auto.mak.in Fri Jan 25 11:49:21 2013
@@ -1,6 +1,7 @@
export CC = @CC@ -c
export CXX = @CXX@ -c
export AR = @AR@
+export AR_FLAGS = @AR_FLAGS@
export LD = @LD@
export LDOUT = -o
export RANLIB = @RANLIB@
Modified: team/qwell/pjproject-cleanup/res/pjproject/build/rules.mak
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pjproject-cleanup/res/pjproject/build/rules.mak?view=diff&rev=380103&r1=380102&r2=380103
==============================================================================
--- team/qwell/pjproject-cleanup/res/pjproject/build/rules.mak (original)
+++ team/qwell/pjproject-cleanup/res/pjproject/build/rules.mak Fri Jan 25 11:49:21 2013
@@ -72,6 +72,7 @@
@echo DEPFLAGS=$(DEPFLAGS)
@echo CC=$(CC)
@echo AR=$(AR)
+ @echo AR_FLAGS=$(AR_FLAGS)
@echo RANLIB=$(RANLIB)
print_bin: print_common
@@ -84,7 +85,7 @@
$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
- $(AR) $(LIB) $(OBJS)
+ $(AR) $(AR_FLAGS) $(LIB) $(OBJS)
$(RANLIB) $(LIB)
$(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
More information about the asterisk-commits
mailing list