Mercurial > emacs
comparison configure.in @ 108229:0c1c81ee223e
Move LD_SWITCH_X_SITE_AUX from cpp to autoconf.
* configure.in (LD_SWITCH_X_SITE_AUX): Use AC_SUBST only, not AC_DEFINE as well.
(LD_SWITCH_X_SITE_AUX_RPATH): New output variable.
* nt/config.nt (LD_SWITCH_X_SITE_AUX): Remove.
* src/s/gnu-linux.h (LD_SWITCH_SYSTEM): Use LD_SWITCH_X_SITE_AUX as a shell
variable.
* src/s/netbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH.
* src/s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Remove.
(LD_SWITCH_SYSTEM): Use $LD_SWITCH_X_SITE_AUX_RPATH instead of
LD_SWITCH_SYSTEM_tmp.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH):
New variables, set by configure.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 03 May 2010 20:13:35 -0700 |
parents | 385494b60342 |
children | 39e86d46390a |
comparison
equal
deleted
inserted
replaced
108228:385494b60342 | 108229:0c1c81ee223e |
---|---|
915 | 915 |
916 #ifndef LD_SWITCH_SYSTEM | 916 #ifndef LD_SWITCH_SYSTEM |
917 #define LD_SWITCH_SYSTEM | 917 #define LD_SWITCH_SYSTEM |
918 #endif | 918 #endif |
919 | 919 |
920 #ifndef LD_SWITCH_X_SITE_AUX | |
921 #define LD_SWITCH_X_SITE_AUX | |
922 #endif | |
923 | |
924 configure___ ld_switch_system=LD_SWITCH_SYSTEM | 920 configure___ ld_switch_system=LD_SWITCH_SYSTEM |
925 | 921 |
926 #ifdef THIS_IS_CONFIGURE | 922 #ifdef THIS_IS_CONFIGURE |
927 | 923 |
928 /* Get the CFLAGS for tests in configure. */ | 924 /* Get the CFLAGS for tests in configure. */ |
1324 fi | 1320 fi |
1325 | 1321 |
1326 ## Workaround for bug in autoconf <= 2.62. | 1322 ## Workaround for bug in autoconf <= 2.62. |
1327 ## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html | 1323 ## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html |
1328 ## No need to do anything special for these standard directories. | 1324 ## No need to do anything special for these standard directories. |
1329 ## This is an experiment, take it out if it causes problems. | |
1330 if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then | 1325 if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then |
1331 | 1326 |
1332 x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'` | 1327 x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'` |
1333 | 1328 |
1334 fi | 1329 fi |
1335 | 1330 |
1331 LD_SWITCH_X_SITE_AUX= | |
1332 LD_SWITCH_X_SITE_AUX_RPATH= | |
1336 if test "${x_libraries}" != NONE; then | 1333 if test "${x_libraries}" != NONE; then |
1337 if test -n "${x_libraries}"; then | 1334 if test -n "${x_libraries}"; then |
1338 LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` | 1335 LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` |
1339 LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` | 1336 LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` |
1337 LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'` | |
1340 fi | 1338 fi |
1341 x_default_search_path="" | 1339 x_default_search_path="" |
1342 x_search_path=${x_libraries} | 1340 x_search_path=${x_libraries} |
1343 if test -z "${x_search_path}"; then | 1341 if test -z "${x_search_path}"; then |
1344 x_search_path=/usr/lib | 1342 x_search_path=/usr/lib |
1357 else | 1355 else |
1358 x_default_search_path="${x_search_path}:${x_default_search_path}" | 1356 x_default_search_path="${x_search_path}:${x_default_search_path}" |
1359 fi | 1357 fi |
1360 done | 1358 done |
1361 fi | 1359 fi |
1360 AC_SUBST(LD_SWITCH_X_SITE_AUX) | |
1361 AC_SUBST(LD_SWITCH_X_SITE_AUX_RPATH) | |
1362 | |
1362 if test "${x_includes}" != NONE && test -n "${x_includes}"; then | 1363 if test "${x_includes}" != NONE && test -n "${x_includes}"; then |
1363 C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"` | 1364 C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"` |
1364 fi | 1365 fi |
1365 | 1366 |
1366 if test x"${x_includes}" = x; then | 1367 if test x"${x_includes}" = x; then |
2827 AC_SUBST(bitmapdir) | 2828 AC_SUBST(bitmapdir) |
2828 AC_SUBST(gamedir) | 2829 AC_SUBST(gamedir) |
2829 AC_SUBST(gameuser) | 2830 AC_SUBST(gameuser) |
2830 AC_SUBST(unexec) | 2831 AC_SUBST(unexec) |
2831 AC_SUBST(LD_SWITCH_X_SITE) | 2832 AC_SUBST(LD_SWITCH_X_SITE) |
2832 AC_SUBST(LD_SWITCH_X_SITE_AUX) | |
2833 AC_SUBST(C_SWITCH_X_SITE) | 2833 AC_SUBST(C_SWITCH_X_SITE) |
2834 AC_SUBST(C_SWITCH_X_SYSTEM) | 2834 AC_SUBST(C_SWITCH_X_SYSTEM) |
2835 AC_SUBST(CFLAGS) | 2835 AC_SUBST(CFLAGS) |
2836 ## Used in lwlib/Makefile.in. | 2836 ## Used in lwlib/Makefile.in. |
2837 AC_SUBST(X_TOOLKIT_TYPE) | 2837 AC_SUBST(X_TOOLKIT_TYPE) |
2861 [Define LD_SWITCH_X_SITE to contain any special flags your loader | 2861 [Define LD_SWITCH_X_SITE to contain any special flags your loader |
2862 may need to deal with X Windows. For instance, if you've defined | 2862 may need to deal with X Windows. For instance, if you've defined |
2863 HAVE_X_WINDOWS above and your X libraries aren't in a place that | 2863 HAVE_X_WINDOWS above and your X libraries aren't in a place that |
2864 your loader can find on its own, you might want to add "-L/..." or | 2864 your loader can find on its own, you might want to add "-L/..." or |
2865 something similar.]) | 2865 something similar.]) |
2866 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX}, | |
2867 [Define LD_SWITCH_X_SITE_AUX with an -R option | |
2868 in case it's needed (for Solaris, for example).]) | |
2869 AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, | 2866 AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, |
2870 [Define C_SWITCH_X_SITE to contain any special flags your compiler | 2867 [Define C_SWITCH_X_SITE to contain any special flags your compiler |
2871 may need to deal with X Windows. For instance, if you've defined | 2868 may need to deal with X Windows. For instance, if you've defined |
2872 HAVE_X_WINDOWS above and your X include files aren't in a place | 2869 HAVE_X_WINDOWS above and your X include files aren't in a place |
2873 that your compiler can find on its own, you might want to add | 2870 that your compiler can find on its own, you might want to add |