removed no longer needed define for WITH_THREAD_POOL

diff --git a/Make.inc.in b/Make.inc.in
index 390606a..9b16bdf 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -60,4 +60,7 @@ SNMP_LIBS     = @SNMP_LIBS@
 SQL_ODBC_LIBS = @ODBC_LIBS@
 SQL_ODBC_INCLUDE = @ODBC_INCLUDE@
 
+RADIUSD_MAJOR_VERSION  = @RADIUSD_MAJOR_VERSION@
+RADIUSD_MINOR_VERSION  = @RADIUSD_MINOR_VERSION@
 RADIUSD_VERSION                = @RADIUSD_VERSION@
+

diff --git a/configure b/configure
index 982b972..42ba4bc 100755 (executable)
--- a/configure
+++ b/configure
@@ -562,7 +562,7 @@ fi
 
 
 
-# From configure.in Revision: 1.132 
+# From configure.in Revision: 1.133 
 RADIUSD_MAJOR_VERSION=0
 RADIUSD_MINOR_VERSION=5
 RADIUSD_VERSION="${RADIUSD_MAJOR_VERSION}.${RADIUSD_MINOR_VERSION}"
@@ -4230,12 +4230,6 @@ if test "$WITH_THREAD_POOL" = "yes"; then
     { echo "configure: error: You must have threading libraries for thread pools to work." 1>&2; exit 1; }
   fi
 
-  if test "$WITH_THREAD_POOL" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define WITH_THREAD_POOL 1
-EOF
-
-  fi
 fi
 
 
@@ -4258,6 +4252,8 @@ USE_STATIC_LIBS=$enable_static
 
 
 
+
+
 export CFLAGS LIBS
 
 trap '' 1 2 15
@@ -4451,6 +4447,8 @@ s%@INSTALLSTRIP@%$INSTALLSTRIP%g
 s%@USE_SHARED_LIBS@%$USE_SHARED_LIBS%g
 s%@USE_STATIC_LIBS@%$USE_STATIC_LIBS%g
 s%@STATIC_MODULES@%$STATIC_MODULES%g
+s%@RADIUSD_MAJOR_VERSION@%$RADIUSD_MAJOR_VERSION%g
+s%@RADIUSD_MINOR_VERSION@%$RADIUSD_MINOR_VERSION%g
 s%@RADIUSD_VERSION@%$RADIUSD_VERSION%g
 
 CEOF

diff --git a/configure.in b/configure.in
index bd47c98..b00231a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -671,13 +671,6 @@ if test "$WITH_THREAD_POOL" = "yes"; then
     AC_MSG_ERROR(You must have threading libraries for thread pools to work.)
   fi
 
-dnl #
-dnl #  Finally, after all of the checks above, we see if
-dnl #  we can REALLY use the thread pools.
-dnl #
-  if test "$WITH_THREAD_POOL" = "yes"; then
-    AC_DEFINE(WITH_THREAD_POOL,1)
-  fi
 fi
 
 dnl #############################################################
@@ -715,6 +708,8 @@ AC_SUBST(USE_SHARED_LIBS)
 USE_STATIC_LIBS=$enable_static
 AC_SUBST(USE_STATIC_LIBS)
 AC_SUBST(STATIC_MODULES)
+AC_SUBST(RADIUSD_MAJOR_VERSION)
+AC_SUBST(RADIUSD_MINOR_VERSION)
 AC_SUBST(RADIUSD_VERSION)
 export CFLAGS LIBS
 

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 6eba973..d6b8694 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -63,9 +63,6 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* uint32_t should be the canonical 'network integer' */
 #undef uint32_t
 
-/* use a pool of threads to handle requests, instead of spawning threads? */
-#undef WITH_THREAD_POOL
-
 /* Include SNMP subagent */
 #undef WITH_SNMP
 
@@ -195,12 +192,12 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <semaphore.h> header file.  */
 #undef HAVE_SEMAPHORE_H
 
-/* Define if you have the <sia.h> header file.  */
-#undef HAVE_SIA_H
-
 /* Define if you have the <siad.h> header file.  */
 #undef HAVE_SIAD_H
 
+/* Define if you have the <sia.h> header file.  */
+#undef HAVE_SIA_H
+
 /* Define if you have the <signal.h> header file.  */
 #undef HAVE_SIGNAL_H
 
@@ -213,6 +210,9 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <sys/dir.h> header file.  */
 #undef HAVE_SYS_DIR_H
 
+/* Define if you have the <syslog.h> header file.  */
+#undef HAVE_SYSLOG_H
+
 /* Define if you have the <sys/ndir.h> header file.  */
 #undef HAVE_SYS_NDIR_H
 
@@ -231,9 +231,6 @@ config.h - created by autoconf; contains defines generated by autoconf
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
-/* Define if you have the <syslog.h> header file.  */
-#undef HAVE_SYSLOG_H
-
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H