summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Lidén Borell <samuel@slbdata.se>2010-02-20 14:30:46 +0100
committerSamuel Lidén Borell <samuel@slbdata.se>2010-02-20 14:41:22 +0100
commit3ec8ef7f8b01bf1045fe5f4dcb4de2f75dd91658 (patch)
treeee64db7d3b8e7e58efd0c3c73618aea373fb828e
parent3e95ab256185edd4b05e1325a3422102b0067a08 (diff)
downloadfribid-3ec8ef7f8b01bf1045fe5f4dcb4de2f75dd91658.tar.gz
fribid-3ec8ef7f8b01bf1045fe5f4dcb4de2f75dd91658.tar.bz2
fribid-3ec8ef7f8b01bf1045fe5f4dcb4de2f75dd91658.zip
Call pkg-config to get the X11 includes on OpenBSD
The include files for X11 are located in the /usr/X11R6/include/ directory on OpenBSD. Thanks to Markus Bergkvist for discovering this problem.
-rw-r--r--client/Makefile1
-rwxr-xr-xconfigure2
-rw-r--r--plugin/Makefile2
3 files changed, 3 insertions, 2 deletions
diff --git a/client/Makefile b/client/Makefile
index 5078b5c..1088c86 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,6 +23,7 @@
CFLAGS ?= -O2 -g
COMMONCFLAGS=$(CFLAGS) -Wall -Wextra -std=c99 -pedantic -Wno-unused-parameter
CCFLAGS=$(COMMONCFLAGS) -I../npapi/include `pkg-config --cflags 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 3.10' nspr` -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1
+# You may have to add -lpthread after $(LDFLAGS) on OpenBSD
LINKFLAGS=$(CFLAGS) $(LDFLAGS) -Wl,--as-needed
LIBS=`pkg-config --libs 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 3.10' nspr`
diff --git a/configure b/configure
index 56864e0..d0ba3ec 100755
--- a/configure
+++ b/configure
@@ -171,7 +171,7 @@ fi
oldifs=IFS
IFS=";"
-pkgconfigDeps="gtk+-2.0 >= 2.12;glib-2.0;nss >= 3.10;nspr"
+pkgconfigDeps="gtk+-2.0 >= 2.12;glib-2.0;nss >= 3.10;nspr;x11"
if ! pkg-config --exists $pkgconfigDeps; then
echo "Error: Unsatisfied dependencies: " >&2
diff --git a/plugin/Makefile b/plugin/Makefile
index 577a01d..65976ca 100644
--- a/plugin/Makefile
+++ b/plugin/Makefile
@@ -22,7 +22,7 @@
CFLAGS ?= -O2 -g
COMMONCFLAGS=$(CFLAGS) -Wall -Wextra -std=c99 -pedantic -Wno-unused-parameter
-CCFLAGS=$(COMMONCFLAGS) -I../npapi -fPIC -fvisibility=hidden `pkg-config --cflags glib-2.0` -DG_DISABLE_DEPRECATED=1
+CCFLAGS=$(COMMONCFLAGS) -I../npapi -fPIC -fvisibility=hidden `pkg-config --cflags glib-2.0 x11` -DG_DISABLE_DEPRECATED=1
LINKFLAGS=$(CFLAGS) $(LDFLAGS) -Wl,-z,defs,-soname,libfribidplugin.so
LIBS=-lc `pkg-config --libs glib-2.0`