diff --git a/mta-mono/configure b/mta-mono/configure index 2e7606b..139f395 100644 --- a/mta-mono/configure +++ b/mta-mono/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mta-mono 0.25a. +# Generated by GNU Autoconf 2.69 for mta-mono 0.26a. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mta-mono' PACKAGE_TARNAME='mta-mono' -PACKAGE_VERSION='0.25a' -PACKAGE_STRING='mta-mono 0.25a' +PACKAGE_VERSION='0.26a' +PACKAGE_STRING='mta-mono 0.26a' PACKAGE_BUGREPORT='kernell.it@gmail.com' PACKAGE_URL='' @@ -669,7 +669,6 @@ am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE ac_ct_CXX -CXXFLAGS CXX am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -686,10 +685,11 @@ EXEEXT ac_ct_CC CPPFLAGS LDFLAGS -CFLAGS CC ac_ct_AR AR +CXXFLAGS +CFLAGS AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -759,6 +759,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules +enable_debug enable_dependency_tracking enable_shared enable_static @@ -1323,7 +1324,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mta-mono 0.25a to adapt to many kinds of systems. +\`configure' configures mta-mono 0.26a to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1394,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mta-mono 0.25a:";; + short | recursive ) echo "Configuration of mta-mono 0.26a:";; esac cat <<\_ACEOF @@ -1403,6 +1404,7 @@ Optional Features: --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") + --enable-debug compile with debug symbols [default=no] --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -1506,7 +1508,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mta-mono configure 0.25a +mta-mono configure 0.26a generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1959,7 +1961,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mta-mono $as_me 0.25a, which was +It was created by mta-mono $as_me 0.26a, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2822,7 +2824,7 @@ fi # Define the identity of the package. PACKAGE='mta-mono' - VERSION='0.25a' + VERSION='0.26a' cat >>confdefs.h <<_ACEOF @@ -2915,6 +2917,41 @@ END fi fi + +# prevent setting xFLAGS to default of -g -O2 +if test x"$CFLAGS" = x""; then + CFLAGS= + +fi +if test x"$CXXFLAGS" = x""; then + CXXFLAGS= + +fi + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5;; + esac +else + debug=false + +fi + + +if test x"$debug" == x"true"; then + CFLAGS="$CFLAGS -std=c++0x -Wall -O0 -pipe -fPIC -ggdb -D_DEBUG -D_REENTRANT" + CXXFLAGS="$CXXFLAGS -std=c++0x -Wall -O0 -pipe -fPIC -D_DEBUG -ggdb -D_REENTRANT" + +$as_echo "#define DEBUG 1" >>confdefs.h + +else + CFLAGS="$CFLAGS -std=c++0x -Wall -O2 -pipe -fPIC -MD -DNDEBUG -D_REENTRANT" + CXXFLAGS="$CXXFLAGS -std=c++0x -Wall -O2 -pipe -fPIC -MD -DNDEBUG -D_REENTRANT" +fi + ac_config_files="$ac_config_files Makefile src/Makefile src/extra/Makefile src/lua/Makefile" @@ -17309,7 +17346,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mta-mono $as_me 0.25a, which was +This file was extended by mta-mono $as_me 0.26a, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17366,7 +17403,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mta-mono config.status 0.25a +mta-mono config.status 0.26a configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/mta-mono/configure.ac b/mta-mono/configure.ac index 50ef814..598cdf1 100644 --- a/mta-mono/configure.ac +++ b/mta-mono/configure.ac @@ -2,21 +2,9 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT(mta-mono, 0.25a, kernell.it@gmail.com) +AC_INIT(mta-mono, 0.26a, kernell.it@gmail.com) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -AC_ARG_ENABLE(debug, -AS_HELP_STRING([--enable-debug], - [enable debugging, default: no]), -[case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; -esac], -[debug=false]) - -AM_CONDITIONAL(DEBUG, test x"$debug" = x"true") - # prevent setting xFLAGS to default of -g -O2 if test x"$CFLAGS" = x""; then AC_SUBST(CFLAGS, [ ]) @@ -25,18 +13,23 @@ if test x"$CXXFLAGS" = x""; then AC_SUBST(CXXFLAGS, [ ]) fi -AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [compile with debug symbols @<:@default=no@:>@]), - [want_debug="$enableval"], [want_debug=no]) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], [compile with debug symbols @<:@default=no@:>@]), + [case "${enableval}" in + yes) debug=true ;; + no) debug=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]);; + esac], + [debug=false] +) -if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then - CFLAGS="$CFLAGS -std=c++0x -pipe -Wall -O0 -ggdb -Wl,--export-dynamic" - CXXFLAGS="$CXXFLAGS -std=c++0x -pipe -Wall -O0 -ggdb -Wl,--export-dynamic" +if test x"$debug" == x"true"; then + CFLAGS="$CFLAGS -std=c++0x -Wall -O0 -pipe -fPIC -ggdb -D_DEBUG -D_REENTRANT" + CXXFLAGS="$CXXFLAGS -std=c++0x -Wall -O0 -pipe -fPIC -D_DEBUG -ggdb -D_REENTRANT" AC_DEFINE([DEBUG], 1, [Define for debugging]) else - CFLAGS="$CFLAGS -std=c++0x -pipe -Wall -O2 -DNDEBUG -D_FORTIFY_SOURCE=2 -fPIC -MD -Wl,--export-dynamic" - CXXFLAGS="$CXXFLAGS -std=c++0x -pipe -Wall -O2 -DNDEBUG -D_FORTIFY_SOURCE=2 -fPIC -MD -Wl,--export-dynamic" + CFLAGS="$CFLAGS -std=c++0x -Wall -O2 -pipe -fPIC -MD -DNDEBUG -D_REENTRANT" + CXXFLAGS="$CXXFLAGS -std=c++0x -Wall -O2 -pipe -fPIC -MD -DNDEBUG -D_REENTRANT" fi AC_CONFIG_FILES([Makefile src/Makefile src/extra/Makefile src/lua/Makefile]) diff --git a/mta-mono/libtool b/mta-mono/libtool index 7090846..42391bb 100644 --- a/mta-mono/libtool +++ b/mta-mono/libtool @@ -1,6 +1,6 @@ #! /bin/sh -# Generated automatically by config.status (mta-mono) 0.25a -# Libtool was configured on host localhost.localdomain: +# Generated automatically by config.status (mta-mono) 0.26a +# Libtool was configured on host linux-plf4: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -51,7 +51,7 @@ build_old_libs=yes pic_mode=default # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # Shared archive member basename,for filename based shared library versioning on AIX. shared_archive_member_spec= @@ -94,7 +94,7 @@ FGREP="/usr/bin/grep -F" NM="/usr/bin/nm -B" # Whether we need soft or hard links. -LN_S="ln -s" +LN_S="cp -pR" # What is the maximum length of a command? max_cmd_len=1572864 @@ -165,7 +165,7 @@ lock_old_archive_extraction=no LTCC="gcc" # LTCC compiler flags. -LTCFLAGS="-g -O2" +LTCFLAGS=" -std=c++0x -Wall -O2 -pipe -fPIC -MD -DNDEBUG -D_REENTRANT" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" @@ -250,7 +250,7 @@ runpath_var=LD_RUN_PATH shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no +shlibpath_overrides_runpath=yes # Format of library name prefix. libname_spec="lib\$name" @@ -282,10 +282,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/5.3.1 /usr/lib64 /lib64 /usr/lib /lib " +sys_lib_search_path_spec="/usr/lib64/gcc/x86_64-suse-linux/5 /usr/lib64 /lib64 /usr/x86_64-suse-linux/lib /lib /usr/lib " # Detected run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/bind99 /usr/lib64/dyninst /usr/lib64/llvm /usr/lib64/mysql " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/local/lib64 /usr/local/lib /usr/lib64/graphviz /usr/lib64/graphviz/sharp /usr/lib64/graphviz/java /usr/lib64/graphviz/perl /usr/lib64/graphviz/php /usr/lib64/graphviz/ocaml /usr/lib64/graphviz/python /usr/lib64/graphviz/lua /usr/lib64/graphviz/tcl /usr/lib64/graphviz/guile /usr/lib64/graphviz/ruby " # Explicit LT_SYS_LIBRARY_PATH set during ./configure time. configure_time_lt_sys_library_path="" @@ -305,7 +305,7 @@ striplib="strip --strip-unneeded" # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64" # How to create reloadable object files. reload_flag=" -r" @@ -11661,7 +11661,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### BEGIN LIBTOOL TAG CONFIG: CXX # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64" # How to create reloadable object files. reload_flag=" -r" @@ -11792,17 +11792,17 @@ file_list_spec="" hardcode_action=immediate # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/5.3.1 /usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../.." +compiler_lib_search_dirs="/usr/lib64/gcc/x86_64-suse-linux/5 /usr/lib64/gcc/x86_64-suse-linux/5/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib64/gcc/x86_64-suse-linux/5/../../../../x86_64-suse-linux/lib /usr/lib64/gcc/x86_64-suse-linux/5/../../.." # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/5.3.1/crtbeginS.o" -postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/5.3.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../../../lib64/crtn.o" +predep_objects="/usr/lib64/gcc/x86_64-suse-linux/5/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-suse-linux/5/crtbeginS.o" +postdep_objects="/usr/lib64/gcc/x86_64-suse-linux/5/crtendS.o /usr/lib64/gcc/x86_64-suse-linux/5/../../../../lib64/crtn.o" predeps="" postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/5.3.1 -L/usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/5.3.1/../../.." +compiler_lib_search_path="-L/usr/lib64/gcc/x86_64-suse-linux/5 -L/usr/lib64/gcc/x86_64-suse-linux/5/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/5/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/5/../../.." # ### END LIBTOOL TAG CONFIG: CXX diff --git a/mta-mono/src/Makefile.am b/mta-mono/src/Makefile.am index 0651300..57e4982 100644 --- a/mta-mono/src/Makefile.am +++ b/mta-mono/src/Makefile.am @@ -44,4 +44,4 @@ libmta_mono_la_SOURCES = \ mta-mono.cpp \ StdInc.cpp -libmta_mono_la_LIBADD = -L/usr/lib64 -lmono-2.0 -lm -lrt -ldl -lpthread -lstdc++ -llua_f_defs -lmta_mono_extra -llua -leglib -L./lua -L./extra -L../lib -L../vendor/lua51/src +libmta_mono_la_LIBADD = -L/usr/lib64 -lmono-2.0 -lm -lrt -ldl -lpthread -lstdc++ -llua_f_defs -lmta_mono_extra -llua -L./lua -L./extra -L../lib -L../vendor/lua51/src