[pubcookie-dev] WEBISO CVS update: jjminer;
webiso/pubcookie Makefile.in,1.39,1.40 configure.ac,1.36,1.37
miner at doit.wisc.edu
miner at doit.wisc.edu
Thu May 29 14:40:32 PDT 2003
Update of /usr/local/cvsroot/webiso/pubcookie
In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv4066/pubcookie
Modified Files:
Makefile.in configure.ac
Log Message:
Fixes to the Makefile so non-GNU make works (or seems to with the testing I
could do)
Added checks for IBM's xlc compiler, and an exported symbols file to include
if we are using xlc.
Index: webiso/pubcookie/Makefile.in
diff -c webiso/pubcookie/Makefile.in:1.39 webiso/pubcookie/Makefile.in:1.40
*** webiso/pubcookie/Makefile.in:1.39 Fri May 16 11:42:25 2003
--- webiso/pubcookie/Makefile.in Thu May 29 14:40:30 2003
***************
*** 4,10 ****
#
# @configure_input@
#
! # $Id: Makefile.in,v 1.39 2003/05/16 18:42:25 willey Exp $
@SET_MAKE@
--- 4,10 ----
#
# @configure_input@
#
! # $Id: Makefile.in,v 1.40 2003/05/29 21:40:30 jjminer Exp $
@SET_MAKE@
***************
*** 67,72 ****
--- 67,75 ----
$(srcdir)/configure.ac \
$(srcdir)/Makefile.in \
$(srcdir)/install-sh \
+ $(srcdir)/config.sub \
+ $(srcdir)/config.guess \
+ $(srcdir)/aclocal.m4 \
$(srcdir)/stamp-h.in
SRC_CONFIGURE_FILES=$(srcdir)/src/config.h.in \
***************
*** 228,251 ****
$(srcdir)/cgic/testform.html \
$(srcdir)/cgic/CHANGES
! VERSION := `echo @PACKAGE_VERSION@ | $(SED) "s/ /-/g" `
! BASENAME := @PACKAGE_TARNAME@
! DISTNAME := $(BASENAME)-$(VERSION)
.PHONY: all clean install dist login_server apache_module ver
all: $(builddir)/Makefile @login_server@ @apache_module@
! $(srcdir)/configure: $(srcdir)/configure.ac
cd $(srcdir) && $(RECURSIVE_FORCE_RM) $(CONFIGURE_TMP_DIRS)
$(FORCE_RM) $(srcdir)/configure
cd $(srcdir) && autoconf $(srcdir)/configure.ac > $(srcdir)/configure
$(CHMOD) +x $(srcdir)/configure
# autoheader might not change config.h.in, so touch a stamp file.
! $(srcdir)/src/config.h.in: $(srcdir)/stamp-h.in
! $(srcdir)/stamp-h.in: $(srcdir)/configure.ac
cd $(srcdir) && autoheader $(srcdir)/configure.ac
date > $(srcdir)/stamp-h.in
--- 231,254 ----
$(srcdir)/cgic/testform.html \
$(srcdir)/cgic/CHANGES
! VERSION = `echo @PACKAGE_VERSION@ | $(SED) "s/ /-/g" `
! BASENAME = @PACKAGE_TARNAME@
! DISTNAME = $(BASENAME)-$(VERSION)
.PHONY: all clean install dist login_server apache_module ver
all: $(builddir)/Makefile @login_server@ @apache_module@
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && $(RECURSIVE_FORCE_RM) $(CONFIGURE_TMP_DIRS)
$(FORCE_RM) $(srcdir)/configure
cd $(srcdir) && autoconf $(srcdir)/configure.ac > $(srcdir)/configure
$(CHMOD) +x $(srcdir)/configure
# autoheader might not change config.h.in, so touch a stamp file.
! $(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-h.in
! $(srcdir)/stamp-h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac
cd $(srcdir) && autoheader $(srcdir)/configure.ac
date > $(srcdir)/stamp-h.in
***************
*** 301,307 ****
what_is_my_ip: $(builddir)/src/what_is_my_ip.o $(LIB_OBJ)
$(CC) ${CFLAGS} -o $@ $(builddir)/src/what_is_my_ip.o $(LIB_OBJ) $(LDFLAGS)
! index.cgi: $(builddir)/cgic/libcgic.a $(LIB_OBJ) $(INDEX_OBJ)
$(CC) ${CFLAGS} -o $@ $(INDEX_OBJ) $(LIB_OBJ) $(LDFLAGS) $(LOGINLIBS)
$(builddir)/cgic/libcgic.a:
--- 304,310 ----
what_is_my_ip: $(builddir)/src/what_is_my_ip.o $(LIB_OBJ)
$(CC) ${CFLAGS} -o $@ $(builddir)/src/what_is_my_ip.o $(LIB_OBJ) $(LDFLAGS)
! $(builddir)/index.cgi: $(builddir)/cgic/libcgic.a $(LIB_OBJ) $(INDEX_OBJ)
$(CC) ${CFLAGS} -o $@ $(INDEX_OBJ) $(LIB_OBJ) $(LDFLAGS) $(LOGINLIBS)
$(builddir)/cgic/libcgic.a:
***************
*** 438,443 ****
--- 441,447 ----
mod_pubcookie.so: $(MOD_SRC) $(MOD_HEAD) $(LIB_SRC) $(LIB_HEAD) $(builddir)/src/pbc_path.h $(builddir)/src/config.h
$(APXS) -c -o mod_pubcookie.so $(CPPFLAGS) $(APACHE_DEFINES) \
+ @APXS_LDFLAGS@ \
$(LDFLAGS) $(MOD_SRC) $(LIB_SRC)
# Win32 ... Nothing here except the Dist files.
***************
*** 549,554 ****
--- 553,559 ----
$(CP) $(CGIC_FILES) $(DISTNAME)/cgic
$(CP) $(srcdir)/src/Makefile.tmpl $(DISTNAME)/src
$(CP) $(srcdir)/src/snprintf.c $(DISTNAME)/src
+ $(CP) $(srcdir)/mod_pubcookie.exp $(DISTNAME)
$(MKDIR) $(DISTNAME)/src/Win32
$(MKDIR) $(DISTNAME)/src/Win32/include
$(MKDIR) $(DISTNAME)/src/Win32/include/openssl
Index: webiso/pubcookie/configure.ac
diff -c webiso/pubcookie/configure.ac:1.36 webiso/pubcookie/configure.ac:1.37
*** webiso/pubcookie/configure.ac:1.36 Thu May 15 08:49:22 2003
--- webiso/pubcookie/configure.ac Thu May 29 14:40:30 2003
***************
*** 1,6 ****
# Process this file with autoconf to produce a configure script.
! AC_REVISION($Revision: 1.36 $)
AC_INIT(Pubcookie, [3.0.0 pre-rc2], 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.37 $)
AC_INIT(Pubcookie, [3.0.0 pre-rc2], pubcookie-dev at u.washington.edu)
AC_CONFIG_SRCDIR([src/libpubcookie.c])
AC_CONFIG_HEADER([src/config.h])
***************
*** 61,74 ****
# Checks for programs.
AC_PROG_CC
! # Fix problems where we're using gcc without gnu ld
! # (Code by Bradford L. Barrett at University of Florida)
! if test "$GCC" = "yes"; then
! GCC_LIB=`gcc -print-libgcc-file-name`
! LIBS="$LIBS -lgcc";
! LDFLAGS="$LDFLAGS -L`dirname $GCC_LIB`"
! fi
# Check to see if this is the Sun Workshop compiler.
AC_MSG_CHECKING([for Sun Workshop Compiler])
--- 61,101 ----
# Checks for programs.
AC_PROG_CC
! AC_AIX
!
! # For whatever reason AIX needs a list of exported symbols.
! AC_CANONICAL_HOST
! APXS_LDFLAGS=
!
! if test "$GCC" != "yes"; then
+ case $host in
+ *aix*)
+ # Check for IBM xlc compiler.
+
+ AC_MSG_CHECKING([for IBM xlc Compiler])
+ AC_TRY_RUN( [
+ #include <stdlib.h>
+
+ #ifndef __xlC__
+ # define __xlC__ 0
+ #endif
+
+ int main() {
+ exit( __xlC__ == 0 );
+ }
+ ],
+ [ AC_MSG_RESULT([yes])
+ APXS_LDFLAGS="-Wl,-bE:mod_pubcookie.exp"
+ AC_DEFINE( IBM_XLC, 1,
+ [Define to 1 if the Compiler is IBM xlc] )
+ IBM_XLC=1
+ ],
+ [ AC_MSG_RESULT([no])
+ ]
+ )
+ ;;
+ *sun*)
# Check to see if this is the Sun Workshop compiler.
AC_MSG_CHECKING([for Sun Workshop Compiler])
***************
*** 91,96 ****
--- 118,137 ----
[ AC_MSG_RESULT([no])
]
)
+ ;;
+ esac
+
+ fi
+
+ AC_SUBST(APXS_LDFLAGS, "$APXS_LDFLAGS")
+
+ # Fix problems where we're using gcc without gnu ld
+ # (Code by Bradford L. Barrett at University of Florida)
+ if test "$GCC" = "yes"; then
+ GCC_LIB=`gcc -print-libgcc-file-name`
+ LIBS="$LIBS -lgcc";
+ LDFLAGS="$LDFLAGS -L`dirname $GCC_LIB`"
+ fi
AC_PROG_CC_STDC
AC_PROG_INSTALL
end of message
More information about the pubcookie-dev
mailing list