Attachment 157560 Details for Bug 245212 – diffs

[patch] diffs

cvsdiffs (text/plain), 5.10 KB, created by Rich Megginson on 2007-06-21 17:57:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-21 17:57:55 UTC

Size: 5.10 KB

patch

obsolete

>Index: mod_admserv/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
>retrieving revision 1.16
>diff -u -8 -r1.16 Makefile.am
>--- mod_admserv/Makefile.am	11 May 2007 19:46:36 -0000	1.16
>+++ mod_admserv/Makefile.am	21 Jun 2007 17:54:59 -0000
>@@ -1,32 +1,34 @@
> # The directory in which the module is installed -
> # relative to libdir - apxs will ignore this though
> moddir = $(libdir)@moddir@
> 
>+LIBCSTD=@LIBCSTD@
>+LIBCRUN=@LIBCRUN@
>+
>+# this is just a dummy to make automake define
>+# the CXXLINK macro
>+if CXXLINK_REQUIRED
>+noinst_PROGRAMS = dummy
>+dummy_SOURCES = dummy.cpp
>+dummy_LINK = $(CXXLINK)
>+endif
>+
> ## This is the shared library to be built
> mod_LTLIBRARIES = mod_admserv.la
> 
> ## Define the source file for the module
> mod_admserv_la_SOURCES = mod_admserv.c
>+mod_admserv_la_CPPFLAGS = $(AM_CPPFLAGS) -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ @extra_cppflags@
> mod_admserv_la_LDFLAGS = -module -avoid-version
>-
>-## Set the includes and libraries needed
>-INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
>-
>-LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap@ldapsdk_ver@ -lprldap@ldapsdk_ver@ -lldap@ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4
>-
>-EXTRA_CPPFLAGS=@extra_cppflags@
>+mod_admserv_la_LIBADD = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap@ldapsdk_ver@ -lprldap@ldapsdk_ver@ -lldap@ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBCSTD) $(LIBCRUN)
>+if CXXLINK_REQUIRED
>+mod_admserv_la_LINK = $(CXXLINK) $(mod_admserv_la_LDFLAGS)
>+endif
> 
> # if this module is being built as part of adminserver,
> # just do the regular install - otherwise, if standalone,
> # let apxs install this module into apache
> if !HAVE_ADMINSERVER
> install-libLTLIBRARIES: mod_admserv.la
> 	@APXS@ -i -a -n admserv mod_admserv.la
> endif
>-
>-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
>-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>-	$(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS)
>-
>-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
>-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
>Index: mod_admserv/configure.in
>===================================================================
>RCS file: /cvs/dirsec/mod_admserv/configure.in,v
>retrieving revision 1.21
>diff -u -8 -r1.21 configure.in
>--- mod_admserv/configure.in	17 May 2007 16:04:19 -0000	1.21
>+++ mod_admserv/configure.in	21 Jun 2007 17:54:59 -0000
>@@ -12,32 +12,65 @@
> AC_HEADER_STDC
> AC_CHECK_HEADERS( \
> unistd.h
> )
> 
> # Check for typedefs, structures, and compiler characteristics.
> AC_C_CONST
> 
>+CXXLINK_REQUIRED=0
>+# Deal with platform dependent defines
>+case $host in
>+  *-*-linux*)
>+    platform_defs="-DXP_UNIX"
>+    platform="linux"
>+    ;;
>+  ia64-hp-hpux*)
>+    platform_defs="-DXP_UNIX"
>+    platform="hpux"
>+    ;;
>+  hppa*-hp-hpux*)
>+    platform_defs="-DXP_UNIX"
>+    platform="hpux"
>+    ;;
>+  sparc-sun-solaris*)
>+    platform_defs="-DXP_UNIX"
>+    platform="solaris"
>+dnl Cstd and Crun are required to link any C++ related code (ICU)
>+    LIBCSTD=-lCstd
>+    AC_SUBST([LIBCSTD], [$LIBCSTD])
>+    LIBCRUN=-lCrun
>+    AC_SUBST([LIBCRUN], [$LIBCRUN])
>+    CXXLINK_REQUIRED=1
>+    ;;
>+  *)
>+    platform_defs=""
>+    platform=""
>+    ;;
>+esac
>+AC_SUBST([platform_defs])
>+AM_CONDITIONAL(CXXLINK_REQUIRED,test "$CXXLINK_REQUIRED" = 1)
>+
> AC_CHECKING(for apr-config)
> # check for --with-apr-config
> AC_MSG_CHECKING(for --with-apr-config)
> AC_ARG_WITH(apr-config, [  --with-apr-config       Use apr-config to determine the APR directory],
> [
>   if test -x "$withval"
>   then
>     AC_MSG_RESULT([using $withval])
>     APR_CONFIG=$withval
>   fi
> ],
> AC_MSG_RESULT(no))
> 
> if test -z "$APR_CONFIG" ; then
>   AC_MSG_CHECKING(for apr-1-config and apr-config)
>-  AC_PATH_PROGS(APR_CONFIG, apr-1-config apr-config, NO_APR_CONFIG, [$PATH:/usr/local/apache/sbin:/usr/sbin])
>+  AC_PATH_PROGS(APR_CONFIG, apr-1-config apr-config, NO_APR_CONFIG, [$PATH:/opt/fortitude/bin:/usr/local/apache/sbin:/usr/sbin])
> fi
> 
> if test -n "$APR_CONFIG"; then
>   AC_MSG_RESULT([using $APR_CONFIG. Use --with-apr-config to specify another.])
>   apr_inc=`$APR_CONFIG --includes`
> else
>   AC_MSG_ERROR([neither apr-config nor apr-1-config were not found. use --with-apr-config to specify it.])
> fi
>@@ -57,18 +90,18 @@
>     AC_MSG_ERROR([$withval not found or not executable])
>   fi
> ],
> AC_MSG_RESULT(no))
> 
> # if no apxs found yet, check /usr/local/apache/sbin
> # since it's the default Apache location
> if test -z "$APXS"; then
>-  AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin and /usr/sbin)
>-  AC_PATH_PROG(APXS, apxs, NO_APXS, [/usr/local/apache/sbin:/usr/sbin:$PATH])
>+  AC_MSG_CHECKING(for apxs in /opt/fortitude/sbin /usr/local/apache/sbin and /usr/sbin)
>+  AC_PATH_PROG(APXS, apxs, NO_APXS, [/opt/fortitude/sbin:/usr/local/apache/sbin:/usr/sbin:$PATH])
>   if test -x $APXS; then
>     AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.])
>   else
>     AC_MSG_RESULT(no)
>   fi
> fi
> 
> # and finally

Actions: View | Diff

Attachments on bug 245212: 157560 | 157577 | 157587