From eebb24a9960121ed3e321facaa73d050cd1b6446 Mon Sep 17 00:00:00 2001 From: swa Date: Fri, 29 Mar 2002 20:09:01 +0000 Subject: [PATCH] al's patch --- GNUmakefile.in | 44 +++++++++++++++++++++++------------- configure.in | 61 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 82 insertions(+), 23 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 3d3f7341..09213832 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.44 2002/03/29 17:42:44 gliptak Exp $ +# $Id: GNUmakefile.in,v 1.45 2002/03/29 19:45:45 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -51,20 +51,25 @@ RPM_PACKAGEV = @VERSION_RPM_PACKAGE@ # Directories for "make install" ############################################################################# -DEST = @sysconfdir@/privoxy -SBIN_DEST = @sbindir@ -MAN_DEST = @mandir@ +DEST = @prefix@ +CONFDEST = @prefix@@sysconfdir@ +SBIN_DEST = @prefix@@sbindir@ +MAN_DEST = @prefix@@mandir@ ############################################################################# # Build tools ############################################################################# -PROGRAM = privproxy@EXEEXT@ +PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip -INSTALL = cp -f +#INSTALL = cp -f +INSTALL = @INSTALL@ +INSTALL_P = -m 0750 -g @GROUP@ -o @USER@ -b +INSTALL_T = -m 0640 -g @GROUP@ -o @USER@ -b +INSTALL_D = -m 0750 -g @GROUP@ -o @USER@ -d LD = @CC@ RM = rm -f STRIP_PROG = strip @@ -83,6 +88,10 @@ MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml TARGET_OS = @host@ +#User Group paras +USER = @USER@ +GROUP = @GROUP@ + # Program to do LF->CRLF # # The sed version should be the most portable, but it doesn't for for me, @@ -631,10 +640,10 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster + $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster config.log clobber: clean - $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure + $(RM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) @@ -646,15 +655,17 @@ install: all # to be fixed! # $(STRIP_PROG) $(PROGRAM) - $(INSTALL) $(PROGRAM) $(SBIN_DEST) - mkdir -p $(DEST)/user-manual - mkdir -p $(DEST)/templates - cp -r doc/webserver/user-manual $(DEST) - cp -r templates $(DEST) - $(INSTALL) config default.action default.filter trust $(DEST) + $(INSTALL) $(INSTALL_D) $(SBIN_DEST) + $(INSTALL) $(INSTALL_D) $(DEST)/user-manual + $(INSTALL) $(INSTALL_D) $(DEST)/templates + $(INSTALL) $(INSTALL_D) $(CONFDEST) + $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST) + if [ -d "doc/webserver/user-manual" ]; then $(INSTALL) $(INSTALL_T) doc/webserver/user-manual $(DEST); fi + $(INSTALL) $(INSTALL_T) templates/[a-z]* $(DEST)/templates + $(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST) # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz - $(INSTALL) privoxy.init /etc/init.d/privoxy + $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy ############################################################################# @@ -664,6 +675,9 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.45 2002/03/29 19:45:45 swa +# for lazy swa +# # Revision 1.44 2002/03/29 17:42:44 gliptak # Correcting for Solaris tar limitations # diff --git a/configure.in b/configure.in index b6031271..53b630c4 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.51 2002/03/28 20:43:00 swa Exp $ +dnl $Id: configure.in,v 1.52 2002/03/29 19:51:40 gliptak Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.52 2002/03/29 19:51:40 gliptak +dnl Correcting compile problem with Debian +dnl dnl Revision 1.51 2002/03/28 20:43:00 swa dnl set make correctly dnl @@ -309,9 +312,9 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.51 $) +AC_REVISION($Revision: 1.52 $) AC_INIT(jcc.c) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST dodk=auto @@ -373,12 +376,12 @@ dnl Checks for programs needed to build. dnl ================================================================= AC_PROG_CC AC_PROG_CPP -dnl AC_PROG_CXX -dnl AC_PROG_INSTALL -dnl AC_PROG_LN_S +AC_PROG_CXX +AC_PROG_INSTALL +AC_PROG_LN_S AC_PROG_MAKE_SET dnl RANLIB is for PCRE: -dnl AC_PROG_RANLIB +AC_PROG_RANLIB AC_CHECK_PROG(GDB,gdb,yes,no) @@ -415,6 +418,35 @@ AC_ARG_WITH(debug, ] ) +AC_ARG_WITH(user, + [ --with-user=privoxy Set user under which privoxy run], + [ + if test "x$withval" != "xyes"; then + USER=$with_user; + else + AC_MSG_ERROR(We need a user if you give me this parameter) + fi + ], + [ + USER=privoxy; + ] +) +AC_SUBST(USER) + +AC_ARG_WITH(group, + [ --with-group=privoxy Set group for privoxy], + [ + if test "x$withval" != "xyes"; then + GROUP=$with_group; + else + AC_MSG_ERROR(We need a group if you give me this parameter) + fi + ], + [ + GROUP=privoxy; + ] +) +AC_SUBST(GROUP) dnl ================================================================= dnl additional gcc flags dnl ================================================================= @@ -787,8 +819,12 @@ dnl ================================================================= AC_EXEEXT AC_OBJEXT AC_HEADER_STDC +AC_HEADER_DIRENT AC_C_CONST AC_TYPE_SIZE_T +AC_TYPE_PID_T +AC_HEADER_TIME +AC_STRUCT_TM AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(char *, 4) AC_CHECK_SIZEOF(long, 4) @@ -798,12 +834,21 @@ AC_CHECK_SIZEOF(size_t, 4) dnl Checks for header files. dnl AC_HEADER_SYS_WAIT dnl AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/time.h unistd.h) +AC_CHECK_HEADERS([OS.h arpa/inet.h errno.h fcntl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h sys/wait.h unistd.h]) dnl Checks for library functions. dnl AC_TYPE_SIGNAL dnl AC_CHECK_FUNC(strstr) dnl bcopy and memmove are for PCRE -AC_CHECK_FUNCS(strerror bcopy memmove) +AC_CHECK_FUNCS([strerror bcopy memmove]) +AC_PROG_GCC_TRADITIONAL +dnl uncommenting does not work for swa. suse linux +dnl AC_FUNC_MALLOC +AC_FUNC_SETPGRP +AC_TYPE_SIGNAL +dnl uncommenting does not work for swa. suse linux +dnl AC_FUNC_STAT +AC_CHECK_FUNCS([atexit getcwd gethostbyaddr gethostbyname inet_ntoa localtime_r memchr memmove memset regcomp select setlocale socket strchr strdup strerror strftime strstr strtoul]) dnl ================================================================= -- 2.39.2