|
Line
Link Here
|
| 0 |
-- emacs-23.2-orig/configure.in |
0 |
++ emacs-23.2/configure.in |
|
Lines 1382-1397
Link Here
|
| 1382 |
if test "${with_ns}" != no; then |
1382 |
if test "${with_ns}" != no; then |
| 1383 |
if test "${opsys}" = darwin; then |
1383 |
if test "${opsys}" = darwin; then |
| 1384 |
NS_IMPL_COCOA=yes |
1384 |
NS_IMPL_COCOA=yes |
| 1385 |
ns_appdir=`pwd`/nextstep/Emacs.app |
1385 |
if test "${EN_NS_SELF_CONTAINED}" = yes; then |
| 1386 |
ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS |
1386 |
ns_appdir=`pwd`/nextstep/Emacs.app |
| 1387 |
ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources |
1387 |
ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS |
| 1388 |
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base |
1388 |
ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources |
|
|
1389 |
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base |
| 1390 |
fi |
| 1389 |
elif test -f $GNUSTEP_CONFIG_FILE; then |
1391 |
elif test -f $GNUSTEP_CONFIG_FILE; then |
| 1390 |
NS_IMPL_GNUSTEP=yes |
1392 |
NS_IMPL_GNUSTEP=yes |
| 1391 |
ns_appdir=`pwd`/nextstep/Emacs.app |
1393 |
if test "${EN_NS_SELF_CONTAINED}" = yes; then |
| 1392 |
ns_appbindir=`pwd`/nextstep/Emacs.app |
1394 |
ns_appdir=`pwd`/nextstep/Emacs.app |
| 1393 |
ns_appresdir=`pwd`/nextstep/Emacs.app/Resources |
1395 |
ns_appbindir=`pwd`/nextstep/Emacs.app |
| 1394 |
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base |
1396 |
ns_appresdir=`pwd`/nextstep/Emacs.app/Resources |
|
|
1397 |
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base |
| 1398 |
fi |
| 1395 |
dnl FIXME sourcing this 3 times in subshells seems inefficient. |
1399 |
dnl FIXME sourcing this 3 times in subshells seems inefficient. |
| 1396 |
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" |
1400 |
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" |
| 1397 |
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" |
1401 |
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" |
|
Lines 1417-1426
Link Here
|
| 1417 |
window_system=nextstep |
1421 |
window_system=nextstep |
| 1418 |
with_xft=no |
1422 |
with_xft=no |
| 1419 |
# set up packaging dirs |
1423 |
# set up packaging dirs |
| 1420 |
exec_prefix=${ns_appbindir} |
|
|
| 1421 |
libexecdir=${ns_appbindir}/libexec |
| 1422 |
if test "${EN_NS_SELF_CONTAINED}" = yes; then |
1424 |
if test "${EN_NS_SELF_CONTAINED}" = yes; then |
| 1423 |
prefix=${ns_appresdir} |
1425 |
prefix=${ns_appresdir} |
|
|
1426 |
exec_prefix=${ns_appbindir} |
| 1427 |
libexecdir=${ns_appbindir}/libexec |
| 1424 |
fi |
1428 |
fi |
| 1425 |
fi |
1429 |
fi |
| 1426 |
CFLAGS="$tmp_CFLAGS" |
1430 |
CFLAGS="$tmp_CFLAGS" |
