httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src Makefile.in configure.in
Date Wed, 26 Apr 2000 21:08:28 GMT
rbb         00/04/26 14:08:27

  Modified:    src      Makefile.in configure.in
  Log:
  Fix the progname stuff to work the same way the rest of the configure
  scheme works.
  Submitted by:	Sascha Schumann
  Reviewed by:	Ryan Bloom
  
  Revision  Changes    Path
  1.10      +1 -1      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	2000/04/25 23:20:36	1.9
  +++ Makefile.in	2000/04/26 21:08:26	1.10
  @@ -6,7 +6,7 @@
   
   SUBDIRS = ap lib main modules os $(REGEX_DIR)
   
  -PROGRAM_NAME         = @progname@
  +PROGRAM_NAME         = $(progname)
   PROGRAM_SOURCES      = modules.c buildmark.c
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
  
  
  
  1.36      +7 -6      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- configure.in	2000/04/26 14:50:33	1.35
  +++ configure.in	2000/04/26 21:08:26	1.36
  @@ -143,6 +143,7 @@
   EXTRA_LDFLAGS="$LDFLAGS"
   LIBS=""
   LDFLAGS=""
  +APACHE_SUBST(progname)
   APACHE_SUBST(EXTRA_CFLAGS)
   APACHE_SUBST(EXTRA_LDFLAGS)
   APACHE_SUBST(EXTRA_LIBS)
  @@ -162,6 +163,11 @@
     $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache
$srcdir/ltmain.sh
   fi
   
  +AC_ARG_WITH(program-name,
  +[  --with-program-name=alternate executable name],[
  +  progname="$withval" ], [
  +  progname="httpd"] )
  +
   APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
               modules/Makefile os/Makefile)
   APACHE_FAST_GENERATE
  @@ -170,11 +176,6 @@
   rm -f $srcdir/modules.c
   echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
   
  -AC_ARG_WITH(program-name,
  -[  --with-program-name=alternate executable name],[
  -  progname="$withval" ], [
  -  progname="httpd"] )
  -
   AC_OUTPUT_COMMANDS([
   echo '/* Generated by configure */' > ${path_h}.new
   echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
  @@ -197,6 +198,6 @@
   progname=$progname
   ])
   
  -AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)
  +AC_OUTPUT($APACHE_OUTPUT_FILES)
   
   
  
  
  

Mime
View raw message