Commit 72eb7a15 authored by Elliot Lee's avatar Elliot Lee

misc fixes

parent af9d4539
......@@ -73,6 +73,12 @@ if test -z "$*"; then
echo
fi
for I in /usr /usr/local /opt /opt/gnome; do
if [ -f $I/lib/gnomeConf.sh ]; then
GNOMEINSTDIR="--with-gnome=$I"
fi
done
for i in .
do
echo processing $srcdir/$i
......@@ -84,5 +90,6 @@ do
automake --gnu; autoheader; autoconf)
done
echo running $srcdir/configure
$srcdir/configure "$@" && echo Now type \`make\' to compile the Gnome Libraries.
echo running $srcdir/configure --enable-maintainer-mode $GNOMEINSTDIR "$@"
$srcdir/configure --enable-maintainer-mode $GNOMEINSTDIR "$@" \
&& echo Now type \`make\' to compile the Gnome Libraries.
......@@ -66,6 +66,9 @@
/* Define if you have the dcgettext function. */
#undef HAVE_DCGETTEXT
/* Define if you have the dlopen function. */
#undef HAVE_DLOPEN
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
......@@ -99,6 +102,12 @@
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
/* Define if you have the <dl.h> header file. */
#undef HAVE_DL_H
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
......
......@@ -24,6 +24,15 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_CHECK_HEADERS(dlfcn.h dl.h)
AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[
AC_CHECK_FUNCS(dlopen, DL_LIB="",
AC_MSG_ERROR(Dynamic linking is not available on this platform. Some
apps, like panel, will not run properly.))
])])
AC_SUBST(DL_LIB)
dnl properties-keyboard
AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc")
AC_SUBST(XF86MISC_LIBS)
......
......@@ -21,10 +21,7 @@ panel_SOURCES = \
panel_config.c \
panel_config.h
MYLIBS = \
$(GNOMEUI_LIBS)
panel_LDADD = $(MYLIBS)
panel_LDADD = $(GNOMEUI_LIBS) $(DL_LIB)
data_DATA = panelrc
......
......@@ -2,8 +2,7 @@
INCLUDES = \
-I../../.. \
-I$(srcdir)/../../.. \
-I$(includedir) \
$(X_CFLAGS)
-I$(includedir)
#bin_PROGRAMS = menx
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment