Relative build for non-win32

This is needed for the Mac OS X packages

diff --git a/configure.ac b/configure.ac
index 3405552614fc46d39e90023dfbf4af7f54b75126..eda0acec917e37f507fd422c146c1539da97c0c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,13 +61,19 @@ fi
 
 # Test for Windows vs. Unix
 case "${host}" in
-       *mingw32*) WIN32="yes" ;;
-       *)         WIN32="no"  ;;
+       *mingw32*) SYS="WIN"  ;;
+       *cygwin*)  SYS="WIN"  ;;
+       *)         SYS="UNIX" ;;
 esac
-if test "$WIN32" = yes; then
-       ac_default_prefix="/"
-fi
-AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
+AC_SUBST([SYS])
+AM_CONDITIONAL([SYS_WIN],  test "$SYS" = "WIN")
+AM_CONDITIONAL([SYS_UNIX], test "$SYS" = "UNIX")
+
+# 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])
 
 AC_MSG_RESULT(LIBS = $LIBS)
 AC_CONFIG_FILES([Makefile doc/Makefile data/Makefile examples/Makefile src/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am
index d333a37ead5bb22e78a77e950793934484a97f2c..8542bf6c75112f12bfbb216655d7ca25552e5a26 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I. -I..
+M_CPPFLAGS = -I. -I..
 AM_YFLAGS = -d
 
 lib_LTLIBRARIES = librsl.la
@@ -12,7 +12,7 @@ headers = africa.h dorade.h lassen.h \
          $(include_HEADERS)
 
 librsl_la_LDFLAGS  = -version-info 1:42
-librsl_la_CPPFLAGS = -DDATADIRRSL="\"$(dots)$(datadir)/rsl1\""
+librsl_la_CPPFLAGS = -DDATADIRRSL="\"$(DOTS)$(datadir)/rsl1\""
 librsl_la_SOURCES  = \
        rapic_parse.y rapic_scan.l rapic_to_radar.c rapic_routines.c \
        radtec.c radtec_to_radar.c \
@@ -29,11 +29,10 @@ librsl_la_SOURCES  = \
        radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \
        radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
 
-if WIN32
+if SYS_WIN
 librsl_la_LDFLAGS += -mwindows -no-undefined
 librsl_la_LIBADD   = -lws2_32
 librsl_la_SOURCES += gzip_win32.c 
-dots               = ..
 else
 librsl_la_SOURCES += gzip.c 
 endif