diff options
author | Mark Whitley <markw@lineo.com> | 2001-04-25 17:05:51 +0000 |
---|---|---|
committer | Mark Whitley <markw@lineo.com> | 2001-04-25 17:05:51 +0000 |
commit | 67d7fe66e753aa1e96639a10a0a9a781912c74ca (patch) | |
tree | c2aa08153c06ee4663fb4a50835a026729b38acd | |
parent | 4f3558af1774569b3de73bd45232d2dacb4fb71e (diff) | |
download | busybox-w32-67d7fe66e753aa1e96639a10a0a9a781912c74ca.tar.gz busybox-w32-67d7fe66e753aa1e96639a10a0a9a781912c74ca.tar.bz2 busybox-w32-67d7fe66e753aa1e96639a10a0a9a781912c74ca.zip |
Sync'ed up the olympus section between this and stock Config.h
-rw-r--r-- | Config.h.Hurd | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/Config.h.Hurd b/Config.h.Hurd index f94e4a9e5..621fbb5a9 100644 --- a/Config.h.Hurd +++ b/Config.h.Hurd | |||
@@ -275,20 +275,9 @@ | |||
275 | // Nothing beyond this point should ever be touched by | 275 | // Nothing beyond this point should ever be touched by |
276 | // mere mortals so leave this stuff alone. | 276 | // mere mortals so leave this stuff alone. |
277 | // | 277 | // |
278 | #if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF | ||
279 | #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT | ||
280 | #define BB_MTAB | ||
281 | #endif | ||
282 | #else | ||
283 | #undef BB_MTAB | ||
284 | #endif | ||
285 | // | ||
286 | #if defined BB_SH | 278 | #if defined BB_SH |
287 | #if defined BB_FEATURE_COMMAND_EDITING | 279 | #if defined BB_FEATURE_COMMAND_EDITING |
288 | #define BB_CMDEDIT | 280 | #define BB_CMDEDIT |
289 | #ifndef BB_FEATURE_USE_TERMIOS | ||
290 | #define BB_FEATURE_USE_TERMIOS | ||
291 | #endif | ||
292 | #else | 281 | #else |
293 | #undef BB_FEATURE_COMMAND_EDITING | 282 | #undef BB_FEATURE_COMMAND_EDITING |
294 | #undef BB_FEATURE_COMMAND_TAB_COMPLETION | 283 | #undef BB_FEATURE_COMMAND_TAB_COMPLETION |
@@ -296,7 +285,6 @@ | |||
296 | #define BB_FEATURE_SH_SIMPLE_PROMPT | 285 | #define BB_FEATURE_SH_SIMPLE_PROMPT |
297 | #endif | 286 | #endif |
298 | #else | 287 | #else |
299 | #undef BB_FEATURE_COMMAND_EDITING | ||
300 | #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN | 288 | #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN |
301 | #undef BB_FEATURE_SH_STANDALONE_SHELL | 289 | #undef BB_FEATURE_SH_STANDALONE_SHELL |
302 | #undef BB_FEATURE_SH_SIMPLE_PROMPT | 290 | #undef BB_FEATURE_SH_SIMPLE_PROMPT |
@@ -312,38 +300,6 @@ | |||
312 | #undef BB_FEATURE_LINUXRC | 300 | #undef BB_FEATURE_LINUXRC |
313 | #endif | 301 | #endif |
314 | // | 302 | // |
315 | #ifdef BB_GZIP | ||
316 | #ifndef BB_GUNZIP | ||
317 | #define BB_GUNZIP | ||
318 | #endif | ||
319 | #endif | ||
320 | // | ||
321 | #ifdef BB_DPKG | ||
322 | #ifndef BB_DPKG_DEB | ||
323 | #define BB_DPKG_DEB | ||
324 | #endif | ||
325 | #endif | ||
326 | // | ||
327 | #ifdef BB_DPKG_DEB | ||
328 | #ifndef BB_AR | ||
329 | #define BB_AR | ||
330 | #endif | ||
331 | #ifndef BB_TAR | ||
332 | #define BB_TAR | ||
333 | #endif | ||
334 | #ifndef BB_FEATURE_TAR_GZIP | ||
335 | #define BB_FEATURE_TAR_GZIP | ||
336 | #endif | ||
337 | #endif | ||
338 | // | ||
339 | #ifdef BB_TAR | ||
340 | #ifdef BB_FEATURE_TAR_GZIP | ||
341 | #ifndef BB_GUNZIP | ||
342 | #define BB_GUNZIP | ||
343 | #endif | ||
344 | #endif | ||
345 | #endif | ||
346 | // | ||
347 | #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT | 303 | #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT |
348 | #define BB_NFSMOUNT | 304 | #define BB_NFSMOUNT |
349 | #endif | 305 | #endif |
@@ -365,8 +321,3 @@ | |||
365 | #define BB_LOGREAD | 321 | #define BB_LOGREAD |
366 | #endif | 322 | #endif |
367 | #endif | 323 | #endif |
368 | // | ||
369 | #if defined BB_DOS2UNIX | ||
370 | #define BB_UNIX2DOS | ||
371 | #endif | ||
372 | |||