php-shared.patch

   1 diff -urN php-4_2_0RC3.org/Makefile.in php-4_2_0RC3/Makefile.in
   2 --- php-4_2_0RC3.org/Makefile.in        Sat Apr 13 01:18:28 2002
   3 +++ php-4_2_0RC3/Makefile.in    Sat Apr 13 01:56:27 2002
   4 @@ -2,40 +2,67 @@
   5  ZEND_DIR = $(srcdir)/Zend
   6  SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)
   7
   8 -LTLIBRARY_NAME = libphp4.la
   9 -LTLIBRARY_SOURCES = stub.c
  10 -
  11 -LTLIBRARY_DEPENDENCIES = \
  12 +libexec_LTLIBRARIES = libphp_common.la libphp4.la
  13 +libphp4_la_NAME = libphp4.la
  14 +libphp_common_la_NAME = libphp_common.la
  15 +libphp4_la_SOURCES = stub.c
  16 +libphp_la_common_SOURCES = stub.c
  17 +
  18 +libphp4_la_DEPENDENCIES = \
  19 +               libphp_common.la \
  20 +               sapi/$(PHP_SAPI)/libsapi.la
  21 +
  22 +libphp_common_la_DEPENDENCIES = \
  23                 Zend/libZend.la \
  24 -               sapi/$(PHP_SAPI)/libsapi.la \
  25                 main/libmain.la \
  26                 $(REGEX_LIB) \
  27                 $(EXT_LTLIBS) \
  28                 $(TSRM_LIB)
  29
  30 -LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
  31 -LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)
  32 +libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
  33 +libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
  34
  35  PROGRAM_NAME         = php
  36  PROGRAM_SOURCES      = stub.c
  37 -PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
  38 +PROGRAM_LDADD        = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD)
  39  PROGRAM_LDFLAGS      = -export-dynamic
  40  PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
  41
  42 -targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
  43 +targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM)
  44
  45  install_targets = install-sapi install-modules
  46
  47  include $(top_srcdir)/build/rules.mk
  48 -include $(top_srcdir)/build/library.mk
  49  include $(top_srcdir)/build/program.mk
  50
  51 +libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release $(PHP_VERSION) -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
  52 +libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
  53 +
  54 +libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
  55 +
  56 +$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
  57 +       $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD)
  58 +
  59 +libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X)
  60 +
  61 +$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES)
  62 +       $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD)
  63 +
  64  install-sapi:
  65 -       @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
  66 +       @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
  67 +       @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
  68         -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
  69         -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
  70                 for i in 0.0.0 0.0 0; do \
  71                         if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
  72 +                               break;  \
  73 +                       fi; \
  74 +               done; \
  75 +       fi
  76 +       -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
  77 +               for i in 0.0.0 0.0 0; do \
  78 +                       if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
  79 +                               $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
  80                                 $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
  81                                 break; \
  82                         fi; \