Mercurial > hg > xemacs-beta

comparison configure @ 3179:15139dbf89f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-12-27 18:50:47 by michaels] This: 2005-11-25 Mike Sperber <mike@xemacs.org> * CHANGES-beta: * configure.ac: Zap --with-package-prefix; instead, add --with-user-packages/--with-early-packages, --with-system-packages/--with-late-packages, and --with-legacy-packages/--with-last-packages. ... and the changes that result from it throughout the code.
author michaels
date Tue, 27 Dec 2005 18:51:30 +0000
parents 89ce0380ee4f
children 80361b938eaa
comparison
equal deleted inserted replaced
3178:632fdf307588 3179:15139dbf89f4
357 #endif 357 #endif
358 #if HAVE_UNISTD_H 358 #if HAVE_UNISTD_H
359 # include <unistd.h> 359 # include <unistd.h>
360 #endif" 360 #endif"
361 361
362 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs canna_libs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' 362 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir LN_S blddir build build_cpu build_vendor build_os configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD ldap_libs postgresql_libs lwlib_objs canna_libs ALLOCA have_esd_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME version instvardir srcdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH early_packages EARLY_PACKAGE_DIRECTORIES_USER_DEFINED EARLY_PACKAGE_DIRECTORIES late_packages LATE_PACKAGE_DIRECTORIES_USER_DEFINED LATE_PACKAGE_DIRECTORIES last_packages LAST_PACKAGE_DIRECTORIES_USER_DEFINED LAST_PACKAGE_DIRECTORIES package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS native_sound_lib sound_cflags dynodump_arch XEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS'
363 ac_subst_files='' 363 ac_subst_files=''
364 364
365 # Initialize some variables set by options. 365 # Initialize some variables set by options.
366 ac_init_help= 366 ac_init_help=
367 ac_init_version=false 367 ac_init_version=false
980 --with-site-lisp=no Allow for a site-lisp directory in the XEmacs 980 --with-site-lisp=no Allow for a site-lisp directory in the XEmacs
981 hierarchy searched before the installation packages. 981 hierarchy searched before the installation packages.
982 --with-site-modules=no Disable site-modules directory in the XEmacs 982 --with-site-modules=no Disable site-modules directory in the XEmacs
983 hierarchy, which is searched before the installation 983 hierarchy, which is searched before the installation
984 modules. 984 modules.
985 --with-package-prefix=DIR 985 --with-early-packages=DIR
986 Specify packages root. 986 Specify location of early/user packages (instead of
987 ~/.xemacs; same as --with-user-packages).
988 --with-user-packages=DIR
989 Specify location of early/user packages (instead of
990 ~/.xemacs; same as --with-early-packages).
991 --with-late-packages=DIR
992 Specify location of late/system packages (instead of
993 default location; same as --with-system-packages).
994 --with-late-packages=DIR
995 Specify location of late/system packages (instead of
996 default location; same as --with-late-packages).
997 --with-last-packages=DIR
998 Specify location of last/legacy packages (instead of
999 default location; same as --with-legacy-packages).
1000 --with-late-packages=DIR
1001 Specify location of late/legacy packages (instead of
1002 default location; same as --with-late-packages).
987 --with-package-path=PATH 1003 --with-package-path=PATH
988 Search path for package hierarchies. 1004 Search path for package directories.
989 --with-infopath=PATH Location of info directories 1005 --with-infopath=PATH Location of info directories
990 1006
991 Window-system options 1007 Window-system options
992 --------------------- 1008 ---------------------
993 1009
2203 if test "${with_site_modules+set}" = set; then 2219 if test "${with_site_modules+set}" = set; then
2204 enableval="$with_site_modules" 2220 enableval="$with_site_modules"
2205 withval="$with_site_modules" 2221 withval="$with_site_modules"
2206 2222
2207 fi; 2223 fi;
2208 # If --with-package-prefix or --without-package-prefix were given then copy the value to the 2224 # If --with-early-packages or --without-early-packages were given then copy the value to the
2209 # equivalent enable_package-prefix variable. 2225 # equivalent enable_early-packages variable.
2210 if test "${with_package_prefix+set}" = set; then 2226 if test "${with_early_packages+set}" = set; then
2211 enable_package_prefix="$with_package_prefix" 2227 enable_early_packages="$with_early_packages"
2212 fi; 2228 fi;
2213 # If -enable-package-prefix or --disable-package-prefix were given then copy the value to the 2229 # If -enable-early-packages or --disable-early-packages were given then copy the value to the
2214 # equivalent with_package-prefix variable. 2230 # equivalent with_early-packages variable.
2215 if test "${enable_package_prefix+set}" = set; then 2231 if test "${enable_early_packages+set}" = set; then
2216 with_package_prefix="$enable_package_prefix" 2232 with_early_packages="$enable_early_packages"
2217 fi; 2233 fi;
2218 # Check whether --with-package-prefix or --without-package-prefix was given. 2234 # Check whether --with-early-packages or --without-early-packages was given.
2219 if test "${with_package_prefix+set}" = set; then 2235 if test "${with_early_packages+set}" = set; then
2220 enableval="$with_package_prefix" 2236 enableval="$with_early_packages"
2221 withval="$with_package_prefix" 2237 withval="$with_early_packages"
2222 cat >>confdefs.h <<\_ACEOF 2238 cat >>confdefs.h <<\_ACEOF
2223 #define PACKAGE_PATH_USER_DEFINED 1 2239 #define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1
2240 _ACEOF
2241
2242 fi;
2243 # If --with-user-packages or --without-user-packages were given then copy the value to the
2244 # equivalent enable_user-packages variable.
2245 if test "${with_user_packages+set}" = set; then
2246 enable_user_packages="$with_user_packages"
2247 fi;
2248 # If -enable-user-packages or --disable-user-packages were given then copy the value to the
2249 # equivalent with_user-packages variable.
2250 if test "${enable_user_packages+set}" = set; then
2251 with_user_packages="$enable_user_packages"
2252 fi;
2253 # Check whether --with-user-packages or --without-user-packages was given.
2254 if test "${with_user_packages+set}" = set; then
2255 enableval="$with_user_packages"
2256 withval="$with_user_packages"
2257 cat >>confdefs.h <<\_ACEOF
2258 #define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1
2259 _ACEOF
2260
2261 fi;
2262 # If --with-late-packages or --without-late-packages were given then copy the value to the
2263 # equivalent enable_late-packages variable.
2264 if test "${with_late_packages+set}" = set; then
2265 enable_late_packages="$with_late_packages"
2266 fi;
2267 # If -enable-late-packages or --disable-late-packages were given then copy the value to the
2268 # equivalent with_late-packages variable.
2269 if test "${enable_late_packages+set}" = set; then
2270 with_late_packages="$enable_late_packages"
2271 fi;
2272 # Check whether --with-late-packages or --without-late-packages was given.
2273 if test "${with_late_packages+set}" = set; then
2274 enableval="$with_late_packages"
2275 withval="$with_late_packages"
2276 cat >>confdefs.h <<\_ACEOF
2277 #define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1
2278 _ACEOF
2279
2280 fi;
2281 # If --with-system-packages or --without-system-packages were given then copy the value to the
2282 # equivalent enable_system-packages variable.
2283 if test "${with_system_packages+set}" = set; then
2284 enable_system_packages="$with_system_packages"
2285 fi;
2286 # If -enable-system-packages or --disable-system-packages were given then copy the value to the
2287 # equivalent with_system-packages variable.
2288 if test "${enable_system_packages+set}" = set; then
2289 with_system_packages="$enable_system_packages"
2290 fi;
2291 # Check whether --with-system-packages or --without-system-packages was given.
2292 if test "${with_system_packages+set}" = set; then
2293 enableval="$with_system_packages"
2294 withval="$with_system_packages"
2295 cat >>confdefs.h <<\_ACEOF
2296 #define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1
2297 _ACEOF
2298
2299 fi;
2300 # If --with-last-packages or --without-last-packages were given then copy the value to the
2301 # equivalent enable_last-packages variable.
2302 if test "${with_last_packages+set}" = set; then
2303 enable_last_packages="$with_last_packages"
2304 fi;
2305 # If -enable-last-packages or --disable-last-packages were given then copy the value to the
2306 # equivalent with_last-packages variable.
2307 if test "${enable_last_packages+set}" = set; then
2308 with_last_packages="$enable_last_packages"
2309 fi;
2310 # Check whether --with-last-packages or --without-last-packages was given.
2311 if test "${with_last_packages+set}" = set; then
2312 enableval="$with_last_packages"
2313 withval="$with_last_packages"
2314 cat >>confdefs.h <<\_ACEOF
2315 #define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1
2316 _ACEOF
2317
2318 fi;
2319 # If --with-legacy-packages or --without-legacy-packages were given then copy the value to the
2320 # equivalent enable_legacy-packages variable.
2321 if test "${with_legacy_packages+set}" = set; then
2322 enable_legacy_packages="$with_legacy_packages"
2323 fi;
2324 # If -enable-legacy-packages or --disable-legacy-packages were given then copy the value to the
2325 # equivalent with_legacy-packages variable.
2326 if test "${enable_legacy_packages+set}" = set; then
2327 with_legacy_packages="$enable_legacy_packages"
2328 fi;
2329 # Check whether --with-legacy-packages or --without-legacy-packages was given.
2330 if test "${with_legacy_packages+set}" = set; then
2331 enableval="$with_legacy_packages"
2332 withval="$with_legacy_packages"
2333 cat >>confdefs.h <<\_ACEOF
2334 #define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1
2224 _ACEOF 2335 _ACEOF
2225 2336
2226 fi; 2337 fi;
2227 # If --with-package-path or --without-package-path were given then copy the value to the 2338 # If --with-package-path or --without-package-path were given then copy the value to the
2228 # equivalent enable_package-path variable. 2339 # equivalent enable_package-path variable.
38800 *) break ;; 38911 *) break ;;
38801 esac 38912 esac
38802 done 38913 done
38803 38914
38804 38915
38805 if test -z "$with_package_path" && test -n "$with_package_prefix" ; then 38916 test -n "$with_user_packages" && with_early_packages=$with_user_packages
38806 if test "$enable_mule" = "yes" ; then 38917 early_packages=$with_early_packages
38807 with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages:${with_package_prefix}/mule-packages" 38918
38808 else 38919
38809 with_package_path="~/.xemacs::${with_package_prefix}/site-packages:${with_package_prefix}/xemacs-packages" 38920 EARLY_PACKAGE_DIRECTORIES=$with_early_packages
38810 fi 38921 while true; do
38811 fi 38922 case "$EARLY_PACKAGE_DIRECTORIES" in
38923 *\$* ) eval "EARLY_PACKAGE_DIRECTORIES=$EARLY_PACKAGE_DIRECTORIES" ;;
38924 *) break ;;
38925 esac
38926 done
38927
38928
38929 test -n "$with_system_packages" && with_late_packages=$with_system_packages
38930 late_packages=$with_late_packages
38931
38932
38933 LATE_PACKAGE_DIRECTORIES=$with_late_packages
38934 while true; do
38935 case "$LATE_PACKAGE_DIRECTORIES" in
38936 *\$* ) eval "LATE_PACKAGE_DIRECTORIES=$LATE_PACKAGE_DIRECTORIES" ;;
38937 *) break ;;
38938 esac
38939 done
38940
38941
38942 test -n "$with_legacy_packages" && with_last_packages=$with_legacy_packages
38943 last_packages=$with_last_packages
38944
38945
38946 LAST_PACKAGE_DIRECTORIES=$with_last_packages
38947 while true; do
38948 case "$LAST_PACKAGE_DIRECTORIES" in
38949 *\$* ) eval "LAST_PACKAGE_DIRECTORIES=$LAST_PACKAGE_DIRECTORIES" ;;
38950 *) break ;;
38951 esac
38952 done
38953
38812 38954
38813 package_path=$with_package_path 38955 package_path=$with_package_path
38814 38956
38815 38957
38816 PACKAGE_PATH=$with_package_path 38958 PACKAGE_PATH=$with_package_path
40125 s,@INFODIR_USER_DEFINED@,$INFODIR_USER_DEFINED,;t t 40267 s,@INFODIR_USER_DEFINED@,$INFODIR_USER_DEFINED,;t t
40126 s,@INFODIR@,$INFODIR,;t t 40268 s,@INFODIR@,$INFODIR,;t t
40127 s,@infopath@,$infopath,;t t 40269 s,@infopath@,$infopath,;t t
40128 s,@INFOPATH_USER_DEFINED@,$INFOPATH_USER_DEFINED,;t t 40270 s,@INFOPATH_USER_DEFINED@,$INFOPATH_USER_DEFINED,;t t
40129 s,@INFOPATH@,$INFOPATH,;t t 40271 s,@INFOPATH@,$INFOPATH,;t t
40272 s,@early_packages@,$early_packages,;t t
40273 s,@EARLY_PACKAGE_DIRECTORIES_USER_DEFINED@,$EARLY_PACKAGE_DIRECTORIES_USER_DEFINED,;t t
40274 s,@EARLY_PACKAGE_DIRECTORIES@,$EARLY_PACKAGE_DIRECTORIES,;t t
40275 s,@late_packages@,$late_packages,;t t
40276 s,@LATE_PACKAGE_DIRECTORIES_USER_DEFINED@,$LATE_PACKAGE_DIRECTORIES_USER_DEFINED,;t t
40277 s,@LATE_PACKAGE_DIRECTORIES@,$LATE_PACKAGE_DIRECTORIES,;t t
40278 s,@last_packages@,$last_packages,;t t
40279 s,@LAST_PACKAGE_DIRECTORIES_USER_DEFINED@,$LAST_PACKAGE_DIRECTORIES_USER_DEFINED,;t t
40280 s,@LAST_PACKAGE_DIRECTORIES@,$LAST_PACKAGE_DIRECTORIES,;t t
40130 s,@package_path@,$package_path,;t t 40281 s,@package_path@,$package_path,;t t
40131 s,@PACKAGE_PATH_USER_DEFINED@,$PACKAGE_PATH_USER_DEFINED,;t t 40282 s,@PACKAGE_PATH_USER_DEFINED@,$PACKAGE_PATH_USER_DEFINED,;t t
40132 s,@PACKAGE_PATH@,$PACKAGE_PATH,;t t 40283 s,@PACKAGE_PATH@,$PACKAGE_PATH,;t t
40133 s,@lispdir@,$lispdir,;t t 40284 s,@lispdir@,$lispdir,;t t
40134 s,@LISPDIR_USER_DEFINED@,$LISPDIR_USER_DEFINED,;t t 40285 s,@LISPDIR_USER_DEFINED@,$LISPDIR_USER_DEFINED,;t t