cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2004-07-23 Thread jfclere 
jfclere 2004/07/23 01:10:44

  Modified:jk/native2 buildconf.sh
  Log:
  Like in native: remove automake cache directory.
  
  Revision  ChangesPath
  1.9   +3 -0  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- buildconf.sh  6 Feb 2004 09:43:06 -   1.8
  +++ buildconf.sh  23 Jul 2004 08:10:44 -  1.9
  @@ -11,3 +11,6 @@
   automake --copy --add-missing
   echo autoconf
   autoconf
  +
  +echo rm autom4te.cache
  +rm -rf autom4te.cache
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh README.txt

2004-02-06 Thread jfclere 
jfclere 2004/02/06 01:43:06

  Modified:jk/native2 buildconf.sh README.txt
  Log:
  Remove the automake cache. And adjust README to the buildconf.sh location.
  
  Revision  ChangesPath
  1.8   +3 -0  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- buildconf.sh  28 May 2002 07:52:27 -  1.7
  +++ buildconf.sh  6 Feb 2004 09:43:06 -   1.8
  @@ -1,5 +1,8 @@
   #!/bin/sh
   
  +echo rm autom4te.cache
  +rm -rf autom4te.cache
  +
   echo libtoolize --force --automake --copy
   libtoolize --force --automake --copy
   echo aclocal
  
  
  
  1.5   +1 -1  jakarta-tomcat-connectors/jk/native2/README.txt
  
  Index: README.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/README.txt,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- README.txt16 Sep 2003 07:38:51 -  1.4
  +++ README.txt6 Feb 2004 09:43:06 -   1.5
  @@ -51,7 +51,7 @@
   When the APR sources are in place,  we need to create the configure scripts.  It
   is done by running the command:
   
  -./support/buildconf.sh
  +./buildconf.sh
   
   
   WARNING:
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-28 Thread jfclere 

jfclere 02/05/28 00:52:27

  Modified:jk/native2 buildconf.sh
  Log:
  automake needs the aclocal.m4 file so we have to run aclocal before automake
  
  Revision  ChangesPath
  1.7   +2 -2  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- buildconf.sh  27 May 2002 13:28:03 -  1.6
  +++ buildconf.sh  28 May 2002 07:52:27 -  1.7
  @@ -2,9 +2,9 @@
   
   echo libtoolize --force --automake --copy
   libtoolize --force --automake --copy
  -echo automake --copy --add-missing
  -automake --copy --add-missing
   echo aclocal
   aclocal
  +echo automake --copy --add-missing
  +automake --copy --add-missing
   echo autoconf
   autoconf
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-27 Thread jfclere 

jfclere 02/05/27 06:28:03

  Modified:jk/native2 buildconf.sh
  Log:
  Copy instead of symlink the libtool files.
  
  Revision  ChangesPath
  1.6   +2 -2  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buildconf.sh  24 May 2002 07:07:23 -  1.5
  +++ buildconf.sh  27 May 2002 13:28:03 -  1.6
  @@ -1,7 +1,7 @@
   #!/bin/sh
   
  -echo libtoolize --force --automake
  -libtoolize --force --automake
  +echo libtoolize --force --automake --copy
  +libtoolize --force --automake --copy
   echo automake --copy --add-missing
   automake --copy --add-missing
   echo aclocal
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-24 Thread hgomez 

hgomez  02/05/24 00:07:23

  Modified:jk/native2 buildconf.sh
  Log:
  Update buildconf.sh
  Note that we use automake not to generate makefiles
  but to copy install(s) stuff
  
  Revision  ChangesPath
  1.5   +4 -2  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildconf.sh  23 May 2002 09:00:45 -  1.4
  +++ buildconf.sh  24 May 2002 07:07:23 -  1.5
  @@ -1,7 +1,9 @@
   #!/bin/sh
   
  -echo libtoolize --force --copy
  -libtoolize --force --copy
  +echo libtoolize --force --automake
  +libtoolize --force --automake
  +echo automake --copy --add-missing
  +automake --copy --add-missing
   echo aclocal
   aclocal
   echo autoconf
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-24 Thread jean-frederic clere 

[EMAIL PROTECTED] wrote:
 
 hgomez  02/05/24 00:07:23
 
   Modified:jk/native2 buildconf.sh
   Log:
   Update buildconf.sh
   Note that we use automake not to generate makefiles
   but to copy install(s) stuff

Oops, I broke native too yesterday.

 
   Revision  ChangesPath
   1.5   +4 -2  jakarta-tomcat-connectors/jk/native2/buildconf.sh
 
   Index: buildconf.sh
   ===
   RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
   retrieving revision 1.4
   retrieving revision 1.5
   diff -u -r1.4 -r1.5
   --- buildconf.sh  23 May 2002 09:00:45 -  1.4
   +++ buildconf.sh  24 May 2002 07:07:23 -  1.5
   @@ -1,7 +1,9 @@
#!/bin/sh
 
   -echo libtoolize --force --copy
   -libtoolize --force --copy
   +echo libtoolize --force --automake
   +libtoolize --force --automake
   +echo automake --copy --add-missing
   +automake --copy --add-missing
echo aclocal
aclocal
echo autoconf
 
 
 
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-23 Thread jfclere 

jfclere 02/05/23 02:00:45

  Modified:jk/native2 buildconf.sh
  Log:
  Remove automake as we do not use it any more.
  
  Revision  ChangesPath
  1.4   +2 -4  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildconf.sh  16 May 2002 08:47:23 -  1.3
  +++ buildconf.sh  23 May 2002 09:00:45 -  1.4
  @@ -1,9 +1,7 @@
   #!/bin/sh
   
  -echo libtoolize --force --automake
  -libtoolize --force --automake
  -echo automake --copy --add-missing
  -automake --copy --add-missing
  +echo libtoolize --force --copy
  +libtoolize --force --copy
   echo aclocal
   aclocal
   echo autoconf
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh

2002-05-16 Thread hgomez 

hgomez  02/05/16 01:47:23

  Modified:jk/native2 buildconf.sh
  Log:
  use automake (even without automake.am) to make
  sure that install.sh/install-sh are copied to support
  
  Revision  ChangesPath
  1.3   +2 -4  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildconf.sh  14 May 2002 11:15:47 -  1.2
  +++ buildconf.sh  16 May 2002 08:47:23 -  1.3
  @@ -2,11 +2,9 @@
   
   echo libtoolize --force --automake
   libtoolize --force --automake
  -#echo automake -a --foreign -i
  -#automake -a --foreign -i
  +echo automake --copy --add-missing
  +automake --copy --add-missing
   echo aclocal
  -#aclocal --acdir=`aclocal --print-ac-dir`
  -#aclocal --acdir=/usr/local/share/aclocal
   aclocal
   echo autoconf
   autoconf
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh configure.in

2002-05-14 Thread hgomez 

hgomez  02/05/14 04:15:47

  Modified:jk/native2 buildconf.sh configure.in
  Log:
  Add reworked autoconf support
  
  Revision  ChangesPath
  1.2   +2 -2  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/buildconf.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildconf.sh  7 May 2002 15:55:18 -   1.1
  +++ buildconf.sh  14 May 2002 11:15:47 -  1.2
  @@ -2,8 +2,8 @@
   
   echo libtoolize --force --automake
   libtoolize --force --automake
  -echo automake -a --foreign -i
  -automake -a --foreign -i
  +#echo automake -a --foreign -i
  +#automake -a --foreign -i
   echo aclocal
   #aclocal --acdir=`aclocal --print-ac-dir`
   #aclocal --acdir=/usr/local/share/aclocal
  
  
  
  1.2   +108 -27   jakarta-tomcat-connectors/jk/native2/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configure.in  7 May 2002 15:55:18 -   1.1
  +++ configure.in  14 May 2002 11:15:47 -  1.2
  @@ -1,17 +1,15 @@
   dnl
   dnl Process this file with autoconf to produce a configure script
   dnl
  -AC_REVISION($Id: configure.in,v 1.1 2002/05/07 15:55:18 hgomez Exp $)dnl
  +AC_REVISION($Id: configure.in,v 1.2 2002/05/14 11:15:47 hgomez Exp $)dnl
   
   AC_PREREQ(2.13)
   AC_INIT(common/jk_config.c)
   AC_CONFIG_AUX_DIR(scripts/build/unix)
   
   dnl package and version. (synchronization with common/jk_version.h ?)
  -PACKAGE=mod_jk
  -VERSION=1.2.0
  -
  -AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
  +PACKAGE=mod_jk2
  +VERSION=2.0.0
   
   dnl Not sure what it does, but the libtool manual seems to require this
   dnl It should use the native platform dlopen ( if available )
  @@ -52,8 +50,19 @@
   
   APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
   WEBSERVER=
  -apache_dir=
  -apache_include=
  +APACHE_DIR=
  +APACHE_HOME=
  +APACHE_INCL=
  +APR_DIR=
  +APR_INCL=
  +APR_LDFLAGS=
  +APR_INCDIR=
  +APR_LIBDIR=
  +APR_BUILD=
  +APR_CLEAN=
  +APR_LIB_STATIC=
  +EXTRA_CFLAGS=
  +EXTRA_CPPFLAGS=
   APXS=apxs
   AC_ARG_WITH(apxs,
   [  --with-apxs[=FILE]  Build shared Apache module. FILE is the optional
  @@ -90,14 +99,15 @@
   fi
   
   dnl apache_dir and apache_include are also needed.
  -apache_dir=`$APXS -q PREFIX`
  -apache_include=-I`$APXS -q INCLUDEDIR`
  +APACHE_HOME=`$APXS -q PREFIX`
  +APACHE_INCL=-I`$APXS -q INCLUDEDIR`
   
   dnl test apache version
   APA=`${GREP} STANDARD20 ${APXS}`
   if ${TEST} -z $APA ; then
   WEBSERVER=server/apache13
   RWEBSERVER=apache-1.3
  + EXTRA_CFLAGS=`$APXS -q CFLAGS`
   else
   WEBSERVER=server/apache2
   RWEBSERVER=apache-2.0
  @@ -105,6 +115,9 @@
   JK_CHANNEL_APR_SOCKET=\${JK}jk_channel_apr_socket\${OEXT}
   JK_POOL_APR=\${JK}jk_pool_apr\${OEXT}
   HAS_APR=-DHAS_APR
  + EXTRA_CFLAGS=`$APXS -q EXTRA_CFLAGS`
  + EXTRA_CPPFLAGS=`$APXS -q EXTRA_CPPFLAGS`
  + APR_LDFLAGS=-lapr
   fi
   AC_MSG_RESULT([building connector for \$RWEBSERVER\])
   
  @@ -158,11 +171,14 @@
  if ${TEST} -z ${osdir} ; then
  osdir=os/unix
  fi
  -   apache_include=-I${withval}/src/include \
  -   -I${withval}/src/${osdir}
  -   WEBSERVER=server/apache13
  -   RWEBSERVER=apache-1.3
  -   AC_MSG_RESULT([${apache_include}, version 1.3])
  +APACHE_DIR=${withval}
  +APACHE_HOME=${withval}
  +APACHE_INCL=-I${withval}/src/include -I${withval}/src/${osdir}
  +EXTRA_CFLAGS=
  +EXTRA_CPPFLAGS=
  +WEBSERVER=server/apache13
  +RWEBSERVER=apache-1.3
  +   AC_MSG_RESULT([${APACHE_INCL}, version 1.3])
  else
  AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.])
  fi
  @@ -171,9 +187,10 @@
 # osdir for Apache20.
 WEBSERVER=server/apache2
 RWEBSERVER=apache-2.0
  -  apache_dir=${withval}
  +  APACHE_DIR=${withval}
  +  APACHE_HOME=${withval}
 apache_dir_is_src=true
  -  apache_include=-I${withval}/include -I${withval}/srclib/apr/include 
-I${withval}/os/${OS_APACHE_DIR}

cvs commit: jakarta-tomcat-connectors/jk/native2 buildconf.sh configure.in

2002-05-07 Thread hgomez 

hgomez  02/05/07 08:55:19

  Added:   jk/native2 buildconf.sh configure.in
  Log:
  First autoconf stuff, largely grabbed from the one
  in native
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/jk/native2/buildconf.sh
  
  Index: buildconf.sh
  ===
  #!/bin/sh
  
  echo libtoolize --force --automake
  libtoolize --force --automake
  echo automake -a --foreign -i
  automake -a --foreign -i
  echo aclocal
  #aclocal --acdir=`aclocal --print-ac-dir`
  #aclocal --acdir=/usr/local/share/aclocal
  aclocal
  echo autoconf
  autoconf
  
  
  
  1.1  jakarta-tomcat-connectors/jk/native2/configure.in
  
  Index: configure.in
  ===
  dnl
  dnl Process this file with autoconf to produce a configure script
  dnl
  AC_REVISION($Id: configure.in,v 1.1 2002/05/07 15:55:18 hgomez Exp $)dnl
  
  AC_PREREQ(2.13)
  AC_INIT(common/jk_config.c)
  AC_CONFIG_AUX_DIR(scripts/build/unix)
  
  dnl package and version. (synchronization with common/jk_version.h ?)
  PACKAGE=mod_jk
  VERSION=1.2.0
  
  AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
  
  dnl Not sure what it does, but the libtool manual seems to require this
  dnl It should use the native platform dlopen ( if available )
  AC_LIBTOOL_DLOPEN
  
  dnl AM_PROG_LIBTOOL often causes problems.
  dnl I have solved them once using aclocal --acdir=/usr/local/share/aclocal/
  AM_PROG_LIBTOOL
  
  AC_PROG_CC
  
  AC_PROG_LD
  
  AC_PATH_PROG(TEST,test,$PATH)dnl
  AC_SUBST(TEST)
  
  AC_PATH_PROG(RM,rm,$PATH)dnl
  AC_SUBST(RM)
  
  AC_PATH_PROG(GREP,grep,$PATH)dnl
  AC_SUBST(GREP)
  
  AC_PATH_PROG(ECHO,echo,echo,$PATH)dnl
  AC_SUBST(ECHO)
  
  AC_PATH_PROG(SED,sed,$PATH)dnl
  AC_SUBST(SED)
  
  AC_PATH_PROG(CP,cp,$PATH)dnl
  AC_SUBST(CP)
  
  AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
  AC_SUBST(MKDIR)
  
  JK_POOL_APR=
  JK_CHANNEL_APR_SOCKET=
  HAS_APR=
  
  APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
  WEBSERVER=
  apache_dir=
  apache_include=
  APXS=apxs
  AC_ARG_WITH(apxs,
  [  --with-apxs[=FILE]  Build shared Apache module. FILE is the optional
  pathname to the apxs tool; defaults to finding
apxs in your PATH.],
  [
  case ${withval} in 
  y | yes | true) find_apxs=true ;;
  n | no | false) find_apxs=false ;;
  *) find_apxs=false ;;
  esac
  
  if ${TEST} ${find_apxs} ; then
  AC_MSG_RESULT([need to check for Perl first, apxs depends on it...])
  AC_PATH_PROG(PERL,perl,$PATH)dnl
  
  if ${TEST} ${find_apxs} ; then
  APXS=${withval}
  else
  AC_PATH_PROG(APXS,apxs,$PATH)dnl
  fi
  
  if ${TEST} -n ${APXS} ; then
  dnl Seems that we have it, but have to check if it is OK first
  if ${TEST} ! -x ${APXS} ; then
  AC_MSG_ERROR(Invalid location for apxs: '${APXS}')
  fi
  
  ${APXS} -q PREFIX /dev/null 2/dev/null || apxs_support=false
  
  if ${TEST} ${apxs_support} = false ; then
  AC_MSG_RESULT(could not find ${APXS})
  AC_MSG_ERROR(You must specify a valid --with-apxs path)
  fi
  
  dnl apache_dir and apache_include are also needed.
  apache_dir=`$APXS -q PREFIX`
  apache_include=-I`$APXS -q INCLUDEDIR`
  
  dnl test apache version
  APA=`${GREP} STANDARD20 ${APXS}`
  if ${TEST} -z $APA ; then
  WEBSERVER=server/apache13
  RWEBSERVER=apache-1.3
  else
  WEBSERVER=server/apache2
  RWEBSERVER=apache-2.0
  APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
  JK_CHANNEL_APR_SOCKET=\${JK}jk_channel_apr_socket\${OEXT}
  JK_POOL_APR=\${JK}jk_pool_apr\${OEXT}
  HAS_APR=-DHAS_APR
  fi
  AC_MSG_RESULT([building connector for \$RWEBSERVER\])
  
  AC_SUBST(APXS)
  fi
  fi
  ],
  [
AC_MSG_RESULT(no apxs given)
  ])
  AC_SUBST(APACHE_CONFIG_VARS)
  
  dnl Apache-2.0 needs the os subdirectory to include os.h
  dnl this include is copy from os/config.m4
  sinclude(../../common/build/os_apache.m4)
  
  dnl it is copied from the configure of JServ ;=)
  dnl and adapted. 
  
  apache_dir_is_src=false
  AC_ARG_WITH(apache,
  [  --with-apache=DIR  Build static Apache module. DIR is the pathname 
  to the Apache source directory.],
  [
  if ${TEST} ! -z $WEBSERVER ; then
  AC_MSG_ERROR([Sorry cannot use --with-apxs=${APXS} and 
--with-apache=${withval} togother, please choose one of both])
  fi
  
  AC_MSG_CHECKING([for Apache source directory (assume static build)])
  
  if ${TEST} -n