Remove default.jpg.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5f39c24549796c22a125d58e14fe331afc654986..e28bce30aa3e11c3aafa4484cea6ec291e93ac73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [git], maan@systemlinux.org)
+AC_INIT(paraslash, [0.3.5], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -153,15 +153,36 @@ fade_errlist_objs="fade exec string fd"
 
 ########################################################################### osl
 have_osl=yes
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
+       [look for osl.h also in dir])])
+if test -n "$with_osl_headers"; then
+       osl_cppflags="-I$with_osl_headers"
+       CPPFLAGS="$CPPFLAGS $osl_cppflags"
+fi
+AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir,
+       [look for libosl also in dir])])
+if test -n "$with_osl_libs"; then
+       osl_libs="-L$with_osl_libs"
+       LDFLAGS="$LDFLAGS $osl_libs"
+fi
+
 AC_CHECK_HEADER(osl.h, [], have_osl=no)
 AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
 if test "$have_osl" = "no"; then
-       AC_MSG_ERROR([libosl not found, type the following to download:
+       AC_MSG_ERROR([libosl not found, download it at
+       http://systemlinux.org/~maan/osl
+or execute
        git clone git://git.tuebingen.mpg.de/osl
-Install the library with
-       (cd osl && make && sudo make install)
        ])
 fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_libs"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl