Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MFH: - Determine the shared/link lib suffixes in one macro.

  • Loading branch information...
commit 276171f8715e9b32a26604a2f4aa93a1667cd36d 1 parent 22a8c31
foobar authored

Showing 3 changed files with 11 additions and 28 deletions. Show diff stats Hide diff stats

  1. +9 22 acinclude.m4
  2. +1 4 configure.in
  3. +1 2  scripts/phpize.m4
31 acinclude.m4
@@ -1877,40 +1877,27 @@ dnl Platform characteristics checks
1877 1877 dnl -------------------------------------------------------------------------
1878 1878
1879 1879 dnl
1880   -dnl PHP_SHLIB_BUILD_SUFFIX_NAME
1881   -dnl
1882   -dnl Determines link library suffix
1883   -dnl suffix can be: .so, .sl or .dylib
1884   -dnl
1885   -AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[
1886   - AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
1887   - PHP_SUBST(SHLIB_SUFFIX_NAME)
1888   - SHLIB_SUFFIX_NAME=so
1889   - case $host_alias in
1890   - *hpux*[)]
1891   - SHLIB_SUFFIX_NAME=sl
1892   - ;;
1893   - *darwin*[)]
1894   - SHLIB_SUFFIX_NAME=dylib
1895   - ;;
1896   - esac
1897   -])
1898   -
1899   -dnl
1900 1880 dnl PHP_SHLIB_SUFFIX_NAME
1901 1881 dnl
1902   -dnl Determines shared library suffix
  1882 +dnl Determines link library suffix SHLIB_SUFFIX_NAME
  1883 +dnl which can be: .so, .sl or .dylib
  1884 +dnl
  1885 +dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME
1903 1886 dnl suffix can be: .so or .sl
1904 1887 dnl
1905 1888 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
1906 1889 AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
1907   - PHP_SUBST(SHLIB_DL_SUFFIX_NAME)
  1890 + PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
  1891 + PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
  1892 + SHLIB_SUFFIX_NAME=so
1908 1893 SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
1909 1894 case $host_alias in
1910 1895 *hpux*[)]
  1896 + SHLIB_SUFFIX_NAME=sl
1911 1897 SHLIB_DL_SUFFIX_NAME=sl
1912 1898 ;;
1913 1899 *darwin*[)]
  1900 + SHLIB_SUFFIX_NAME=dylib
1914 1901 SHLIB_DL_SUFFIX_NAME=so
1915 1902 ;;
1916 1903 esac
5 configure.in
@@ -224,8 +224,7 @@ dnl -------------------------------------------------------------------------
224 224
225 225 PTHREADS_CHECK
226 226 PHP_HELP_SEPARATOR([SAPI modules:])
227   -PHP_SHLIB_SUFFIX_NAME
228   -PHP_SHLIB_BUILD_SUFFIX_NAME
  227 +PHP_SHLIB_SUFFIX_NAMES
229 228 PHP_SAPI=default
230 229 PHP_BUILD_PROGRAM
231 230
@@ -1198,8 +1197,6 @@ PHP_SUBST(SHARED_LIBTOOL)
1198 1197 PHP_SUBST(WARNING_LEVEL)
1199 1198 PHP_SUBST(PHP_FRAMEWORKS)
1200 1199 PHP_SUBST(PHP_FRAMEWORKPATH)
1201   -PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
1202   -PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
1203 1200 PHP_SUBST(INSTALL_HEADERS)
1204 1201
1205 1202 old_CC=$CC
3  scripts/phpize.m4
@@ -59,8 +59,7 @@ AC_ARG_WITH(libdir,
59 59 [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
60 60
61 61 PHP_RUNPATH_SWITCH
62   -PHP_SHLIB_SUFFIX_NAME
63   -PHP_SHLIB_BUILD_SUFFIX_NAME
  62 +PHP_SHLIB_SUFFIX_NAMES
64 63 PHP_WITH_PHP_CONFIG
65 64
66 65 PHP_BUILD_SHARED

0 comments on commit 276171f

Please sign in to comment.
Something went wrong with that request. Please try again.