Mercurial > hg > xemacs-beta

comparison configure.in @ 1491:d968d4073031

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-05-20 18:57:50 by james] Fix --with-modules=no building, and building on MacOSX/Windows.
author james
date Tue, 20 May 2003 18:57:50 +0000
parents 1364f9716d7b
children baca156a450b
comparison
equal deleted inserted replaced
1490:74b2ea269eb5 1491:d968d4073031
3226 XE_SHLIB_STUFF 3226 XE_SHLIB_STUFF
3227 fi 3227 fi
3228 3228
3229 if test "$can_build_shared" = "yes"; then 3229 if test "$can_build_shared" = "yes"; then
3230 AC_DEFINE(HAVE_SHLIB) 3230 AC_DEFINE(HAVE_SHLIB)
3231 dnl src must be built before modules on MacOSX and Windows platforms, since
3232 dnl the binary must be available to properly link the modules
3233 dnl For no-module builds, this is added *after* the module directories
3234 XE_APPEND(src, MAKE_SUBDIR)
3231 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR) 3235 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR)
3232 test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS) 3236 test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS)
3233 AC_CHECK_FUNCS(dlerror _dlerror) 3237 AC_CHECK_FUNCS(dlerror _dlerror)
3234 with_modules=yes 3238 with_modules=yes
3235 MOD_CC="../../lib-src/ellcc" 3239 MOD_CC="../../lib-src/ellcc"
3242 XE_DIE("Required module support cannot be provided.") 3246 XE_DIE("Required module support cannot be provided.")
3243 else 3247 else
3244 echo " No module support." 3248 echo " No module support."
3245 fi 3249 fi
3246 with_modules=no 3250 with_modules=no
3247 MOD_CC="$XEMACS_CC" 3251 fi
3248 MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src" 3252 fi
3249 INSTALLPATH="" 3253 if test "$with_modules" != "yes"; then
3250 MOD_INSTALL_PROGRAM="true" 3254 MOD_CC="$XEMACS_CC"
3251 OBJECT_TO_BUILD="\$(MODNAME).o" 3255 MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src"
3252 fi 3256 INSTALLPATH=""
3257 MOD_INSTALL_PROGRAM="true"
3258 OBJECT_TO_BUILD="\$(MODNAME).o"
3253 fi 3259 fi
3254 MODARCHDIR= 3260 MODARCHDIR=
3255 MAKE_DOCFILE="../../lib-src/make-docfile" 3261 MAKE_DOCFILE="../../lib-src/make-docfile"
3256 AC_SUBST(with_modules) 3262 AC_SUBST(with_modules)
3257 AC_SUBST(MOD_CC) 3263 AC_SUBST(MOD_CC)
4747 XE_SPACE(ld_switch_all, $ld_switch_general $ld_switch_window_system) 4753 XE_SPACE(ld_switch_all, $ld_switch_general $ld_switch_window_system)
4748 XE_SPACE(ld_libs_general, $LIBS $libs_machine $libs_system $libs_standard) 4754 XE_SPACE(ld_libs_general, $LIBS $libs_machine $libs_system $libs_standard)
4749 XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS) 4755 XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS)
4750 XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general $ld_libs_module) 4756 XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general $ld_libs_module)
4751 4757
4758 dnl For no-module builds, make the src dir last
4759 if test "$with_modules" = "no"; then
4760 XE_APPEND(src, MAKE_SUBDIR)
4761 fi
4762
4752 dnl Compute lists of Makefiles and subdirs 4763 dnl Compute lists of Makefiles and subdirs
4753 AC_SUBST(SRC_SUBDIR_DEPS) 4764 AC_SUBST(SRC_SUBDIR_DEPS)
4754 XE_APPEND(src, MAKE_SUBDIR)
4755 internal_makefile_list="Makefile.in" 4765 internal_makefile_list="Makefile.in"
4756 SUBDIR_MAKEFILES='' 4766 SUBDIR_MAKEFILES=''
4757 test -d lock || mkdir lock 4767 test -d lock || mkdir lock
4758 for dir in $MAKE_SUBDIR; do 4768 for dir in $MAKE_SUBDIR; do
4759 case "$dir" in */* ) dnl Implement mkdir -p 4769 case "$dir" in */* ) dnl Implement mkdir -p