[BACK]Return to acinclude.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php

Diff for /embedaddon/php/acinclude.m4 between versions 1.1.1.2 and 1.1.1.4.2.1

version 1.1.1.2, 2012/05/29 12:34:34 version 1.1.1.4.2.1, 2013/10/14 08:17:37
Line 66  AC_DEFUN([PHP_EXPAND_PATH],[ Line 66  AC_DEFUN([PHP_EXPAND_PATH],[
     $2=$1      $2=$1
   else    else
     changequote({,})      changequote({,})
    ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"    ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
     changequote([,])      changequote([,])
    ep_realdir="`(cd \"$ep_dir\" && pwd)`"    ep_realdir=`(cd "$ep_dir" && pwd)`
    $2="$ep_realdir/`basename \"$1\"`"    $2="$ep_realdir"/`basename "$1"`
   fi    fi
 ])  ])
   
Line 1820  AC_TRY_COMPILE([ Line 1820  AC_TRY_COMPILE([
 ])  ])
   
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
dnl Library/function existance and build sanity checksdnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
   
 dnl  dnl
Line 2330  AC_DEFUN([PHP_SETUP_OPENSSL],[ Line 2330  AC_DEFUN([PHP_SETUP_OPENSSL],[
       AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])        AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
     fi      fi
   
    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then    if test -n "$OPENSSL_LIBS"; then
       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)        PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
       fi
       if test -n "$OPENSSL_INCS"; then
       PHP_EVAL_INCLINE($OPENSSL_INCS)        PHP_EVAL_INCLINE($OPENSSL_INCS)
     fi      fi
   fi    fi
Line 2437  AC_DEFUN([PHP_SETUP_ICONV], [ Line 2439  AC_DEFUN([PHP_SETUP_ICONV], [
   dnl    dnl
   dnl Check libc first if no path is provided in --with-iconv    dnl Check libc first if no path is provided in --with-iconv
   dnl    dnl
   
   if test "$PHP_ICONV" = "yes"; then    if test "$PHP_ICONV" = "yes"; then
       dnl Reset LIBS temporarily as it may have already been included
       dnl -liconv in.
       LIBS_save="$LIBS"
       LIBS=
     AC_CHECK_FUNC(iconv, [      AC_CHECK_FUNC(iconv, [
       found_iconv=yes        found_iconv=yes
     ],[      ],[
Line 2447  AC_DEFUN([PHP_SETUP_ICONV], [ Line 2454  AC_DEFUN([PHP_SETUP_ICONV], [
         found_iconv=yes          found_iconv=yes
       ])        ])
     ])      ])
       LIBS="$LIBS_save"
   fi    fi
   
   dnl    dnl
Line 2905  dnl providerdesc Line 2913  dnl providerdesc
 dnl header-file  dnl header-file
   ac_hdrobj=$2    ac_hdrobj=$2
   
dnl Add providerdesc.o into global objects when neededdnl Add providerdesc.o or .lo into global objects when needed
   case $host_alias in    case $host_alias in
   *freebsd*)    *freebsd*)
     PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"      PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     PHP_LDFLAGS="$PHP_LDFLAGS -lelf"      PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
     ;;      ;;
   *solaris*)    *solaris*)
    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
     ;;      ;;
     *linux*)
       PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
       ;;
   esac    esac
   
 dnl DTrace objects  dnl DTrace objects
Line 2939  dnl DTrace objects Line 2950  dnl DTrace objects
   esac    esac
   
 dnl Generate Makefile.objects entries  dnl Generate Makefile.objects entries
   dnl The empty $ac_provsrc command stops an implicit circular dependency
   dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
   cat>>Makefile.objects<<EOF    cat>>Makefile.objects<<EOF
   
   $abs_srcdir/$ac_provsrc:;
   
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc  $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
        dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@        CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
   
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj  \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
   
   EOF
   
     case $host_alias in
     *solaris*|*linux*)
       dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
       dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
       dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
       dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
       for ac_lo in $PHP_DTRACE_OBJS; do
         dtrace_lib_objs="[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
       done;
   dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
       cat>>Makefile.objects<<EOF
   $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
           echo "[#] Generated by Makefile for libtool" > \$[]@
           @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
           if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
             echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
           else [\\]
             echo "pic_object='none'" >> \$[]@ [;\\]
           fi
           if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
             echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
           else [\\]
             echo "non_pic_object='none'" >> \$[]@ [;\\]
           fi
   
   EOF
   
       ;;
     *)
   cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)  $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
        dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs        CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
   
 EOF  EOF
       ;;
     esac
 ])  ])
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>