[pubcookie-dev] CVS update: fox;
webiso/pubcookie configure,1.71,1.72 configure.ac,1.67,1.68
fox at washington.edu
fox at washington.edu
Thu Sep 2 16:23:11 PDT 2004
- Previous message: [pubcookie-dev] CVS update: ryanc;
keys.cpp,NONE,1.1 keys.h,NONE,1.1 PubCookieFilter.cpp,1.35,1.36
PubCookieFilter.def,1.2,1.3 PubCookieFilter.h,1.38,1.39
PubCookieFilter.rc,1.6,1.7 PubCookieFilter.vcproj,1.6,1.7
- Next message: [pubcookie-dev] configure changes for apache version
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/local/cvsroot/webiso/pubcookie
In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv23193/webiso/pubcookie
Modified Files:
configure configure.ac
Log Message:
Adding another check for apache version.
Index: webiso/pubcookie/configure
diff -c webiso/pubcookie/configure:1.71 webiso/pubcookie/configure:1.72
*** webiso/pubcookie/configure:1.71 Thu Jul 29 16:40:51 2004
--- webiso/pubcookie/configure Thu Sep 2 16:23:09 2004
***************
*** 312,318 ****
# include <unistd.h>
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS apache_module install_apache MAKE_APACHE IF_MOD no_module login_server install_login MAKE_LOGIN no_login CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP AIX_LDFLAGS need_slib_clean INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE AWK AR RM CP SED TAR GZIP MKDIR MV CHMOD TEST MAKE GMAKE PWD LS RANLIB APXS APACHE_PREFIX APACHE_INSTALLBUILDDIR APACHE_VERSION APACHE_MOD_EXT CGIC_INC CGIC_LIB CERT_DB_PATH LOGINLIBS LIBOBJS SNPRINTF_0 SNPRINTF_C MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT MOD_LIST MOD_OBJ MOD_HDR LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
--- 312,318 ----
# include <unistd.h>
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS apache_module install_apache MAKE_APACHE IF_MOD no_module login_server install_login MAKE_LOGIN no_login CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP AIX_LDFLAGS need_slib_clean INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE AWK AR RM CP SED TAR GZIP MKDIR MV CHMOD TEST MAKE GMAKE PWD LS RANLIB APXS APACHE_PREFIX APACHE_VERSION CGIC_INC CGIC_LIB CERT_DB_PATH LOGINLIBS LIBOBJS SNPRINTF_0 SNPRINTF_C MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT APACHE_INSTALLBUILDDIR APACHE_MOD_EXT MOD_LIST MOD_OBJ MOD_HDR LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
***************
*** 3760,3771 ****
echo "${ECHO_T}yes" >&6
APACHE_PREFIX=`$APXS -q PREFIX`
- APACHE_INSTALLBUILDDIR=`$APXS -q exp_installbuilddir`
!
! echo "$as_me:$LINENO: checking Apache version" >&5
echo $ECHO_N "checking Apache version... $ECHO_C" >&6
! APACHE_VERSION=
OCFLAGS=$CFLAGS
APXS_INC=`$APXS -q INCLUDEDIR`
CFLAGS="$CFLAGS -I$APXS_INC"
--- 3760,3781 ----
echo "${ECHO_T}yes" >&6
APACHE_PREFIX=`$APXS -q PREFIX`
! echo "$as_me:$LINENO: checking Apache version" >&5
echo $ECHO_N "checking Apache version... $ECHO_C" >&6
! APACHE_VERSION=
! # maybe can just ask the server
! httpd="`$APXS -q SBINDIR`/`$APXS -q TARGET`"
! if test "x$httpd" != "x"; then
! v=`$httpd -v|$SED -n -e 's/.*Apache\/\.*//p'`
! case $v in
! 1.3.*) APACHE_VERSION="1_3"
! ;;
! 2.*) APACHE_VERSION="2"
! ;;
! esac
! fi
! if test "x$APACHE_VERSION" = "x"; then
OCFLAGS=$CFLAGS
APXS_INC=`$APXS -q INCLUDEDIR`
CFLAGS="$CFLAGS -I$APXS_INC"
***************
*** 3806,3821 ****
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
APACHE_VERSION="1_3"
! APACHE_MOD_EXT="so"
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ( exit $ac_status )
-
-
-
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
--- 3816,3829 ----
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
APACHE_VERSION="1_3"
!
!
!
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
***************
*** 3856,3884 ****
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
APACHE_VERSION="2"
- APACHE_MOD_EXT="la"
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
{ { echo "$as_me:$LINENO: error: Apache version 1.3.x or 2.x is required!" >&5
echo "$as_me: error: Apache version 1.3.x or 2.x is required!" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $APACHE_VERSION" >&5
echo "${ECHO_T}$APACHE_VERSION" >&6
APACHE_VERSION=$APACHE_VERSION
- APACHE_MOD_EXT=$APACHE_MOD_EXT
-
CFLAGS=$OCFLAGS
--- 3864,3889 ----
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
APACHE_VERSION="2"
{ { echo "$as_me:$LINENO: error: Apache version 1.3.x or 2.x is required!" >&5
echo "$as_me: error: Apache version 1.3.x or 2.x is required!" >&2;}
{ (exit 1); exit 1; }; }
+ else
+ echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
fi
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
+ fi
echo "$as_me:$LINENO: result: $APACHE_VERSION" >&5
echo "${ECHO_T}$APACHE_VERSION" >&6
APACHE_VERSION=$APACHE_VERSION
CFLAGS=$OCFLAGS
***************
*** 9444,9449 ****
--- 9449,9458 ----
touch $apache_target/.deps
if test "$APACHE_VERSION" = "2"; then
+ APACHE_INSTALLBUILDDIR=`$APXS -q exp_installbuilddir`
+
+ APACHE_MOD_EXT="la"
+
MOD_LIST=$MOD_LIST
cp Makefile.in.ap2 $apache_target/Makefile.in
***************
*** 9452,9457 ****
--- 9461,9468 ----
if test "$APACHE_VERSION" = "1_3"; then
+ APACHE_MOD_EXT="so"
+
MOD_OBJ=$obj
MOD_HDR=$pch
***************
*** 10161,10169 ****
s, at RANLIB@,$RANLIB,;t t
s, at APXS@,$APXS,;t t
s, at APACHE_PREFIX@,$APACHE_PREFIX,;t t
- s, at APACHE_INSTALLBUILDDIR@,$APACHE_INSTALLBUILDDIR,;t t
s, at APACHE_VERSION@,$APACHE_VERSION,;t t
- s, at APACHE_MOD_EXT@,$APACHE_MOD_EXT,;t t
s, at CGIC_INC@,$CGIC_INC,;t t
s, at CGIC_LIB@,$CGIC_LIB,;t t
s, at CERT_DB_PATH@,$CERT_DB_PATH,;t t
--- 10172,10178 ----
***************
*** 10174,10179 ****
--- 10183,10190 ----
s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s, at MAINT@,$MAINT,;t t
+ s, at APACHE_INSTALLBUILDDIR@,$APACHE_INSTALLBUILDDIR,;t t
+ s, at APACHE_MOD_EXT@,$APACHE_MOD_EXT,;t t
s, at MOD_LIST@,$MOD_LIST,;t t
s, at MOD_OBJ@,$MOD_OBJ,;t t
s, at MOD_HDR@,$MOD_HDR,;t t
Index: webiso/pubcookie/configure.ac
diff -c webiso/pubcookie/configure.ac:1.67 webiso/pubcookie/configure.ac:1.68
*** webiso/pubcookie/configure.ac:1.67 Thu Jul 29 16:40:21 2004
--- webiso/pubcookie/configure.ac Thu Sep 2 16:23:09 2004
***************
*** 1,6 ****
# Process this file with autoconf to produce a configure script.
! AC_REVISION($Revision: 1.67 $)
AC_INIT(Pubcookie, [3.1.2 pre-beta1], pubcookie-dev at u.washington.edu)
AC_CONFIG_SRCDIR([src/libpubcookie.c])
AC_CONFIG_HEADER([src/config.h])
--- 1,6 ----
# Process this file with autoconf to produce a configure script.
! AC_REVISION($Revision: 1.68 $)
AC_INIT(Pubcookie, [3.1.2 pre-beta1], pubcookie-dev at u.washington.edu)
AC_CONFIG_SRCDIR([src/libpubcookie.c])
AC_CONFIG_HEADER([src/config.h])
***************
*** 243,252 ****
AC_MSG_RESULT([yes])
AC_SUBST(APACHE_PREFIX, `$APXS -q PREFIX`)
- AC_SUBST(APACHE_INSTALLBUILDDIR, `$APXS -q exp_installbuilddir`)
! AC_MSG_CHECKING([Apache version])
! APACHE_VERSION=
OCFLAGS=$CFLAGS
APXS_INC=`$APXS -q INCLUDEDIR`
CFLAGS="$CFLAGS -I$APXS_INC"
--- 243,263 ----
AC_MSG_RESULT([yes])
AC_SUBST(APACHE_PREFIX, `$APXS -q PREFIX`)
! AC_MSG_CHECKING([Apache version])
! APACHE_VERSION=
! # maybe can just ask the server
! httpd="`$APXS -q SBINDIR`/`$APXS -q TARGET`"
! if test "x$httpd" != "x"; then
! v=`$httpd -v|$SED -n -e 's/.*Apache\/\.*//p'`
! case $v in
! 1.3.*) APACHE_VERSION="1_3"
! ;;
! 2.*) APACHE_VERSION="2"
! ;;
! esac
! fi
! if test "x$APACHE_VERSION" = "x"; then
OCFLAGS=$CFLAGS
APXS_INC=`$APXS -q INCLUDEDIR`
CFLAGS="$CFLAGS -I$APXS_INC"
***************
*** 260,267 ****
APACHE_RELEASE < 10400000 ) != 1 );
}
],
! [APACHE_VERSION="1_3"
! APACHE_MOD_EXT="so"],
[
]
)
--- 271,277 ----
APACHE_RELEASE < 10400000 ) != 1 );
}
],
! [APACHE_VERSION="1_3"]
[
]
)
***************
*** 275,290 ****
exit( *AP_SERVER_MAJORVERSION!='2');
}
],
! [APACHE_VERSION="2"
! APACHE_MOD_EXT="la"],
[
AC_MSG_ERROR([Apache version 1.3.x or 2.x is required!])
]
)
fi
AC_MSG_RESULT([$APACHE_VERSION])
AC_SUBST(APACHE_VERSION, $APACHE_VERSION)
- AC_SUBST(APACHE_MOD_EXT, $APACHE_MOD_EXT)
CFLAGS=$OCFLAGS
--- 285,299 ----
exit( *AP_SERVER_MAJORVERSION!='2');
}
],
! [APACHE_VERSION="2"]
[
AC_MSG_ERROR([Apache version 1.3.x or 2.x is required!])
]
)
fi
+ fi
AC_MSG_RESULT([$APACHE_VERSION])
AC_SUBST(APACHE_VERSION, $APACHE_VERSION)
CFLAGS=$OCFLAGS
***************
*** 940,952 ****
touch $apache_target/.deps
if test "$APACHE_VERSION" = "2"; then
! AC_SUBST( MOD_LIST, $MOD_LIST )
cp Makefile.in.ap2 $apache_target/Makefile.in
ln -sf $apache_src_ref/modules.mk $apache_target
fi
if test "$APACHE_VERSION" = "1_3"; then
AC_SUBST( MOD_OBJ, $obj )
AC_SUBST( MOD_HDR, $pch )
--- 949,964 ----
touch $apache_target/.deps
if test "$APACHE_VERSION" = "2"; then
! AC_SUBST(APACHE_INSTALLBUILDDIR, `$APXS -q exp_installbuilddir`)
! AC_SUBST(APACHE_MOD_EXT, "la")
! AC_SUBST(MOD_LIST, $MOD_LIST )
cp Makefile.in.ap2 $apache_target/Makefile.in
ln -sf $apache_src_ref/modules.mk $apache_target
fi
if test "$APACHE_VERSION" = "1_3"; then
+ AC_SUBST(APACHE_MOD_EXT, "so")
AC_SUBST( MOD_OBJ, $obj )
AC_SUBST( MOD_HDR, $pch )
end of message
- Previous message: [pubcookie-dev] CVS update: ryanc;
keys.cpp,NONE,1.1 keys.h,NONE,1.1 PubCookieFilter.cpp,1.35,1.36
PubCookieFilter.def,1.2,1.3 PubCookieFilter.h,1.38,1.39
PubCookieFilter.rc,1.6,1.7 PubCookieFilter.vcproj,1.6,1.7
- Next message: [pubcookie-dev] configure changes for apache version
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the pubcookie-dev
mailing list