--- rpl/Attic/configure 2011/10/05 13:14:17 1.90 +++ rpl/Attic/configure 2011/11/17 19:29:36 1.93 @@ -639,6 +639,7 @@ SEMAPHORES_NOMMES NESTED_FUNCTIONS EXPORT_DYNAMIC C_STANDARD +LIB_PREFIX WHOLE_LIB2 WHOLE_LIB1 OS @@ -675,6 +676,7 @@ LN_S RUNPATH PROFILAGE subdirs +PSELECT SHARED_MEMORY LIBRPLCAS RPLCAS @@ -714,6 +716,8 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -790,13 +794,14 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking with_x with_32bits_abi with_64bits_abi +enable_recursive with_rpltools enable_rplcas -enable_shared_memory enable_optimization enable_sysv_ipcs enable_full_static @@ -1468,10 +1473,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-recursive recursive configuration (default=yes) --enable-rplcas compile rplcas (default=no) - --enable-shared-memory enable shared memory [default=yes] --enable-optimization set compiler flags [default=environment variables -O3] --enable-sysv-ipcs use SystemV IPC functions [default=guessed] --enable-full-static build static RPL/2 engine [default=shared] @@ -3196,6 +3203,18 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=1;; +esac +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3258,6 +3277,18 @@ am__tar='${AMTAR} chof - "$$tardir"'; am +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' + ac_config_headers="$ac_config_headers rplconfig.h" @@ -5954,6 +5985,22 @@ fi LDFLAGS="$LDFLAGS $ABI" +# Check whether --enable-recursive was given. +if test "${enable_recursive+set}" = set; then : + enableval=$enable_recursive; +if test "$enableval" = "yes"; then + RECURSIVE=yes +else + RECURSIVE=no +fi +else + + RECURSIVE=yes + + +fi + + # Check whether --with-rpltools was given. if test "${with_rpltools+set}" = set; then : @@ -5996,22 +6043,6 @@ fi -# Check whether --enable-shared-memory was given. -if test "${enable_shared_memory+set}" = set; then : - enableval=$enable_shared_memory; -if test "$enableval" = "no"; then - SHARED_MEMORY="-USHARED_MEMORY" -else - SHARED_MEMORY="-DSHARED_MEMORY" -fi -else - - SHARED_MEMORY="-USHARED_MEMORY" -fi - - - - # Check whether --enable-optimization was given. if test "${enable_optimization+set}" = set; then : enableval=$enable_optimization; @@ -6037,6 +6068,67 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable shared memory" >&5 +$as_echo_n "checking for usable shared memory... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ + return(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + SHARED_MEMORY=-DSHARED_MEMORY; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + SHARED_MEMORY=-USHARED_MEMORY; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pselect" >&5 +$as_echo_n "checking for pselect... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + #include + +int +main () +{ + + struct timespec tv; + fd_set s1, s2, s3; + tv.tv_sec=1; + tv.tv_nsec=0; + FD_SET(1, &s1); FD_SET(2, &s2); FD_SET(3, &s3); + pselect(5, &s1, &s2, &s3, &tv, NULL); + return(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + PSELECT=-DPSELECT; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + PSELECT=-UPSELECT; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # Check whether --enable-sysv-ipcs was given. if test "${enable_sysv_ipcs+set}" = set; then : enableval=$enable_sysv_ipcs; @@ -6266,14 +6358,17 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a" INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \ -I\$(top_builddir)/tools/$OPENMOTIF/lib \ - -I\$(top_builddir)/tools/$LIBXPM/include" + -I\$(top_srcdir)/tools/$LIBXPM/include" BUILD_OPENMOTIF="$LIBXPM $OPENMOTIF" + if test $RECURSIVE = yes; then + subdirs="$subdirs tools/$LIBXPM" - subdirs="$subdirs tools/$OPENMOTIF" + subdirs="$subdirs tools/$OPENMOTIF" + fi; fi # Check whether --enable-experimental was given. @@ -9258,7 +9353,11 @@ if test "$MYGNUPLOT" = "yes"; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi - subdirs="$subdirs tools/$GNUPLOT" + + if test $RECURSIVE = yes; then + subdirs="$subdirs tools/$GNUPLOT" + + fi GNUPLOT_COMPILATION=$GNUPLOT else @@ -9497,11 +9596,13 @@ case $OS in OS2) WHOLE_LIB1="" WHOLE_LIB2="" + LIB_PREFIX="" break ;; *) WHOLE_LIB1="-Wl,-whole-archive" WHOLE_LIB2="-Wl,-no-whole-archive" + LIB_PREFIX="lib" break ;; esac @@ -9552,24 +9653,27 @@ esac -subdirs="$subdirs tools/$NCURSES" -subdirs="$subdirs tools/$READLINE" +if test $RECURSIVE = yes; then + subdirs="$subdirs tools/$NCURSES" -subdirs="$subdirs tools/$GSL" + subdirs="$subdirs tools/$READLINE" -subdirs="$subdirs tools/$GPP" + subdirs="$subdirs tools/$GSL" -subdirs="$subdirs tools/$FILE" + subdirs="$subdirs tools/$GPP" -subdirs="$subdirs tools/$ICONV" + subdirs="$subdirs tools/$FILE" -subdirs="$subdirs tools/$SQLITE" + subdirs="$subdirs tools/$ICONV" -subdirs="$subdirs tools/$UNITS" + subdirs="$subdirs tools/$SQLITE" -subdirs="$subdirs tools/$SIGSEGV" + subdirs="$subdirs tools/$UNITS" + subdirs="$subdirs tools/$SIGSEGV" + +fi ac_config_files="$ac_config_files Makefile"