php-shared.patch

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