diff --git a/doc/configure b/doc/configure
index 9e8b573..a10049f 100755
--- a/doc/configure
+++ b/doc/configure
@@ -521,8 +521,10 @@ else
 fi
 
 
+PACKAGE=gperf
+
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:526: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:528: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -559,7 +561,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:563: checking for a BSD compatible install" >&5
+echo "configure:565: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'cl_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -755,6 +757,7 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@PACKAGE@%$PACKAGE%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@INSTALL@%$INSTALL%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
diff --git a/src/configure b/src/configure
index d55a493..edd1fd7 100755
--- a/src/configure
+++ b/src/configure
@@ -1102,7 +1102,7 @@ fi
 
                       echo $ac_n "checking for working throw()""... $ac_c" 1>&6
 echo "configure:1105: checking for working throw()" >&5
-if eval "test \"`echo '$''{'gp_cxx_throw_decl'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'gp_cv_cxx_throw_decl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -1125,12 +1125,12 @@ int main() {
 EOF
 if { (eval echo configure:1127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  gp_cxx_throw_decl=yes
+  gp_cv_cxx_throw_decl=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gp_cxx_throw_decl=no
+  gp_cv_cxx_throw_decl=no
 fi
 rm -f conftest*
 ac_ext=c
@@ -1143,8 +1143,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-echo "$ac_t""$gp_cxx_throw_decl" 1>&6
-if test $gp_cxx_throw_decl = yes; then
+echo "$ac_t""$gp_cv_cxx_throw_decl" 1>&6
+if test $gp_cv_cxx_throw_decl = yes; then
   cat >> confdefs.h <<\EOF
 #define HAVE_THROW_DECL 1
 EOF