Improve support for relative search paths

diff --git a/configure.ac b/configure.ac
index e92d77e38521578dcb366d1f56c8fb48ebbc34e5..892bd0a9380b5b49fc487e2e8accb93e528114de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,6 @@ esac
 AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
 AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
 AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
-if test "$WIN32" = yes; then
-       ac_default_prefix="/"
-fi
 
 # OpenGL flags
 GL_CFLAGS="-DSYS_$SYS"
@@ -60,6 +57,12 @@ esac
 AC_SUBST([GL_CFLAGS])
 AC_SUBST([GL_LIBS])
 
+# Check for relative build
+AC_ARG_ENABLE(relative, [AS_HELP_STRING([--enable-relative],
+       [enable runtime search paths @<:@default=no@:>@])],
+       [DOTS=".."; ac_default_prefix="/"])
+AC_SUBST([DOTS])
+
 # Output 
 AC_CONFIG_FILES([
        Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index fd2fceb520e65316b3680c6a058bf924ce411a42..ef221dd0fd2ef34f6ed8ecb32844193414d4e929 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,8 +47,8 @@ libgrits_la_SOURCES = grits.h \
        gtkgl.c         gtkgl.h         \
        gpqueue.c       gpqueue.h
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
-       -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
+       -DPKGDATADIR="\"$(DOTS)$(datadir)/$(GRITS_SUBDIR)\"" \
+       -DPLUGINSDIR="\"$(DOTS)$(libdir)/$(GRITS_SUBDIR)\""
 libgrits_la_LIBADD  = $(AM_LDADD) -lm \
        objects/libgrits-objects.la \
        data/libgrits-data.la