Download as
Browse Code »

Commit 7882d805dce3a82edc3d1d71fb842003692edfff

Authored by Perry Werneck
1 parent f9d2a03f
Exists in develop

Fixing macos defaults, searching for optipng.

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