--- configure.in.old	2006-11-02 23:22:55.000000000 +0100
+++ configure.in	2006-11-02 23:01:44.000000000 +0100
@@ -148,6 +148,16 @@
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
+# added for Debian
+LIBGLIB_REQUIRED=
+LIBGTK_REQUIRED=
+EPIPHANY_DEPENDENCY_CFLAGS=
+EPIPHANY_DEPENDENCY_LIBS=
+LIBBONOBO_IDL=
+BONOBO_ACTIVATION_IDL=
+EPIPHANY_EXTENSIONS_DIR=
+# </added for Debian>
+
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
        [Define to the Epiphany version (12, 14, 16, 18, 110 or 214)])
@@ -156,36 +166,33 @@
 LIBGLIB_REQUIRED=2.4.0
 LIBGTK_REQUIRED=2.4.0
 
-AC_SUBST(EPIPHANY_REQUIRED)
-AC_SUBST(LIBGLIB_REQUIRED)
-AC_SUBST(LIBGTK_REQUIRED)
-
-LIBBONOBO_IDL="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(LIBBONOBO_IDL)
-
-
-BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACTIVATION_IDL)
-
 PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, \
                   glib-2.0 >= $LIBGLIB_REQUIRED \
                   gmodule-2.0 \
                   gtk+-2.0 >= $LIBGTK_REQUIRED \
                   $EPIPHANY_PKGCONFIG >= $EPIPHANY_REQUIRED \
 		  )
-AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS)
-AC_SUBST(EPIPHANY_DEPENDENCY_LIBS)
-
 if test "x$EPHY_VER" = "x1.2"; then
 EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=libdir epiphany-1.2`/epiphany/extensions"
 else
 EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=extensionsdir epiphany-$EPHY_VER`"
 fi
-AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
 
 else
 	enable_epiphany_extension=no
 fi
+# <moved for Debian>
+AC_SUBST(EPIPHANY_REQUIRED)
+AC_SUBST(LIBGLIB_REQUIRED)
+AC_SUBST(LIBGTK_REQUIRED)
+AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS)
+AC_SUBST(EPIPHANY_DEPENDENCY_LIBS)
+LIBBONOBO_IDL="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
+AC_SUBST(LIBBONOBO_IDL)
+BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+AC_SUBST(BONOBO_ACTIVATION_IDL)
+AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
+# </moved for Debian>
 AM_CONDITIONAL(ENABLE_EPIPHANY_EXTENSION, test "x$enable_epiphany_extension" = "xyes")