X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=acsite.m4;h=3a0e116ea4d8d9dba0656cc3c276dcc9697c1f54;hb=df2b147ef532483bb8a4bf9448e4760a17ccb7ad;hp=aa69e2d97a113b00152aeac0ca7b4b547aab7610;hpb=dec50d786d35293a8e65e1a2b4ef2c222f79ceda;p=flightgear.git diff --git a/acsite.m4 b/acsite.m4 index aa69e2d97..3a0e116ea 100644 --- a/acsite.m4 +++ b/acsite.m4 @@ -26,19 +26,19 @@ dnl dnl dnl AC_DEFUN(wi_EXTRA_LDIR, [ -libdir="$1" -if test -r $libdir ; then +mylibdir="$1" +if test -r $mylibdir ; then case "$LDFLAGS" in - *-L${libdir}*) - # echo " + already had $libdir" 1>&6 + *-L${mylibdir}*) + # echo " + already had $mylibdir" 1>&6 ;; *) if test "$LDFLAGS" = "" ; then - LDFLAGS="-L$libdir" + LDFLAGS="-L$mylibdir" else - LDFLAGS="$LDFLAGS -L$libdir" + LDFLAGS="$LDFLAGS -L$mylibdir" fi - echo " + found $libdir" 1>&6 + echo " + found $mylibdir" 1>&6 ;; esac fi @@ -99,8 +99,8 @@ for exdir in $exdirs ; do incdir="${exdir}/include${subexdir}" wi_EXTRA_IDIR($incdir) - libdir="${exdir}/lib${subexdir}" - wi_EXTRA_LDIR($libdir) + mylibdir="${exdir}/lib${subexdir}" + wi_EXTRA_LDIR($mylibdir) progdir="${exdir}/bin${subexdirr}" wi_EXTRA_PDIR($progdir) @@ -349,3 +349,46 @@ fi dnl dnl dnl + +dnl AC_EXT_DAYLIGHT +dnl Check for an external variable daylight. Stolen from w3c-libwww. +AC_DEFUN(AC_EXT_DAYLIGHT, +[ AC_MSG_CHECKING(int daylight variable) +AC_TRY_COMPILE([#include ], [return daylight;], + have_daylight=yes, + have_daylight=no) +AC_MSG_RESULT($have_daylight) +])dnl + +dnl AC_EXT_TIMEZONE +dnl Check for an external variable timezone. Stolen from tcl-8.0. +AC_DEFUN(AC_EXT_TIMEZONE, +[ +# +# Its important to include time.h in this check, as some systems (like convex) +# have timezone functions, etc. +# +have_timezone=no +AC_MSG_CHECKING([long timezone variable]) +AC_TRY_COMPILE([#include ], + [extern long timezone; + timezone += 1; + exit (0);], + [have_timezone=yes + AC_MSG_RESULT(yes)], + AC_MSG_RESULT(no)) + +# +# On some systems (eg IRIX 6.2), timezone is a time_t and not a long. +# +if test "$have_timezone" = no; then + AC_MSG_CHECKING([time_t timezone variable]) + AC_TRY_COMPILE([#include ], + [extern time_t timezone; + timezone += 1; + exit (0);], + [have_timezone=yes + AC_MSG_RESULT(yes)], + AC_MSG_RESULT(no)) +fi +])dnl