X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi_const.m4;h=98aeed4054f0612a38fa29bfd1ab94e8b12e40a2;hp=6c3cf6b28be665eaf28828e22461700a590d8fc0;hb=216e7ac3b97aed5a5d65c511dc061c78be90e79d;hpb=c9b3436bd51a4dcf7d6cc6817d4c7a8ad99538d4

diff --git a/m4/psi/psi_const.m4 b/m4/psi/psi_const.m4
index 6c3cf6b..98aeed4 100644
--- a/m4/psi/psi_const.m4
+++ b/m4/psi/psi_const.m4
@@ -1,51 +1,29 @@
 # psi_add_str_const(name, value)
-# Add a pre-defined string constant to $PSI_CONSTS
+# Add a pre-defined string constant to $PSI_CONSTS_H
 psi_add_str_const() {
-	grep -q "\"psi\\\\\\\\$1\"" $PSI_CONSTS \
-		|| cat >>$PSI_CONSTS <<EOF
-	{PSI_T_STRING, "string", "psi\\\\$1", $2, PSI_T_QUOTED_STRING},
-EOF
+	PSI_CONSTS="$PSI_CONSTS
+	{PSI_T_STRING, \"string\", \"psi\\\\$1\", {.ptr = $1}},"
 }
 
 # psi_add_int_const(name, value)
-# Add a pre-defined int constant to $PSI_CONSTS
+# Add a pre-defined int constant to $PSI_CONSTS_H
 psi_add_int_const() {
-	grep -q "\"psi\\\\\\\\$1\"" $PSI_CONSTS \
-		|| cat >>$PSI_CONSTS <<EOF
-	{PSI_T_INT, "int", "psi\\\\$1", "$2", PSI_T_NUMBER}, 
-EOF
+	PSI_CONSTS="$PSI_CONSTS
+	{PSI_T_INT, \"int\", \"psi\\\\$1\", {.zend.lval = (zend_long) $1}},"
 }
 
 dnl PSI_CONST(const name, type)
 dnl Check the value of a str/int constant and add it to the list of pre-defined
 dnl constants.
 AC_DEFUN(PSI_CONST, [
-	AC_CACHE_CHECK(value of $1, psi_cv_const_$1, [
-		psi_const_val=
+	AC_CHECK_DECL($1, [
 		case $2 in
 		str*)
-			if test "$cross_compiling" = "yes"
-			then
-				AC_TRY_CPP(PSI_INCLUDES $1, psi_const_val=`eval "$ac_try|tail -n1"`, psi_const_val=)
-			else
-				PSI_COMPUTE_STR(psi_const_val, $1, PSI_INCLUDES)
-			fi
+			psi_add_str_const "$1"
 			;;
 		int)
-			AC_COMPUTE_INT(psi_const_val, $1, PSI_INCLUDES)
+			psi_add_int_const "$1"
 			;;
 		esac
-		psi_cv_const_$1=$psi_const_val
-	])
-	if test "$psi_cv_const_$1"
-	then
-		case $2 in
-		str*)
-			psi_add_str_const "$1" "$psi_cv_const_$1"
-			;;
-		int)
-			psi_add_int_const "$1" "$psi_cv_const_$1"
-			;;
-		esac
-	fi
+	],, PSI_INCLUDES)
 ])