From 9af6ad67dbc4afc8b95fbf92d5fb190deaacba8a Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 3 Feb 2003 17:55:00 +0000 Subject: [PATCH] *** empty log message *** --- allParam/config.h.in | 70 +++++++--- allParam/configure | 311 ++++++++++-------------------------------- allParam/configure.in | 38 +----- 3 files changed, 131 insertions(+), 288 deletions(-) diff --git a/allParam/config.h.in b/allParam/config.h.in index 813733f..a6ca420 100644 --- a/allParam/config.h.in +++ b/allParam/config.h.in @@ -1,35 +1,73 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to `unsigned' if doesn't define. */ -#undef size_t +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H -/* Define if you have the select function. */ +/* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT -/* Define if you have the strerror function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the uname function. */ -#undef HAVE_UNAME +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the `uname' function. */ +#undef HAVE_UNAME + +/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Version number of package */ #undef VERSION +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/allParam/configure b/allParam/configure index a0639a3..df8455d 100644 --- a/allParam/configure +++ b/allParam/configure @@ -1717,6 +1717,11 @@ else fi; +if test "x$program_transform_name" = "xs,x,x," +then + program_transform_name="s,\$\$,_$enable_paramsrc," +fi + PAS="" LIBCAPARAM="" LIBFILEPARAM="" @@ -5510,196 +5515,53 @@ echo "$as_me: error: Missing header file" >&2;} fi - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "checking for aitTypes.h... yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for aitTypes.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "checking for aitHelpers.h... yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for aitHelpers.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "checking for casdef.h... yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for casdef.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes + if test "${ac_cv_header_aitTypes_h+set}" = set; then + echo "$as_me:$LINENO: checking for aitTypes.h" >&5 +echo $ECHO_N "checking for aitTypes.h... $ECHO_C" >&6 +if test "${ac_cv_header_aitTypes_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -if test -z "$ac_cpp_err"; then - echo "checking for fdManager.h... yes" +echo "$as_me:$LINENO: result: $ac_cv_header_aitTypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_aitTypes_h" >&6 else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for fdManager.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +echo "$as_me:$LINENO: checking aitTypes.h usability" >&5 +echo $ECHO_N "checking aitTypes.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" -#include +$ac_includes_default +#include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "checking for gdd.h... yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for gdd.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "checking for gddApps.h... yes" + (exit $ac_status); }; }; then + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for gddApps.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } +cat conftest.$ac_ext >&5 +ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking aitTypes.h presence" >&5 +echo $ECHO_N "checking aitTypes.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5718,82 +5580,51 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - echo "checking for gddAppFuncTable.h... yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "checking for gddAppFuncTable.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext - if test "x$with_epics" = "x3_13" - then - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: aitTypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: aitTypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: aitTypes.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: aitTypes.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: aitTypes.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: aitTypes.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: aitTypes.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: aitTypes.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: aitTypes.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: aitTypes.h: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:$LINENO: checking for aitTypes.h" >&5 +echo $ECHO_N "checking for aitTypes.h... $ECHO_C" >&6 +if test "${ac_cv_header_aitTypes_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cpp_err=yes + ac_cv_header_aitTypes_h=$ac_header_preproc fi -if test -z "$ac_cpp_err"; then - echo "checking for osiTimer.h... yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for osiTimer.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 -echo "$as_me: error: Missing header file" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest.err conftest.$ac_ext - elif test "x$with_epics" = "x3_14" - then - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes +echo "$as_me:$LINENO: result: $ac_cv_header_aitTypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_aitTypes_h" >&6 + fi -if test -z "$ac_cpp_err"; then - echo "checking for epicsTimer.h... yes" +if test $ac_cv_header_aitTypes_h = yes; then + : else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - echo "checking for epicsTimer.h... no"; { { echo "$as_me:$LINENO: error: Missing header file" >&5 + { { echo "$as_me:$LINENO: error: Missing header file" >&5 echo "$as_me: error: Missing header file" >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_ext - fi + + fi diff --git a/allParam/configure.in b/allParam/configure.in index e80134e..22adff0 100644 --- a/allParam/configure.in +++ b/allParam/configure.in @@ -16,6 +16,11 @@ AC_ARG_WITH(oracle, [ --with-oracle[=ARG] in case of --enable-param=ora indicat dnl Make primary definitions. +if test "x$program_transform_name" = "xs,x,x," +then + program_transform_name="s,\$\$,_$enable_paramsrc," +fi + PAS="" LIBCAPARAM="" LIBFILEPARAM="" @@ -189,38 +194,7 @@ fi if test "x$enable_server" = "xyes" then AC_CHECK_HEADER(allParam.h,,AC_ERROR([Missing header file])) - AC_TRY_CPP([#include ], - [echo "checking for aitTypes.h... yes"], - [echo "checking for aitTypes.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for aitHelpers.h... yes"], - [echo "checking for aitHelpers.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for casdef.h... yes"], - [echo "checking for casdef.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for fdManager.h... yes"], - [echo "checking for fdManager.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for gdd.h... yes"], - [echo "checking for gdd.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for gddApps.h... yes"], - [echo "checking for gddApps.h... no"; AC_ERROR([Missing header file])]) - AC_TRY_CPP([#include ], - [echo "checking for gddAppFuncTable.h... yes"], - [echo "checking for gddAppFuncTable.h... no"; AC_ERROR([Missing header file])]) - if test "x$with_epics" = "x3_13" - then - AC_TRY_CPP([#include ], - [echo "checking for osiTimer.h... yes"], - [echo "checking for osiTimer.h... no"; AC_ERROR([Missing header file])]) - elif test "x$with_epics" = "x3_14" - then - AC_TRY_CPP([#include ], - [echo "checking for epicsTimer.h... yes"], - [echo "checking for epicsTimer.h... no"; AC_ERROR([Missing header file])]) - fi + AC_CHECK_HEADER(aitTypes.h,,AC_ERROR([Missing header file])) fi -- 2.43.0