diff options
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/aconfigure.ac b/aconfigure.ac index 58f1c1a..75aa01b 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -41,21 +41,15 @@ AC_PROG_CC 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 +AC_PROG_RANLIB +AC_CHECK_TOOLS([AR], [ar gar], :) -if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi -AC_SUBST(AR) +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 @@ -120,6 +114,7 @@ AC_CHECK_LIB(winmm,puts) AC_CHECK_LIB(socket,puts) AC_CHECK_LIB(rt,puts) AC_CHECK_LIB(nsl,puts) +AC_CHECK_LIB(m,sin) AC_CHECK_LIB(uuid,uuid_generate) AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1]) @@ -192,7 +187,6 @@ AC_ARG_ENABLE(floating-point, [ AC_DEFINE(PJ_HAS_FLOATING_POINT,1) AC_MSG_RESULT([Checking if floating point is disabled... no]) - AC_CHECK_LIB(m,fmod) ]) |