[srvx-commits] CVS: services configure.in,1.55,1.56

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services
In directory usw-pr-cvs1:/tmp/cvs-serv13040

Modified Files:
	configure.in 
Log Message:
unconditionally compile in modules.c, and be robust against people typing --enable-modules=mod-whatever.c


Index: configure.in
===================================================================
RCS file: /cvsroot/srvx/services/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** configure.in	13 Aug 2002 21:17:25 -0000	1.55
--- configure.in	17 Aug 2002 14:24:41 -0000	1.56
***************
*** 64,68 ****
  
  dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
! AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h,,)
  
  dnl portability stuff, hurray! -Jedi
--- 64,68 ----
  
  dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
! AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h,,)
  
  dnl portability stuff, hurray! -Jedi
***************
*** 281,284 ****
--- 281,285 ----
  
  AC_MSG_CHECKING(for extra module files)
+ MODULE_DEFINES="src/modules-list.h"
  AC_ARG_ENABLE(modules,
  [  --enable-modules=list,of,modules   Enable extra modules],
***************
*** 289,296 ****
    module_list=""
    dnl Must use a separate file because autoconf can't stand newlines in an AC_SUBSTed variable.
-   MODULE_DEFINES="src/modules-list.h"
    echo > $MODULE_DEFINES
-   touch $MODULE_DEFINES
    for module in $enableval ; do
      EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
      module_list="$module_list $module"
--- 290,296 ----
    module_list=""
    dnl Must use a separate file because autoconf can't stand newlines in an AC_SUBSTed variable.
    echo > $MODULE_DEFINES
    for module in $enableval ; do
+     module=`echo $module | sed -e s/^mod-// -e s/\.c\$//`
      EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
      module_list="$module_list $module"
***************
*** 299,307 ****
    done
    IFS="$OIFS"
!   MODULE_OBJS="$MODULE_OBJS modules.\$(OBJEXT) $EXTRA_MODULE_OBJS"
    AC_DEFINE(EXTRA_MODULES, 1, [Define if there are extra modules to be initialized.])
    AC_MSG_RESULT($module_list)
  ],
  [
    AC_MSG_RESULT(none)
  ])
--- 299,308 ----
    done
    IFS="$OIFS"
!   MODULE_OBJS="$MODULE_OBJS $EXTRA_MODULE_OBJS"
    AC_DEFINE(EXTRA_MODULES, 1, [Define if there are extra modules to be initialized.])
    AC_MSG_RESULT($module_list)
  ],
  [
+   echo > $MODULE_DEFINES
    AC_MSG_RESULT(none)
  ])