Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-09-22 22:01:32 +00:00
Code Issues Projects Releases Wiki Activity

ifdef() constructs cause problems, make sure to automatically include the m4 directory while

Browse Source 
regenerating the configure script (provided no ACLOCAL_FLAGS are passed). i.e. ./autogen.sh
now just works, even on MacOS X!
This commit is contained in:
gbeauche 2007-06-13 12:09:05 +00:00
parent 4ec66db185
commit 3d69ce66be
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SheepShaver/src/Unix/autogen.sh
View File

@ -34,6 +34,10 @@ if test "$DIE" -eq 1; then
exit 1
fi
if test -z "$ACLOCAL_FLAGS"; then
ACLOCAL_FLAGS="-I `aclocal --print-ac-dir` -I m4"
fi
aclocalinclude="$ACLOCAL_FLAGS"; \
(echo $_echo_n " + Running aclocal: $_echo_c"; \
aclocal $aclocalinclude; \

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

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