Changeset 31880


Ignore:
Timestamp:
Apr 17, 2017, 2:54:44 PM (11 days ago)
Author:
brainslayer
Message:

required for cross compiling

Location:
src/router/php7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/router/php7/acinclude.m4

    r31877 r31880  
    23372337
    23382338  dnl If pkg-config is found try using it
    2339   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
    2340     if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
     2339#  if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
     2340#    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
    23412341      found_openssl=yes
    2342       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
    2343       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
    2344       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
    2345     else
    2346       AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
    2347     fi
    2348 
    2349     if test -n "$OPENSSL_LIBS"; then
    2350       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
    2351     fi
    2352     if test -n "$OPENSSL_INCS"; then
    2353       PHP_EVAL_INCLINE($OPENSSL_INCS)
    2354     fi
    2355   fi
     2342      OPENSSL_LIBS=`echo $TOP/openssl`
     2343      OPENSSL_INCS=`echo $TOP/openssl/include`
     2344#      OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     2345#    else
     2346#      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
     2347#    fi
     2348
     2349#    if test -n "$OPENSSL_LIBS"; then
     2350#      PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
     2351#    fi
     2352#    if test -n "$OPENSSL_INCS"; then
     2353#      PHP_EVAL_INCLINE($OPENSSL_INCS)
     2354#    fi
     2355 # fi
    23562356
    23572357  dnl If pkg-config fails for some reason, revert to the old method
     
    24792479  if test "$found_iconv" = "no"; then
    24802480
    2481     for i in $PHP_ICONV /usr/local /usr; do
     2481    for i in $PHP_ICONV; do
    24822482      if test -r $i/include/giconv.h; then
    24832483        AC_DEFINE(HAVE_GICONV_H, 1, [ ])
  • src/router/php7/aclocal.m4

    r31877 r31880  
    23372337
    23382338  dnl If pkg-config is found try using it
    2339   if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
    2340     if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
     2339#  if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
     2340#    if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
    23412341      found_openssl=yes
    2342       OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
    2343       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
    2344       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
    2345     else
    2346       AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
    2347     fi
    2348 
    2349     if test -n "$OPENSSL_LIBS"; then
    2350       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
    2351     fi
    2352     if test -n "$OPENSSL_INCS"; then
    2353       PHP_EVAL_INCLINE($OPENSSL_INCS)
    2354     fi
    2355   fi
     2342      OPENSSL_LIBS=`echo $TOP/openssl`
     2343      OPENSSL_INCS=`echo $TOP/openssl/include`
     2344#    else
     2345#      AC_MSG_ERROR([OpenSSL version 1.0.1 or greater required.])
     2346#    fi
     2347#
     2348#    if test -n "$OPENSSL_LIBS"; then
     2349#      PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
     2350#    fi
     2351#    if test -n "$OPENSSL_INCS"; then
     2352#      PHP_EVAL_INCLINE($OPENSSL_INCS)
     2353#    fi
     2354 # fi
    23562355
    23572356  dnl If pkg-config fails for some reason, revert to the old method
     
    24792478  if test "$found_iconv" = "no"; then
    24802479
    2481     for i in $PHP_ICONV /usr/local /usr; do
     2480    for i in $PHP_ICONV; do
    24822481      if test -r $i/include/giconv.h; then
    24832482        AC_DEFINE(HAVE_GICONV_H, 1, [ ])
  • src/router/php7/ext/iconv/config.m4

    r31877 r31880  
    1616  if test "$iconv_avail" != "no"; then
    1717    if test -z "$ICONV_DIR"; then
    18       for i in /usr/local /usr; do
     18      for i in ; do
    1919        if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
    2020          PHP_ICONV_PREFIX="$i"
     
    2323      done
    2424      if test -z "$PHP_ICONV_PREFIX"; then
    25         PHP_ICONV_PREFIX="/usr"
     25        PHP_ICONV_PREFIX=""
    2626      fi
    2727    else
Note: See TracChangeset for help on using the changeset viewer.