code.vuplus.com Git - vuplus_openembedded/blob - packages/apr/apr/configure_fixes.patch

   1 --- /tmp/configure.in   2009-02-02 17:50:51.000000000 +0100
   2 +++ apr-1.2.12/configure.in     2009-02-02 17:54:55.000000000 +0100
   3 @@ -13,12 +13,11 @@
   4  dnl
   5  dnl Include our own M4 macros along with those for libtool
   6  dnl
   7 -sinclude(build/apr_common.m4)
   8 -sinclude(build/apr_network.m4)
   9 -sinclude(build/apr_threads.m4)
  10 -sinclude(build/apr_hints.m4)
  11 -sinclude(build/libtool.m4)
  12 -sinclude(build/ltsugar.m4)
  13 +#sinclude(build/apr_common.m4)
  14 +#sinclude(build/apr_network.m4)
  15 +#sinclude(build/apr_threads.m4)
  16 +#sinclude(build/apr_hints.m4)
  17 +#sinclude(build/libtool.m4)
  18
  19  dnl Hard-coded inclusion at the tail end of apr_private.h:
  20  AH_BOTTOM([
  21 @@ -197,8 +196,8 @@
  22
  23  if test "x$use_libtool" = "xyes"; then
  24        lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
  25 -      LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
  26 -      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
  27 +      LV_VERSION="-version-info `$get_version libtool $version_hdr APR`"
  28 +      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LV_LDFLAGS) \$(COMPILE) ${LV_VERSION} \$(ALL_LDFLAGS) -o \$@"
  29        so_ext='lo'
  30        lib_target='-rpath $(libdir) $(OBJECTS)'
  31        export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
  32 @@ -225,7 +224,7 @@
  33  AC_SUBST(export_lib_target)
  34  AC_SUBST(shlibpath_var)
  35  AC_SUBST(LTFLAGS)
  36 -AC_SUBST(LT_LDFLAGS)
  37 +AC_SUBST(LV_LDFLAGS)
  38
  39  dnl ----------------------------- Checks for compiler flags
  40  nl='
  41 @@ -2132,10 +2131,10 @@
  42  # against installed versions of libapr instead of those just
  43  # built.
  44  case $host in
  45 -*-apple-darwin*) LT_NO_INSTALL="" ;;
  46 -*) LT_NO_INSTALL="-no-install" ;;
  47 +*-apple-darwin*) LV_NO_INSTALL="" ;;
  48 +*) LV_NO_INSTALL="-no-install" ;;
  49  esac
  50 -AC_SUBST(LT_NO_INSTALL)
  51 +AC_SUBST(LV_NO_INSTALL)
  52
  53  #
  54  # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles