--- rpl/Attic/configure 2010/04/07 13:44:59 1.16 +++ rpl/Attic/configure 2010/04/17 18:57:33 1.17 @@ -608,6 +608,9 @@ GSL UNITS READLINE NCURSES +SEMAPHORES_NOMMES +NESTED_FUNCTIONS +EXPORT_DYNAMIC LIBMTMALLOC OS GNUPLOT_COMPILATION @@ -641,7 +644,6 @@ SED RANLIB LN_S RUNPATH -LIBTOOLIZE PROFILAGE X_EXTRA_LIBS X_LIBS @@ -789,12 +791,12 @@ XMKMF CPP' ac_subdirs_all='tools/$NCURSES tools/$READLINE -tools/$UNITS tools/$GSL tools/$GPP tools/$FILE tools/$ICONV tools/$SQLITE +tools/$UNITS tools/$GNUPLOT' # Initialize some variables set by options. @@ -6042,16 +6044,7 @@ fi if test ! -d "$srcdir"/tools/$FILE; then gunzip -c "$srcdir"/tools/$FILE.tar.gz | \ (cd "$srcdir/tools" && tar -xf - ) - TMP=$(mktemp) (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1) - sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP - sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \ - sed 's/^file_/rplfile_/g' > \ - "$srcdir"/tools/$FILE/src/Makefile.am - sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP - \mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am - (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ - && aclocal && automake -af && autoconf); fi if test ! -d "$srcdir"/tools/$ICONV; then gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ @@ -6066,174 +6059,6 @@ if test ! -d tools/$OPENSSL; then (cd tools && tar -xf -) fi -# Extract the first word of "libtoolize", so it can be a program name with args. -set dummy libtoolize; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIBTOOLIZE+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIBTOOLIZE"; then - ac_cv_prog_LIBTOOLIZE="$LIBTOOLIZE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIBTOOLIZE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_LIBTOOLIZE" && ac_cv_prog_LIBTOOLIZE="no" -fi -fi -LIBTOOLIZE=$ac_cv_prog_LIBTOOLIZE -if test -n "$LIBTOOLIZE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBTOOLIZE" >&5 -$as_echo "$LIBTOOLIZE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$LIBTOOLIZE" = "no"; then - as_fn_error "Cannot find libtoolize! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "aclocal", so it can be a program name with args. -set dummy aclocal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ACLOCAL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ACLOCAL"; then - ac_cv_prog_ACLOCAL="$ACLOCAL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ACLOCAL="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_ACLOCAL" && ac_cv_prog_ACLOCAL="no" -fi -fi -ACLOCAL=$ac_cv_prog_ACLOCAL -if test -n "$ACLOCAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ACLOCAL" >&5 -$as_echo "$ACLOCAL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$ACLOCAL" = "no"; then - as_fn_error "Cannot find aclocal! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "automake", so it can be a program name with args. -set dummy automake; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AUTOMAKE+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AUTOMAKE"; then - ac_cv_prog_AUTOMAKE="$AUTOMAKE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AUTOMAKE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_AUTOMAKE" && ac_cv_prog_AUTOMAKE="no" -fi -fi -AUTOMAKE=$ac_cv_prog_AUTOMAKE -if test -n "$AUTOMAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOMAKE" >&5 -$as_echo "$AUTOMAKE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$AUTOMAKE" = "no"; then - as_fn_error "Cannot find automake! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "autoconf", so it can be a program name with args. -set dummy autoconf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AUTOCONF+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AUTOCONF"; then - ac_cv_prog_AUTOCONF="$AUTOCONF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AUTOCONF="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_AUTOCONF" && ac_cv_prog_AUTOCONF="no" -fi -fi -AUTOCONF=$ac_cv_prog_AUTOCONF -if test -n "$AUTOCONF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOCONF" >&5 -$as_echo "$AUTOCONF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$AUTOCONF" = "no"; then - as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5 -fi - # Check whether --enable-final-run-path was given. @@ -9012,14 +8837,14 @@ fi done +ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared" + subdirs="$subdirs tools/$NCURSES" subdirs="$subdirs tools/$READLINE" -subdirs="$subdirs tools/$UNITS" - subdirs="$subdirs tools/$GSL" subdirs="$subdirs tools/$GPP" @@ -9030,6 +8855,8 @@ subdirs="$subdirs tools/$ICONV" subdirs="$subdirs tools/$SQLITE" +subdirs="$subdirs tools/$UNITS" + # Check whether --with-openssl_arch was given. @@ -9125,6 +8952,31 @@ else LIBMTMALLOC= fi +case $(OS) in + + Darwin) + EXPORT_DYNAMIC=-flat_namespace + NESTED_FUNCTIONS=-fnested-functions + SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + break ;; + + Cygwin) + EXPORT_DYNAMIC=--export-all-symbols + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + break ;; + + *) + EXPORT_DYNAMIC=--export-dynamic + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + break ;; + +esac + + + +