Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-12 16:30:44 +00:00
Code Issues Projects Releases Wiki Activity

fix configure.ac unix script to not fail when AM_PATH_GTK and AM_PATH_ESD

Browse Source 
are not defined (such as is usually the case on Mac OS X)
This commit is contained in:
asvitkine 2007-01-24 14:33:52 +00:00
parent e2cde00af4
commit c6560c2152
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SheepShaver/src/Unix/configure.ac
View File

@ -245,6 +245,8 @@ dnl We use GTK+ if possible.
UISRCS=../dummy/prefs_editor_dummy.cpp UISRCS=../dummy/prefs_editor_dummy.cpp
case "x$WANT_GTK" in case "x$WANT_GTK" in
xgtk2*) xgtk2*)
WANT_GTK=no
ifdef([AM_PATH_GTK_2_0],
AM_PATH_GTK_2_0(1.3.15, [ AM_PATH_GTK_2_0(1.3.15, [
GUI_CFLAGS="$GTK_CFLAGS" GUI_CFLAGS="$GTK_CFLAGS"
GUI_LIBS="$GTK_LIBS" GUI_LIBS="$GTK_LIBS"
@ -260,17 +262,18 @@ xgtk2*)
WANT_GTK=no WANT_GTK=no
;; ;;
esac esac
]) ]))
;;
esac esac
if [[ "x$WANT_GTK" = "xgtk" ]]; then if [[ "x$WANT_GTK" = "xgtk" ]]; then
WANT_GTK=no
ifdef([AM_PATH_GTK],
AM_PATH_GTK(1.2.0, [ AM_PATH_GTK(1.2.0, [
GUI_CFLAGS="$GTK_CFLAGS" GUI_CFLAGS="$GTK_CFLAGS"
GUI_LIBS="$GTK_LIBS" GUI_LIBS="$GTK_LIBS"
WANT_GTK=gtk
], [ ], [
AC_MSG_WARN([Could not find GTK+, disabling user interface.]) AC_MSG_WARN([Could not find GTK+, disabling user interface.])
WANT_GTK=no ]))
])
fi fi
if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.]) AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
@ -290,15 +293,17 @@ AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
dnl We use ESD if possible. dnl We use ESD if possible.
if [[ "x$WANT_ESD" = "xyes" ]]; then if [[ "x$WANT_ESD" = "xyes" ]]; then
WANT_ESD=no
ifdef([AM_PATH_ESD],
AM_PATH_ESD(0.2.8, [ AM_PATH_ESD(0.2.8, [
AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.]) AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
CFLAGS="$CFLAGS $ESD_CFLAGS" CFLAGS="$CFLAGS $ESD_CFLAGS"
CXXFLAGS="$CXXFLAGS $ESD_CFLAGS" CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
LIBS="$LIBS $ESD_LIBS" LIBS="$LIBS $ESD_LIBS"
WANT_ESD=yes
], [ ], [
AC_MSG_WARN([Could not find ESD, disabling ESD support.]) AC_MSG_WARN([Could not find ESD, disabling ESD support.])
WANT_ESD=no ]))
])
fi fi
dnl We use 64-bit file size support if possible. dnl We use 64-bit file size support if possible.