[Liboss-commit] CVS: liboss configure.in,1.38,1.39

[Alexander S. <mrv...@us...>]

Update of /cvsroot/liboss/liboss
In directory sc8-pr-cvs1:/tmp/cvs-serv20050

Modified Files:
	configure.in 
Log Message:
Configure script works again.

Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- configure.in	12 Jan 2003 22:40:11 -0000	1.38
+++ configure.in	18 Jan 2003 21:21:56 -0000	1.39
@@ -164,30 +164,26 @@
 LIBDL=""
 USE_DLOPEN=""
 SYSTEMLIB="/usr/lib/libc.so"
+AC_CHECK_LIB(System,ioctl,[SYSTEMLIB="/usr/lib/libSystem.dylib"],[
+AC_CHECK_LIB(c,ioctl,[],AC_MSG_ERROR("cannot find C library"))])
+
 AC_SUBST(HAS_SYSCALLS)
 AC_SUBST(HAS_DLOPENS)
 AC_SUBST(SYSTEMLIB)
 AC_SUBST(LIBDL)
 AC_CHECK_HEADERS([sys/syscall.h],[
-AC_CHECK_FUNC(syscall,HAS_SYSCALLS="true")
+AC_CHECK_FUNC(syscall,[HAS_SYSCALLS="true"],[
+AC_CHECK_LIB(dl,dlsym,[
+HAS_DLOPENS="true"
+LIBDL="-ldl"
+USE_DLOPEN="-DUSE_DLOPEN"
+],[
+AC_MSG_ERROR("Cannot find syscall() or dlsym()")
+])
+])
 ]
 )
 
-
-if test x$HAS_SYSCALLS != xtrue
-    AC_CHECK_LIB(dl,dlsym,[
-    HAS_DLOPENS="true"
-    LIBDL="-ldl"
-    USE_DLOPEN="-DUSE_DLOPEN"
-    ],[
-    AC_MSG_ERROR("Cannot find syscall() or dlsym()")])
-    AC_CHECK_LIB(System,ioctl,[SYSTEMLIB="/usr/lib/libSystem.dylib"],[
-    AC_CHECK_LIB(c,ioctl,[],[
-    AC_MSG_ERROR("Cannot find the C library")
-    ])
-    ])
-fi
-
 AC_ARG_WITH(esd,
     [  --with-esd=DIR          where the ESound root is (DIR/include DIR/lib) ],
        esd_prefix="$withval"
@@ -208,7 +204,7 @@
     fi
   done
   if test x$esd != xtrue; then
-    AC_MSG_RESULT(no)
+    AC_MSG_ERROR("EsounD is required")
   fi
 ])
 AC_SUBST(ESD_INCS)