From b8fb05fbd0361bd404df560327c29c7fabb30677 Mon Sep 17 00:00:00 2001 From: Dan Sumorok Date: Wed, 31 Dec 2014 09:36:17 -0500 Subject: [PATCH] Minor build fixes Removed OS X -no_pie linker flag Fixed copy/paste error in ether helper help string Added missing distclean targets. --- BasiliskII/src/Unix/Makefile.in | 2 +- BasiliskII/src/Unix/configure.ac | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index cc82326d..54ae7fbd 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -184,7 +184,7 @@ distclean: clean rm -rf $(OBJ_DIR) rm -rf autom4te.cache rm -f Makefile - rm -f config.cache config.log config.status config.h + rm -f config.cache config.log config.status config.h config.h.in configure rm -f Darwin/lowmem Darwin/pagezero depend dep: diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 62dd5adc..ad073b7e 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -28,7 +28,7 @@ dnl Apple Sound Chip Emulation AC_ARG_ENABLE(asc-emu, [ --enable-asc-emu enable Apple Sound Chip emulation [default=no]], [WANT_ASC_EMU=$enableval], [WANT_ASC_EMU=no]) dnl Mac OS X etherhelper support -AC_ARG_ENABLE(macosx-etherhelper, [ --enable-macosx-etherhelper enable Mac OS X Sound [default=no]], [WANT_MACOSX_ETHERHELPER=$enableval], [WANT_MACOSX_ETHERHELPER=no]) +AC_ARG_ENABLE(macosx-etherhelper, [ --enable-macosx-etherhelper enable Mac OS X Ethernet Helper Program [default=no]], [WANT_MACOSX_ETHERHELPER=$enableval], [WANT_MACOSX_ETHERHELPER=no]) dnl 32-bit build AC_ARG_ENABLE(32-bit-build, [ --enable-32-bit-build enable a 32-bit build [default=no]], [WANT_32BIT_BUILD=$enableval], [WANT_32BIT_BUILD=no]) @@ -1783,10 +1783,6 @@ if [[ "x$LP64_DEFINED" = "xyes" ] && [ "x$have_mach_vm" = "xyes" ]]; then LIBS+=" -Wl,-pagezero_size,0x1000" fi -if [[ ${OS_TYPE} = darwin ]]; then -LIBS+=" -Wl,-no_pie" -fi - dnl Generate Makefile. AC_SUBST(DEFINES) AC_SUBST(SYSSRCS)