X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=configure.in;h=a58ea8e2a1ee454810f9f8beec0f98cf74b42128;hb=9dd2609525a2a094f400ebfea958b9134f98a464;hp=26d752d4541123586066fddcad5112caf6e0300e;hpb=944bf11ceeb641082075e2cffc3bf920918c8b2b;p=~andy%2Fgtk

diff --git a/configure.in b/configure.in
index 26d752d45..a58ea8e2a 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PREREQ(2.62)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [19])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_micro_version], [7])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -48,7 +48,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([no-define -Wno-portability])
+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
 AM_CONFIG_HEADER(config.h)
 
 # Support silent build rules, requires at least automake-1.11. Enable
@@ -131,6 +131,7 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -139,6 +140,7 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -149,6 +151,7 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
@@ -582,6 +585,7 @@ case $host in
   ;;
 esac
 
+AC_SUBST(MATH_LIB)
 #
 # see bug 162979
 #