Download as
Browse Code »

Commit 8d7f453357eab396cf6d36b052a4ecabc5e34232

Authored by Perry Werneck
2 parents 9c359d2d 7882d805
Exists in develop

Merge branch 'develop' into winpkg

Showing 1 changed file with 9 additions and 1 deletions   Show diff stats
configure.ac
  Diff comments   View file @8d7f453
... ... @@ -74,7 +74,6 @@ case "$host" in
74 74 AC_CONFIG_FILES(src/main/windows/resources.rc)
75 75 AC_CONFIG_FILES(src/main/windows/app-manifest.xml)
76 76  
77   - # Windows and linux doesn't use the same defaults.
78 77 AC_CONFIG_FILES(win/bundle)
79 78 AC_CONFIG_FILES(win/pw3270.nsi)
80 79  
... ... @@ -91,6 +90,8 @@ case "$host" in
91 90 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
92 91 AC_SUBST(WINARCH,$app_cv_winarch)
93 92 AC_SUBST(NSISREDIR,$app_cv_nsisredir)
  93 +
  94 + # Windows and unix doesn't use the same defaults.
94 95 AC_SUBST(DEFAULT_UI_STYLE,0)
95 96 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"true")
96 97 ;;
... ... @@ -101,7 +102,10 @@ case "$host" in
101 102  
102 103 CFLAGS="$CFLAGS -pthread"
103 104 LDFLAGS="$LDFLAGS -pthread"
  105 +
  106 + # Windows and unix doesn't use the same defaults.
104 107 AC_SUBST(DEFAULT_UI_STYLE,0)
  108 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
105 109 ;;
106 110  
107 111 *)
... ... @@ -110,6 +114,8 @@ case "$host" in
110 114  
111 115 CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir) -DDATADIR=\$(datadir)"
112 116 LDFLAGS="$LDFLAGS -pthread"
  117 +
  118 + # Windows and unix doesn't use the same defaults.
113 119 AC_SUBST(DEFAULT_UI_STYLE,0)
114 120 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
115 121  
... ... @@ -159,6 +165,8 @@ AC_PATH_TOOL([STRIP], [strip], [true])
159 165 AC_PATH_TOOL([DESKTOP_INSTALL],[desktop-file-install],[no])
160 166 AC_PATH_TOOL([GLIB_SCHEMA_COMPILER],[glib-compile-schemas],[false])
161 167  
  168 +AC_PATH_TOOL([OPTIPNG], [optipng], [true])
  169 +
162 170 PKG_CHECK_EXISTS
163 171  
164 172 dnl ---------------------------------------------------------------------------
... ...