diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-10-14 14:17:14 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-10-14 14:17:14 +0300 |
| commit | 9397bb61baeebcafda97c61c81dfbc1c4af96c17 (patch) | |
| tree | 77af471ac8b95b9c19d1f2977d494292df0c2325 | |
| parent | 3cc7a1ef99d5832b35239afca0c3a978d1984ae5 (diff) | |
| download | librpm-tizen-9397bb61baeebcafda97c61c81dfbc1c4af96c17.tar.gz librpm-tizen-9397bb61baeebcafda97c61c81dfbc1c4af96c17.tar.bz2 librpm-tizen-9397bb61baeebcafda97c61c81dfbc1c4af96c17.zip | |
Kick out ancient and unused LDFLAGS_STATIC configure.ac-hackery
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 45 |
2 files changed, 0 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index 04bf68032..74f103183 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,8 +37,6 @@ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\"" AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"@RPMCONFIGDIR@/rpmpopt-${VERSION}\"" -staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@ - pkginclude_HEADERS = nodist_pkginclude_HEADERS = diff --git a/configure.ac b/configure.ac index 2a8576a51..51f2e1bed 100644 --- a/configure.ac +++ b/configure.ac @@ -53,51 +53,6 @@ export CFLAGS AC_SYS_LARGEFILE dnl -dnl This now uses libtool. Put -dnl LDFLAGS_STATIC="-all" -dnl to attempt static executables using libtool. Otherwise -dnl LDFLAGS_STATIC="" -dnl -AC_MSG_CHECKING(flag used by libtool to link rpm) -if test X"$GCC" = Xyes ; then - case "$host" in - *-*-linux*) LDFLAGS_STATIC="-all-static" ;; - *-*-solaris*) LDFLAGS_STATIC="-static";; - *-*-hpux*) LDFLAGS_STATIC="-static";; - *-*-darwin*) LDFLAGS_STATIC="";; # Mac OS X does not do static binaries. - *-*-sysv5uw*) LDFLAGS_STATUS="-static";; # Unixware has no shared libthread. - *-*-*) LDFLAGS_STATIC="";; - esac -elif test X"$CC" = Xcc ; then - case "$host" in - *-*-linux*) LDFLAGS_STATIC="-all-static";; - *-*-freebsd*) LDFLAGS_STATIC="-all-static";; - *-*-osf*) LDFLAGS_STATIC="";; # OSF5 has no shared pthreads libs - *-*-aix*) LDFLAGS_STATIC="-static";; # -Wl,-bnso doesn't seem to work... - *-*-hpux*) LDFLAGS_STATIC="-static";; - *-*-solaris*) LDFLAGS_STATIC="-static";; - *-*-irix*) LDFLAGS_STATIC="-static";; #should be -non_shared, but can't - # link because of crt1.o then. - *-*-ultrix*) LDFLAGS_STATIC="-all-static";; #ultrix doesn't have shared libs. - *-*-*) LDFLAGS_STATIC="" -AC_MSG_WARN([ - -Unable to guess what option to pass to $CC to generate a static -executable. You will need to set the LDFLAGS_STATIC macro in Makefile.inc to -the appropriate argument(s) if you want to build a static rpm executable. - -]) - ;; - esac -else - # just link it dynamically - LDFLAGS_STATIC="" -fi -LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format -AC_MSG_RESULT($LDFLAGS_STATIC) -AC_SUBST(LDFLAGS_STATIC) - -dnl dnl look for POSIX chmod attributes dnl AC_MSG_CHECKING(POSIX chmod) |