diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-10-31 05:40:23 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-10-31 05:40:23 +0000 |
| commit | 0959854e8a222a638631d9ebe8ffe4d5f4cfc7b0 (patch) | |
| tree | bde4f0f36a3d0d6c4588c363f73e99fb04423e32 /src/config | |
| parent | c67bc0047686ab06ca4222e0bfdfe6ba423e147b (diff) | |
| download | krb5-0959854e8a222a638631d9ebe8ffe4d5f4cfc7b0.zip krb5-0959854e8a222a638631d9ebe8ffe4d5f4cfc7b0.tar.gz krb5-0959854e8a222a638631d9ebe8ffe4d5f4cfc7b0.tar.bz2 | |
Use ac_cv_c_compiler_gnu instead of copying it to krb5_cv_prog_gcc
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20154 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/shlib.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/config/shlib.conf b/src/config/shlib.conf index 5f5b95d..197e744 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -67,7 +67,7 @@ alpha*-dec-osf*) PROFFLAGS=-pg RPATH_FLAG='-Wl,-rpath -Wl,' CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' - if test "$krb5_cv_prog_gcc" = yes \ + if test "$ac_cv_c_compiler_gnu" = yes \ && test "$krb5_cv_prog_gnu_ld" = yes; then # Really should check for gnu ld vs system ld, too. CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' @@ -108,7 +108,7 @@ alpha*-dec-osf*) SHLIBVEXT='.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.$(LIBMAJOR)' RPATH_FLAG='-Wl,+b,' - if test "$krb5_cv_prog_gcc" = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then PICFLAGS=-fPIC SHLIB_EXPFLAGS='-Wl,+s -Wl,+b,$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' LDCOMBINE='gcc -fPIC -shared -Wl,+h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-c,hpux10.exports' @@ -138,7 +138,7 @@ mips-sgi-irix6.3) # This is a Kludge; see below SHLIBEXT=.so SHOBJEXT=.o # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld) - if test "$krb5_cv_prog_gcc" = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' else LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' @@ -171,7 +171,7 @@ mips-sgi-irix*) SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so SHOBJEXT=.o - if test "$krb5_cv_prog_gcc" = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then LDCOMBINE_TAIL="" INIT_FINI_PREP="initfini=" else @@ -182,7 +182,7 @@ mips-sgi-irix*) fi opts='-Wl,-ignore_unresolved -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations' - if test "$krb5_cv_prog_gcc" = yes \ + if test "$ac_cv_c_compiler_gnu" = yes \ && test "$krb5_cv_prog_gnu_ld" = yes; then opts='' fi @@ -212,7 +212,7 @@ mips-sgi-irix*) # untested... mips-sni-sysv4) - if test "$krb5_cv_prog_gcc" = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then PICFLAGS=-fpic LDCOMBINE='$(CC) -G -Wl,-h -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' else @@ -316,7 +316,7 @@ mips-*-netbsd*) ;; *-*-solaris*) - if test "$krb5_cv_prog_gcc" = yes; then + if test "$ac_cv_c_compiler_gnu" = yes; then PICFLAGS=-fPIC LDCOMBINE='$(CC) $(CFLAGS) -shared -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' else @@ -399,7 +399,7 @@ mips-*-netbsd*) SHOBJEXT=.o SHLIB_EXPFLAGS=' $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg - if test "$krb5_cv_prog_gcc" = "yes" ; then + if test "$ac_cv_c_compiler_gnu" = "yes" ; then wl_prefix=-Wl, RPATH_FLAG='-Wl,-blibpath:' LDCOMBINE='$(CC) -shared -v -o $@ $$objlist -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:$(SHLIB_EXPORT_FILE) -Xlinker -bernotok -Xlinker -brtl $(SHLIB_EXPFLAGS) -lc $$initfini' @@ -430,7 +430,7 @@ mips-*-netbsd*) # make archives like for shared libraries. DYNOBJEXT=.so # - if test "$krb5_cv_prog_gcc" = "yes" ; then + if test "$ac_cv_c_compiler_gnu" = "yes" ; then wl_prefix=-Wl, RPATH_FLAG='-Wl,-blibpath:' LDCOMBINE='$(CC) -shared -v -o shr.o.$(LIBMAJOR).$(LIBMINOR) $$objlist -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:$(SHLIB_EXPORT_FILE) -Xlinker -bernotok $(SHLIB_EXPFLAGS) -lc $$initfini' |