diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-08-23 14:07:26 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-08-23 14:07:26 +0000 |
commit | 17ec28565a7f25afe01d25bd50eb57b0fdd1e90b (patch) | |
tree | 895a13e81d91bffe8a689dcd8254e20b141b455a /configure.ac | |
parent | 23cffd8d92745580075e9c44285ea853291bd645 (diff) | |
download | gdm-17ec28565a7f25afe01d25bd50eb57b0fdd1e90b.tar.gz |
Add libresolv to EXTRA_DAEMON_LIBS on Solaris Patch from Brian Cameron
2007-08-23 William Jon McCann <mccann@jhu.edu>
* configure.ac:
Add libresolv to EXTRA_DAEMON_LIBS on Solaris
Patch from Brian Cameron <brian.cameron@sun.com>
svn path=/branches/mccann-gobject/; revision=5184
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 673cf093..350d9aae 100644 --- a/configure.ac +++ b/configure.ac @@ -1012,18 +1012,6 @@ AC_CHECK_LIB(secdb, chkauthattr, [ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsecdb" EXTRA_GREETER_LIBS="$EXTRA_GREETER_LIBS -lsecdb"]) -# -# Subst the extra libs -# -AC_SUBST(EXTRA_DAEMON_LIBS) -AC_SUBST(EXTRA_SLAVE_LIBS) -AC_SUBST(EXTRA_CHOOSER_LIBS) -AC_SUBST(EXTRA_XNEST_LIBS) -AC_SUBST(EXTRA_FLEXI_LIBS) -AC_SUBST(EXTRA_DYNAMIC_LIBS) -AC_SUBST(EXTRA_SETUP_LIBS) -AC_SUBST(EXTRA_GREETER_LIBS) - # Define different Halt, and Reboot commands differently for Solaris. # # On Solaris/bin is a symlink to /usr/bin, so don't include it in @@ -1034,6 +1022,7 @@ GDM_RBAC_SYSCMD_KEYS="" case "$host" in *solaris*) + AC_CHECK_LIB(resolv, daemon, [EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lresolv"]) GDM_USER_PATH="/usr/bin" HALT_COMMAND="/sbin/init 5" REBOOT_COMMAND="/sbin/init 6" @@ -1063,6 +1052,18 @@ case "$host" in ;; esac +# +# Subst the extra libs +# +AC_SUBST(EXTRA_DAEMON_LIBS) +AC_SUBST(EXTRA_SLAVE_LIBS) +AC_SUBST(EXTRA_CHOOSER_LIBS) +AC_SUBST(EXTRA_XNEST_LIBS) +AC_SUBST(EXTRA_FLEXI_LIBS) +AC_SUBST(EXTRA_DYNAMIC_LIBS) +AC_SUBST(EXTRA_SETUP_LIBS) +AC_SUBST(EXTRA_GREETER_LIBS) + # First check with "! -h" for /usr/X11R6 and /usr/X11 since they often # symlink to each other, and configure should use the more stable # location (the real directory) if possible. |