summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTill Adam <tillsan@users.sourceforge.net>2002-03-10 19:22:30 +0000
committerTill Adam <tillsan@users.sourceforge.net>2002-03-10 19:22:30 +0000
commit0fe8343018b6e06bd142b9f3bf607d4f50e2a575 (patch)
tree1e522f20631d4c3f324ef517934aa2535ebe2c9b
parent78d59f20098680c9c269bdbd9a1daa56d7323531 (diff)
downloadenlightenment-0fe8343018b6e06bd142b9f3bf607d4f50e2a575.tar.gz
patch by Kirby Kuehl fixing compilation on *BSD. Yeah.
SVN revision: 6058
-rw-r--r--configure.ac3
-rw-r--r--configure.in3
-rw-r--r--lib/Makefile.am2
-rw-r--r--po/ChangeLog28
4 files changed, 33 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1e9e5fb44d..d2868c159e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -257,7 +257,8 @@ AC_ARG_WITH(dbsheets,
AC_SUBST(DB_STYLESHEETS)
AC_PATH_PROG(JADE, jade)
AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS")
-
+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
+AC_SUBST(LIBDL)
AC_CONFIG_FILES([
Makefile
diff --git a/configure.in b/configure.in
index 9ddfc92daf..40e9cf5c23 100644
--- a/configure.in
+++ b/configure.in
@@ -256,7 +256,8 @@ AC_ARG_WITH(dbsheets,
AC_SUBST(DB_STYLESHEETS)
AC_PATH_PROG(JADE, jade)
AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS")
-
+AC_CHECK_LIB(c, dlopen, LIBDL="",[AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
+AC_SUBST(LIBDL)
AC_OUTPUT([
Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f576e93e7e..f17b907e0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,6 +15,6 @@ libehack_la_SOURCES = \
e_hack.c \
e_hack.h
-libehack_la_LIBADD = -lX11 -ldl $(LDFLAGS)
+libehack_la_LIBADD = -lX11 @LIBDL@ $(LDFLAGS)
libehack_la_DEPENDENCIES = $(top_builddir)/config.h
libehack_la_LDFLAGS = -version-info 0:1:0
diff --git a/po/ChangeLog b/po/ChangeLog
index a33547d55d..991329d84f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,31 @@
+2002-03-10 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-10 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-10 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-10 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-08 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-06 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2002-03-06 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
2002-02-26 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.40.