config updates
This commit is contained in:
parent
3d627346c8
commit
8905e25960
2 changed files with 18 additions and 22 deletions
24
configure
vendored
24
configure
vendored
|
@ -1298,8 +1298,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
ac_config_headers="$ac_config_headers modconfig.h"
|
||||
|
||||
PACKAGE=OPSB
|
||||
MODULE_MAJOR=2
|
||||
MODULE_MINOR=3
|
||||
MODULE_MAJOR=3
|
||||
MODULE_MINOR=0
|
||||
VERSION=$MODULE_MAJOR.$MODULE_MINOR
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
@ -4612,9 +4612,9 @@ echo "$as_me:$LINENO: result: $DIRINST" >&5
|
|||
echo "${ECHO_T}$DIRINST" >&6
|
||||
|
||||
|
||||
as_ac_File=`echo "ac_cv_file_$DIRINST/include/dl.h" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $DIRINST/include/dl.h" >&5
|
||||
echo $ECHO_N "checking for $DIRINST/include/dl.h... $ECHO_C" >&6
|
||||
as_ac_File=`echo "ac_cv_file_$DIRINST/include/neostats.h" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $DIRINST/include/neostats.h" >&5
|
||||
echo $ECHO_N "checking for $DIRINST/include/neostats.h... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_File+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
@ -4622,7 +4622,7 @@ else
|
|||
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
|
||||
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
if test -r "$DIRINST/include/dl.h"; then
|
||||
if test -r "$DIRINST/include/neostats.h"; then
|
||||
eval "$as_ac_File=yes"
|
||||
else
|
||||
eval "$as_ac_File=no"
|
||||
|
@ -4656,11 +4656,9 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
int main(void) {
|
||||
if (MAJOR >= 2) {
|
||||
if (MINOR >= 5) {
|
||||
if (REV >= 17) {
|
||||
exit(0);
|
||||
}
|
||||
if (MAJOR >= 3) {
|
||||
if (MINOR >= 0) {
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
exit(1);
|
||||
|
@ -4693,8 +4691,8 @@ if test "$ns_version_ok" = "yes"; then
|
|||
echo "$as_me:$LINENO: result: Compatible Version" >&5
|
||||
echo "${ECHO_T}Compatible Version" >&6;
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: This Module requires NeoStats 2.5.8 or Higher" >&5
|
||||
echo "$as_me: error: This Module requires NeoStats 2.5.8 or Higher" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: This Module requires NeoStats 3.0 or Higher" >&5
|
||||
echo "$as_me: error: This Module requires NeoStats 3.0 or Higher" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
|
16
configure.in
16
configure.in
|
@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
|
|||
AC_INIT(opsb.c)
|
||||
AC_CONFIG_HEADER(modconfig.h)
|
||||
PACKAGE=OPSB
|
||||
MODULE_MAJOR=2
|
||||
MODULE_MINOR=3
|
||||
MODULE_MAJOR=3
|
||||
MODULE_MINOR=0
|
||||
VERSION=$MODULE_MAJOR.$MODULE_MINOR
|
||||
AC_DEFINE_UNQUOTED(MODULE_VERSION, "$VERSION", "Module Version")
|
||||
AC_DEFINE_UNQUOTED(MODULE_MAJOR, "$MODULE_MAJOR", "Major Version")
|
||||
|
@ -66,7 +66,7 @@ AC_ARG_WITH(neostats,
|
|||
AC_MSG_RESULT($DIRINST)
|
||||
|
||||
|
||||
AC_CHECK_FILE($DIRINST/include/dl.h,
|
||||
AC_CHECK_FILE($DIRINST/include/neostats.h,
|
||||
[INCLUDEDIR="$DIRINST/include/"],
|
||||
[AC_MSG_ERROR(Can't find existing NeoStats Installation please supply with --with-neostats option)])
|
||||
|
||||
|
@ -79,11 +79,9 @@ AC_TRY_RUN(
|
|||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
int main(void) {
|
||||
if (MAJOR >= 2) {
|
||||
if (MINOR >= 5) {
|
||||
if (REV >= 17) {
|
||||
exit(0);
|
||||
}
|
||||
if (MAJOR >= 3) {
|
||||
if (MINOR >= 0) {
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
exit(1);
|
||||
|
@ -94,7 +92,7 @@ int main(void) {
|
|||
if test "$ns_version_ok" = "yes"; then
|
||||
AC_MSG_RESULT(Compatible Version);
|
||||
else
|
||||
AC_MSG_ERROR(This Module requires NeoStats 2.5.8 or Higher)
|
||||
AC_MSG_ERROR(This Module requires NeoStats 3.0 or Higher)
|
||||
fi
|
||||
|
||||
|
||||
|
|
Reference in a new issue