conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Don't build the Xaw and Motif plugins when cross-compiling. 

git-svn-id: svn://svn.zoy.org/elk/trunk@201 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-26 15:42:13 +00:00
parent 58ffb951b8
commit 8959736e63
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure.ac
View File

@ -20,6 +20,9 @@ AC_C_CONST
AC_C_INLINE AC_C_INLINE
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
# Check whether we are doing a native build
AM_CONDITIONAL(NATIVE_BUILD, test "${cross_compile}" = "no")
AC_CHECK_HEADERS(inttypes.h, AC_CHECK_HEADERS(inttypes.h,
[STDINT_HEADER="<inttypes.h>"], [STDINT_HEADER="<inttypes.h>"],
[AC_CHECK_HEADERS(sys/inttypes.h, [AC_CHECK_HEADERS(sys/inttypes.h,
@ -444,11 +447,11 @@ AM_CONDITIONAL(HAVE_GDBM, test "${ac_cv_my_have_gdbm}" = "yes")
AC_PATH_X AC_PATH_X
AC_CHECK_LIB(X11, XOpenDisplay, [ AC_CHECK_LIB(X11, XOpenDisplay,
ac_cv_my_have_x11=yes [ac_cv_my_have_x11=yes
X_CFLAGS="-I${x_includes}" X_CFLAGS="-I${x_includes}"
X_LIBS="-lX11 -L${x_libraries}" X_LIBS="-lX11 -L${x_libraries}"],
], [ac_cv_my_have_x11=no], [ac_cv_my_have_x11=no],
[[-lXt -L${x_libraries}]]) [[-lXt -L${x_libraries}]])
AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes") AM_CONDITIONAL(HAVE_X11, test "${ac_cv_my_have_x11}" = "yes")
AC_SUBST(X_CFLAGS) AC_SUBST(X_CFLAGS)
@ -459,22 +462,30 @@ AC_CHECK_LIB(Xmu, XmuDrawLogo,
[xmu_libraries=""], [xmu_libraries=""],
[[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]]) [[-lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])
AC_CHECK_LIB(Xaw, XawTextSearch, [ if "${cross_compile}" = "no"; then
ac_cv_my_have_xaw=yes AC_CHECK_LIB(Xaw, XawTextSearch,
[ac_cv_my_have_xaw=yes
XAW_CFLAGS="-I${x_includes}" XAW_CFLAGS="-I${x_includes}"
XAW_LIBS="-L${x_libraries} -lXaw ${xmu_libraries} -lXt -lSM -lICE -lXext -lX11" XAW_LIBS="-L${x_libraries} -lXaw ${xmu_libraries} -lXt -lSM -lICE -lXext -lX11"],
], [ac_cv_my_have_xaw=no], [ac_cv_my_have_xaw=no],
[[${xmu_libraries} -lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]]) [[${xmu_libraries} -lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])
else
ac_cv_my_have_xaw="no (cross-compiling)"
fi
AM_CONDITIONAL(HAVE_XAW, test "${ac_cv_my_have_xaw}" = "yes") AM_CONDITIONAL(HAVE_XAW, test "${ac_cv_my_have_xaw}" = "yes")
AC_SUBST(XAW_CFLAGS) AC_SUBST(XAW_CFLAGS)
AC_SUBST(XAW_LIBS) AC_SUBST(XAW_LIBS)
AC_CHECK_LIB(Xm, XmStringConcat, [ if "${cross_compile}" = "no"; then
ac_cv_my_have_motif=yes AC_CHECK_LIB(Xm, XmStringConcat,
[ac_cv_my_have_motif=yes
MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm" MOTIF_CFLAGS="-I${x_includes} -I/usr/include/Xm"
MOTIF_LIBS="-L${x_libraries} -lXm ${xmu_libraries} -lXt -lSM -lICE -lXext -lX11" MOTIF_LIBS="-L${x_libraries} -lXm ${xmu_libraries} -lXt -lSM -lICE -lXext -lX11"],
], [ac_cv_my_have_motif=no], [ac_cv_my_have_motif=no],
[[${xmu_libraries} -lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]]) [[${xmu_libraries} -lXt -lSM -lICE -lXext -lX11 -L${x_libraries}]])
else
ac_cv_my_have_motif="no (cross-compiling)"
fi
AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes") AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes")
AC_SUBST(MOTIF_CFLAGS) AC_SUBST(MOTIF_CFLAGS)
AC_SUBST(MOTIF_LIBS) AC_SUBST(MOTIF_LIBS)