From: hadaq <hadaq>
Date: Wed, 5 Feb 2003 13:54:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4ae0875025591c3dcedd1e1b60c3ab4fd9c0b722;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/Makefile.in b/allParam/Makefile.in
index 69f0547..d203fb3 100644
--- a/allParam/Makefile.in
+++ b/allParam/Makefile.in
@@ -581,7 +581,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
 
 
 .pc.c :
-	$(PROC) $(PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
+	$(PROC) $(PROCFLAGS) $(AM_PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/allParam/configure b/allParam/configure
index b84377f..e5ac02c 100644
--- a/allParam/configure
+++ b/allParam/configure
@@ -3282,19 +3282,27 @@ if test "x$enable_param" = "xca"
 then
 	if test -x "$with_epics/startup/EpicsHostArch"
 	then
-		epics_version="3_14"
+		epics_release="314"
+		cat >>confdefs.h <<\_ACEOF
+#define EPICS_RELEASE 314
+_ACEOF
+
 		EPICS_HOST_ARCH=$($with_epics/startup/EpicsHostArch)
 		HOST_ARCH=$($with_epics/startup/HostArch)
 	elif test -x "$with_epics/startup/HostArch"
 	then
-		epics_version="3_13"
+		epics_release="313"
+		cat >>confdefs.h <<\_ACEOF
+#define EPICS_RELEASE 313
+_ACEOF
+
 		HOST_ARCH=$($with_epics/startup/HostArch)
 	else
 		{ { echo "$as_me:$LINENO: error: Missing valid EPICS version" >&5
 echo "$as_me: error: Missing valid EPICS version" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	echo "setting EPICS version to $epics_version"
+	echo "setting EPICS release to $epics_release"
 fi
 
 
@@ -3584,10 +3592,10 @@ _ACEOF
 fi
 
 
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS"
 	fi
@@ -3884,10 +3892,10 @@ fi
 fi
 if test "x$enable_paramsrc" = "xca"
 then
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS"
 	fi
@@ -5138,10 +5146,10 @@ done
 
 if test "x$enable_param" = "xca"
 then
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		CPPFLAGS="-I$with_epics/include -I$with_epics/include/os/$HOST_ARCH $CPPFLAGS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		CPPFLAGS="-I$with_epics/include -I$with_epics/include/os/$HOST_ARCH -I$with_epics/include/os/$EPICS_HOST_ARCH $CPPFLAGS"
 	fi
diff --git a/allParam/configure.in b/allParam/configure.in
index 094ddbb..27da67f 100644
--- a/allParam/configure.in
+++ b/allParam/configure.in
@@ -95,17 +95,19 @@ if test "x$enable_param" = "xca"
 then
 	if test -x "$with_epics/startup/EpicsHostArch"
 	then
-		epics_version="3_14"
+		epics_release="314"
+		AC_DEFINE(EPICS_RELEASE, 314)
 		EPICS_HOST_ARCH=$($with_epics/startup/EpicsHostArch)
 		HOST_ARCH=$($with_epics/startup/HostArch)
 	elif test -x "$with_epics/startup/HostArch"
 	then
-		epics_version="3_13"
+		epics_release="313"
+		AC_DEFINE(EPICS_RELEASE, 313)
 		HOST_ARCH=$($with_epics/startup/HostArch)
 	else
 		AC_ERROR([Missing valid EPICS version])
 	fi
-	echo "setting EPICS version to $epics_version"
+	echo "setting EPICS release to $epics_release"
 fi
 
 
@@ -117,10 +119,10 @@ then
 	AC_SEARCH_LIBS(syslog, netinet)
 	AC_CHECK_LIB(compat, SYSLOG_syslog)
 
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS"
 	fi
@@ -135,10 +137,10 @@ then
 fi
 if test "x$enable_paramsrc" = "xca"
 then
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS"
 	fi
@@ -169,10 +171,10 @@ AC_CHECK_HEADERS(syslog.h,,AC_ERROR([Missing system header file(s)]))
 
 if test "x$enable_param" = "xca"
 then
-	if test "x$epics_version" = "x3_13"
+	if test "x$epics_release" = "x313"
 	then
 		CPPFLAGS="-I$with_epics/include -I$with_epics/include/os/$HOST_ARCH $CPPFLAGS"
-	elif test "x$epics_version" = "x3_14"
+	elif test "x$epics_release" = "x314"
 	then
 		CPPFLAGS="-I$with_epics/include -I$with_epics/include/os/$HOST_ARCH -I$with_epics/include/os/$EPICS_HOST_ARCH $CPPFLAGS"
 	fi