← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2008-07-05 22:07:42 UTC
  • mto: This revision was merged to the branch mainline in revision 77.
  • Revision ID: monty@inaugust.com-20080705220742-sn93qr5dxadoei65
Removed old crufty static NSS hack. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
422
422
  AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
423
423
fi
424
424
 
425
 
static_nss=""
426
 
STATIC_NSS_FLAGS=""
427
 
OTHER_LIBC_LIB=""
428
 
 
429
 
#
430
 
# Check if we are using Linux and a glibc compiled with static nss
431
 
# (this is true on the MySQL build machines to avoid NSS problems)
432
 
#
433
 
 
434
 
if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
435
 
then
436
 
  tmp=`nm /usr/lib*/libc.a  | grep _nss_files_getaliasent_r`
437
 
  if test -n "$tmp"
438
 
  then
439
 
     STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
440
 
     STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
441
 
     static_nss=1
442
 
  fi
443
 
fi
444
425
 
445
426
AC_ARG_WITH([server-suffix],
446
427
    [AS_HELP_STRING([--with-server-suffix],
1160
1141
MYSQL_CONFIGURE_PLUGINS([none])
1161
1142
 
1162
1143
AC_SUBST(CLIENT_LIBS)
1163
 
AC_SUBST(STATIC_NSS_FLAGS)
1164
 
 
1165
 
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
1166
 
# I know to add the static NSS magic if we have static NSS libraries with
1167
 
# glibc - Sasha
1168
 
 
1169
 
LDFLAGS="$LDFLAGS $OTHER_LIBC_LIB"
1170
 
LIBS="$LIBS $STATIC_NSS_FLAGS"
1171
1144
 
1172
1145
AC_SUBST(mysql_plugin_dirs)
1173
1146
AC_SUBST(mysql_plugin_libs)