Skip to content

Commit fce2d19

Browse files
L1L1@gmx.comL1L1@gmx.com
authored andcommitted
tweaking configure.ac for OSX Yosemite.
1 parent d886198 commit fce2d19

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

INSTALL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ without warranty of any kind.
1212
Basic Installation
1313
==================
1414

15-
Briefly, the shell commands `./configure; make; make install' should
16-
configure, build, and install this package. The following
15+
Briefly, the shell command `./configure && make && make install'
16+
should configure, build, and install this package. The following
1717
more-detailed instructions are generic; see the `README' file for
1818
instructions specific to this package. Some packages provide this
1919
`INSTALL' file but do not implement all of the features documented

configure.ac

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,21 @@ PKG_CHECK_MODULES([GTK],[gtk+-3.0 >= 3.6])
2727

2828
case "${host}" in
2929
*-*-darwin*)
30-
PCSC_CFLAGS='-Wno-deprecated-declarations -I/System/Library/Frameworks/PCSC.framework/Headers'
31-
PCSC_LIBS='-framework PCSC'
30+
PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`
31+
PCSC_CFLAGS="-Wno-deprecated-declarations -I$PCSC_HEADERS"
32+
PCSC_LIBS="-framework PCSC"
3233
;;
3334
*)
3435
PKG_CHECK_MODULES([PCSC],[libpcsclite])
3536
;;
3637
esac
3738

39+
40+
3841
PKG_CHECK_MODULES([LUA],[lua-5.2],,[
3942
PKG_CHECK_MODULES([LUA],[lua5.2],,[
4043
PKG_CHECK_MODULES([LUA],[lua >= 5.2],,[
41-
for lua_lib_name in lua.5.2 lua-5.2 lua5.2; do
42-
AC_CHECK_LIB([$lua_lib_name], [lua_close], [HAVE_LIBLUA=yes], [HAVE_LIBLUA=no])
43-
if test x$HAVE_LIBLUA = xyes; then
44-
AC_SUBST([LUA_CFLAGS], [""])
45-
AC_SUBST([LUA_LIBS], ["-l$lua_lib_name"])
46-
break
47-
fi
48-
done
44+
AC_SEARCH_LIBS([lua_close], [lua.5.2 lua-5.2 lua5.2], [HAVE_LIBLUA=yes], [HAVE_LIBLUA=no])
4945
if test x$HAVE_LIBLUA != xyes; then
5046
AC_MSG_ERROR([Could not find lua 5.2-dev.
5147
This program requires the lua 5.2 development library.
@@ -56,11 +52,7 @@ PKG_CHECK_MODULES([LUA],[lua-5.2],,[
5652
])
5753

5854
PKG_CHECK_MODULES([CURL],[libcurl],,[
59-
AC_CHECK_LIB([curl],[curl_easy_init],[
60-
AC_SUBST([CURL_CFLAGS],[""])
61-
AC_SUBST([CURL_LIBS],[-lcurl])
62-
HAVE_LIBCURL=yes
63-
],[HAVE_LIBCURL=no])
55+
AC_SEARCH_LIBS([curl_easy_init],[curl], [HAVE_LIBCURL=yes], [HAVE_LIBCURL=no])
6456
if test x$HAVE_LIBCURL != xyes; then
6557
AC_MSG_ERROR([Cloud not find libcurl.
6658
This program requires the libcurl development library.

ui/gtk/gui_inprogress.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "ui.h"
2323
#include "gui_inprogress.h"
2424
#include "misc.h"
25+
#include "gui_core.h"
2526

2627
/*********************************************************/
2728
/* LOG FUNCTIONS AND UI CALLBACKS ************************/
@@ -54,7 +55,7 @@ void* gui_inprogress_new(const char *title, const char *message)
5455

5556

5657
dialog = gtk_dialog_new_with_buttons (title,
57-
NULL,
58+
GTK_WINDOW(MAIN_WINDOW),
5859
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
5960
"_Cancel",
6061
GTK_RESPONSE_CANCEL,

0 commit comments

Comments
 (0)