diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-11 03:36:47 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-11 03:36:47 +0000 |
| commit | e4b5ba71fc587c0333fbc5a8d6c6192fa7d5fb37 (patch) | |
| tree | 5b773046c722bd0ed4b98e6889e13dd6b9a78e2b | |
| parent | a4838e09a3c3bd7b5d4df9b082190c47d7641d23 (diff) | |
| download | xine-lib-e4b5ba71fc587c0333fbc5a8d6c6192fa7d5fb37.tar.gz xine-lib-e4b5ba71fc587c0333fbc5a8d6c6192fa7d5fb37.tar.bz2 | |
Remove the libtool hacking, --without-pic will do just as --enable-fpic if the platform supports it. Trust libtool when possible (most of non-PIC-compatible code should be easily fixable anyway).
CVS patchset: 8111
CVS date: 2006/07/11 03:36:47
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/configure.ac b/configure.ac index 734c17254..ade832a89 100644 --- a/configure.ac +++ b/configure.ac @@ -1877,14 +1877,6 @@ fi dnl --------------------------------------------- -dnl Using or not using -fPIC (override default behavior - system dependent) -dnl --------------------------------------------- - -AC_ARG_ENABLE(fpic, AC_HELP_STRING([--disable-fpic], [disable -fPIC on shared libs (default on x86)]), - enable_fpic=$enableval) - - -dnl --------------------------------------------- dnl Some extra checks. dnl --------------------------------------------- @@ -2403,43 +2395,6 @@ win32/include/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) AC_OUTPUT - -dnl --------------------------------------------- -dnl Hack the libtool script (if required). -dnl -dnl If user intentionnaly overrided detection, use wish. -dnl --------------------------------------------- - -if test x"$enable_fpic" != x; then - case "${enable_fpic}" in - yes) - no_fpic="no" - ;; - *) - no_fpic="yes" - ;; - esac -fi - -dnl made libtool define BUILD_BASENAME -dnl cat libtool | sed -e 's/s/command\=\"\$base_compile\ \$srcfile/command\=\"\$base_compile\ \$srcfile\ \-DBUILD_BASENAME\=\`echo\ \$srcfile\ \|\ sed\ \-e\ '\''s\/\\.\[csS\]\/\/g'\''\`/g' > libtool.tmp -dnl cat libtool.tmp > libtool -dnl chmod +x libtool - -dnl make libtool-nofpic silent and not installing plugins's .la files -cat libtool | sed -e 's/^.*echo \"---------.*$/exit 0/;s/# Install the pseudo-library.*/continue/' > libtool.tmp - -dnl Remove fPIC flag, if necessary -if test x$no_fpic = "xyes"; then - cat libtool.tmp | sed -e 's/^pic_flag=/#pic_flag=/;s/^ *pic_mode=.*$/pic_mode=no/' > libtool-nofpic -else - cat libtool.tmp > libtool-nofpic -fi - -rm -f libtool.tmp -chmod +x libtool-nofpic - - dnl --------------------------------------------- dnl Some infos: dnl --------------------------------------------- |