michael@369: Index: configure michael@524: --- configure.orig 2011-06-11 17:46:28.000000000 +0200 michael@524: +++ configure 2011-12-11 16:42:17.000000000 +0100 michael@370: @@ -3920,9 +3920,9 @@ michael@369: CFLAGS=$ac_save_CFLAGS michael@369: elif test $ac_cv_prog_cc_g = yes; then michael@369: if test "$GCC" = yes; then michael@369: - CFLAGS="-g -O2" michael@369: + CFLAGS="-O2" michael@369: else michael@369: - CFLAGS="-g" michael@369: + CFLAGS="" michael@369: fi michael@369: else michael@369: if test "$GCC" = yes; then michael@370: @@ -5425,7 +5425,7 @@ michael@369: # debug builds. michael@369: OPT="-g -O0 -Wall $STRICT_PROTO" michael@369: else michael@369: - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" michael@369: + OPT="$WRAP -O3 -Wall $STRICT_PROTO" michael@369: fi michael@369: ;; michael@369: *) michael@370: @@ -7813,7 +7813,7 @@ michael@369: then michael@369: LINKFORSHARED="-Wl,--export-dynamic" michael@369: fi;; michael@369: - SunOS/5*) case $CC in michael@369: + SunOS/5*) case gcc in michael@369: *gcc*) michael@369: if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null michael@369: then michael@369: Index: setup.py michael@524: --- setup.py.orig 2011-06-11 17:46:28.000000000 +0200 michael@524: +++ setup.py 2011-12-11 16:43:40.000000000 +0100 michael@370: @@ -369,8 +369,8 @@ michael@369: michael@369: def detect_modules(self): michael@369: # Ensure that /usr/local is always used michael@369: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') michael@369: - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') michael@369: + add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib') michael@369: + add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include') michael@370: self.add_multiarch_paths() michael@369: michael@369: # Add paths specified in the environment variables LDFLAGS and michael@370: @@ -703,8 +703,6 @@ michael@369: depends = ['socketmodule.h']) ) michael@369: # Detect SSL support for the socket module (via _ssl) michael@369: search_for_ssl_incs_in = [ michael@369: - '/usr/local/ssl/include', michael@369: - '/usr/contrib/ssl/include/' michael@369: ] michael@369: ssl_incs = find_file('openssl/ssl.h', inc_dirs, michael@369: search_for_ssl_incs_in michael@370: @@ -715,8 +713,7 @@ michael@369: if krb5_h: michael@369: ssl_incs += krb5_h michael@369: ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, michael@369: - ['/usr/local/ssl/lib', michael@369: - '/usr/contrib/ssl/lib/' michael@369: + ['@l_prefix@/lib' michael@369: ] ) michael@369: michael@369: if (ssl_incs is not None and michael@370: @@ -836,14 +833,8 @@ michael@369: # top of the normal inc_dirs. michael@369: db_inc_paths = [ michael@369: '/usr/include/db4', michael@369: - '/usr/local/include/db4', michael@369: '/opt/sfw/include/db4', michael@369: - '/usr/include/db3', michael@369: - '/usr/local/include/db3', michael@369: - '/opt/sfw/include/db3', michael@369: - # Fink defaults (http://fink.sourceforge.net/) michael@369: '/sw/include/db4', michael@369: - '/sw/include/db3', michael@369: ] michael@369: # 4.x minor number specific paths michael@369: for x in gen_db_minor_ver_nums(4): michael@370: @@ -1731,6 +1722,7 @@ michael@369: dotversion = dotversion[:-1] + '.' + dotversion[-1] michael@369: tcl_include_sub = [] michael@369: tk_include_sub = [] michael@369: + dotversion = '' michael@369: for dir in inc_dirs: michael@369: tcl_include_sub += [dir + os.sep + "tcl" + dotversion] michael@369: tk_include_sub += [dir + os.sep + "tk" + dotversion]