Index: php-4.0.4pl1/configure
diff -c php-4.0.4pl1/configure:1.1 php-4.0.4pl1/configure:1.2
*** php-4.0.4pl1/configure:1.1	Fri Mar  2 12:56:52 2001
--- php-4.0.4pl1/configure	Fri Mar  2 14:43:32 2001
***************
*** 47155,47160 ****
--- 47155,47161 ----
  test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
  test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
  test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ test "$with_apxs" = yes && libtool_flags="$libtool_flags --with-apxs"
  
  
  # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
Index: php-4.0.4pl1/ltconfig
diff -c php-4.0.4pl1/ltconfig:1.1.1.1 php-4.0.4pl1/ltconfig:1.2
*** php-4.0.4pl1/ltconfig:1.1.1.1	Fri Mar  2 12:56:52 2001
--- php-4.0.4pl1/ltconfig	Fri Mar  2 14:44:15 2001
***************
*** 198,203 ****
--- 198,204 ----
  verify_host=yes
  with_gcc=no
  with_gnu_ld=no
+ with_apxs=no
  need_locks=yes
  ac_ext=c
  objext=o
***************
*** 257,262 ****
--- 258,264 ----
      --version              output version information and exit
      --with-gcc             assume that the GNU C compiler will be used
      --with-gnu-ld          assume that the C compiler uses the GNU linker
+     --with-apxs            build an Apache DSO
      --disable-lock         disable file locking
      --cache-file=FILE      configure cache file
  
***************
*** 297,302 ****
--- 299,305 ----
  
    --with-gcc) with_gcc=yes ;;
    --with-gnu-ld) with_gnu_ld=yes ;;
+   --with-apxs) with_apxs=yes ;;
  
    --disable-lock) need_locks=no ;;
  
***************
*** 1304,1312 ****
        shared_flag='${wl}-bM:SRE'
        hardcode_direct=yes
      fi
!     allow_undefined_flag=' ${wl}-berok'
!     archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!     archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
      case "$host_os" in aix4.[01]|aix4.[01].*)
        # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
        always_export_symbols=yes ;;
--- 1307,1322 ----
        shared_flag='${wl}-bM:SRE'
        hardcode_direct=yes
      fi
!     # When building a DSO, the binder needs to know where to resolve
!     # the Apache functions.
!     if test "$with_apxs" = "yes" ; then
!         archive_cmds="\$LD"' -o $objdir/$soname $libobjs $deplibs $linkopts -bexpall -bnoentry -H512 -T512 -bI:php.imp -bhalt:4 -bM:SRE'
!         archive_expsym_cmds="\$LD"' -o $objdir/$soname $libobjs $deplibs $linkopts $-bE:$export_symbols -bnoentry -H512 -T512 -bI:php.imp -bhalt:4 -bM:SRE'
!     else
!         allow_undefined_flag=' ${wl}-berok'
!         archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!         archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!     fi
      case "$host_os" in aix4.[01]|aix4.[01].*)
        # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
        always_export_symbols=yes ;;