Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23461
Modified Files:
ChangeLog configure configure.in
Log Message:
* configure.in:
* include/config.h.in:
* include/nsthread.h:
* include/nsconfig.h.in: Rename config.h nsconfig.h to prevent
clashes wth module/library config.h files.
* configure: Rebuild configure.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ChangeLog 10 Jun 2005 20:53:12 -0000 1.105
--- ChangeLog 10 Jun 2005 21:52:35 -0000 1.106
***************
*** 42,45 ****
--- 42,52 ----
2005-06-10 Stephen Deasey <sd...@us...>
+ * configure.in:
+ * include/config.h.in:
+ * include/nsthread.h:
+ * include/nsconfig.h.in: Rename config.h nsconfig.h to prevent
+ clashes wth module/library config.h files.
+ * configure: Rebuild configure.
+
* include/ns.h:
* include/nsthread.h:
Index: configure
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure 10 Jun 2005 02:42:19 -0000 1.8
--- configure 10 Jun 2005 21:52:35 -0000 1.9
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.6 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for NaviServer 4.99.0.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.7 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for NaviServer 4.99.0.
***************
*** 1321,1325 ****
! ac_config_headers="$ac_config_headers include/config.h"
--- 1321,1325 ----
! ac_config_headers="$ac_config_headers include/nsconfig.h"
***************
*** 13764,13768 ****
"include/Makefile.global" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.global" ;;
"include/Makefile.module" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.module" ;;
! "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- 13764,13768 ----
"include/Makefile.global" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.global" ;;
"include/Makefile.module" ) CONFIG_FILES="$CONFIG_FILES include/Makefile.module" ;;
! "include/nsconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/nsconfig.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Index: configure.in
===================================================================
RCS file: /cvsroot/naviserver/naviserver/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in 10 Jun 2005 02:42:19 -0000 1.7
--- configure.in 10 Jun 2005 21:52:35 -0000 1.8
***************
*** 39,43 ****
AC_INIT(NaviServer, 4.99.0, nav...@li...)
AC_CONFIG_SRCDIR(include/ns.h)
! AC_CONFIG_HEADER(include/config.h)
AC_PREREQ(2.50)
AC_REVISION($Revision$)
--- 39,43 ----
AC_INIT(NaviServer, 4.99.0, nav...@li...)
AC_CONFIG_SRCDIR(include/ns.h)
! AC_CONFIG_HEADER(include/nsconfig.h)
AC_PREREQ(2.50)
AC_REVISION($Revision$)
|
