diff options
| author | Brian Havard <bjh@apache.org> | 2009-08-26 10:56:13 +0200 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2009-08-26 10:56:13 +0200 |
| commit | 60fbe11de19b807cbc9e372eecd3a86ceed74893 (patch) | |
| tree | 53cecd61ce8930955243e594a333d488758000b2 /configure.in | |
| parent | Update transform for core. (diff) | |
| download | apache2-60fbe11de19b807cbc9e372eecd3a86ceed74893.tar.xz apache2-60fbe11de19b807cbc9e372eecd3a86ceed74893.zip | |
Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 60 |
1 files changed, 41 insertions, 19 deletions
diff --git a/configure.in b/configure.in index 44fcf3ff0e..f7b22f1fab 100644 --- a/configure.in +++ b/configure.in @@ -227,33 +227,55 @@ APR_ADDTO(INCLUDES, $APU_INCLUDES) dnl Add in path to PCRE includes APR_ADDTO(INCLUDES, $PCRE_INCLUDES) -if test "x$LTFLAGS" = "x"; then - LTFLAGS='--silent' -fi -my_libtool=`$apr_config --apr-libtool` -LIBTOOL="$my_libtool \$(LTFLAGS)" -libtoolversion=`$my_libtool --version` -case $libtoolversion in - *1.[[45]]* | *[[2-9]].[[0-9]]*) - SH_LIBTOOL='$(LIBTOOL)' - SHLTCFLAGS="-prefer-pic" - LTCFLAGS="-prefer-non-pic -static" - ;; - *) - SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)' - SHLTCFLAGS="" - LTCFLAGS="" - ;; +echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}" + +case $host in + *os2*) + # Use a custom made libtool replacement + echo "using aplibtool" + LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool" + SH_LIBTOOL="$LIBTOOL --shared --export-all" + SH_LIBS="\$(ALL_LIBS)" + CORE_IMPLIB_FILE="ApacheCoreOS2.la" + CORE_IMPLIB="$abs_srcdir/server/$CORE_IMPLIB_FILE" + MK_IMPLIB="emximp" + other_targets="$other_targets os2core" + INSTALL_PROG_FLAGS="-e .exe" + SHLTCFLAGS="" + LTCFLAGS="" + ;; + *) + if test "x$LTFLAGS" = "x"; then + LTFLAGS='--silent' + fi + my_libtool=`$apr_config --apr-libtool` + LIBTOOL="$my_libtool \$(LTFLAGS)" + libtoolversion=`$my_libtool --version` + case $libtoolversion in + *1.[[45]]* | *[[2-9]].[[0-9]]*) + SH_LIBTOOL='$(LIBTOOL)' + SHLTCFLAGS="-prefer-pic" + LTCFLAGS="-prefer-non-pic -static" + ;; + *) + SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)' + SHLTCFLAGS="" + LTCFLAGS="" + ;; + esac + ;; esac APACHE_SUBST(SHLTCFLAGS) APACHE_SUBST(LTCFLAGS) -echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}" - case $host in *-apple-aux3*) APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) ;; + *os2-emx*) + APR_SETVAR(APACHE_MPM, [mpmt_os2]) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; *-linux-*) case `uname -r` in 2.[[2-9]]* ) |