[lcd4linux @ 2003-10-04 07:54:17 by reinelt]

autoconf/automake/libtool fixes from Ronald Landheer-Cieslak

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@252 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

1 files changed, 20 insertions, 21 deletions

diff --git a/configure.in b/configure.in
index cdb6d7a..6cfe8d1 100644
--- a/configure.in
+++ b/configure.in
@@ -13,10 +13,9 @@ AC_PROG_CXX
 AC_PROG_AWK
 # Using `AC_PROG_RANLIB' is rendered 
 # obsolete by `AC_PROG_LIBTOOL' :-(
-AC_PROG_RANLIB
-# Deactivating libtool for the moment until
-# we find a way this beast works cleanly...
-#AC_PROG_LIBTOOL
+# AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+# Fixme: do we need this?
 #AM_PROG_LIBTOOL
 
 # Checks for libraries.
@@ -140,55 +139,55 @@ RASTER="no"
 PARPORT="no"
 
 if test "$BECKMANNEGLE" = "yes"; then
-   DRIVERS="$DRIVERS BeckmannEgle.o"
+   DRIVERS="$DRIVERS BeckmannEgle.$OBJEXT"
    AC_DEFINE(WITH_BECKMANNEGLE,1,[junk])
 fi
 
 if test "$CRYSTALFONTZ" = "yes"; then
-   DRIVERS="$DRIVERS Crystalfontz.o"
+   DRIVERS="$DRIVERS Crystalfontz.$OBJEXT"
    AC_DEFINE(WITH_CRYSTALFONTZ,1,[junk])
 fi
 
 if test "$CWLINUX" = "yes"; then
-   DRIVERS="$DRIVERS Cwlinux.o"
+   DRIVERS="$DRIVERS Cwlinux.$OBJEXT"
    AC_DEFINE(WITH_CWLINUX,1,[junk])
 fi
 
 if test "$HD44780" = "yes"; then
    PARPORT="yes"
-   DRIVERS="$DRIVERS HD44780.o"
+   DRIVERS="$DRIVERS HD44780.$OBJEXT"
    AC_DEFINE(WITH_HD44780,1,[junk])
 fi
 
 if test "$M50530" = "yes"; then
    PARPORT="yes"
-   DRIVERS="$DRIVERS M50530.o"
+   DRIVERS="$DRIVERS M50530.$OBJEXT"
    AC_DEFINE(WITH_M50530,1,[junk])
 fi
 
 if test "$T6963" = "yes"; then
    PARPORT="yes"
-   DRIVERS="$DRIVERS T6963.o"
+   DRIVERS="$DRIVERS T6963.$OBJEXT"
    AC_DEFINE(WITH_T6963,1,[junk])
 fi
 
 if test "$USBLCD" = "yes"; then
-   DRIVERS="$DRIVERS USBLCD.o"
+   DRIVERS="$DRIVERS USBLCD.$OBJEXT"
    AC_DEFINE(WITH_USBLCD,1,[junk])
 fi
 
 if test "$MATRIXORBITAL" = "yes"; then
-   DRIVERS="$DRIVERS MatrixOrbital.o"
+   DRIVERS="$DRIVERS MatrixOrbital.$OBJEXT"
    AC_DEFINE(WITH_MATRIXORBITAL,1,[junk])
 fi
 
 if test "$MILINST" = "yes"; then
-   DRIVERS="$DRIVERS MilfordInstruments.o"
+   DRIVERS="$DRIVERS MilfordInstruments.$OBJEXT"
    AC_DEFINE(WITH_MILINST,1,[junk])
 fi
 
 if test "$PALMPILOT" = "yes"; then
-   DRIVERS="$DRIVERS PalmPilot.o"
+   DRIVERS="$DRIVERS PalmPilot.$OBJEXT"
    AC_DEFINE(WITH_PALMPILOT,1,[junk])
 fi
 
@@ -212,18 +211,18 @@ if test "$PPM" = "yes"; then
 fi
 
 if test "$SIN" = "yes"; then
-   DRIVERS="$DRIVERS SIN.o"
+   DRIVERS="$DRIVERS SIN.$OBJEXT"
    AC_DEFINE(WITH_SIN,1,[junk])
 fi
 
 if test "$SKELETON" = "yes"; then
-   DRIVERS="$DRIVERS Skeleton.o"
+   DRIVERS="$DRIVERS Skeleton.$OBJEXT"
    AC_DEFINE(WITH_SKELETON,1,[junk])
 fi
 
 if test "$TEXT" = "yes"; then
    if test "$has_curses" = true; then
-      DRIVERS="$DRIVERS Text.o"
+      DRIVERS="$DRIVERS Text.$OBJEXT"
       DRVLIBS="$DRVLIBS $CURSES_LIBS"
       CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
       AC_DEFINE(WITH_TEXT,1,[junk])
@@ -236,7 +235,7 @@ if test "$X11" = "yes"; then
    if test "$no_x" = "yes"; then
       AC_MSG_ERROR(X11 headers or libraries not available: X11 driver disabled)
    else
-      DRIVERS="$DRIVERS XWindow.o"
+      DRIVERS="$DRIVERS XWindow.$OBJEXT"
       DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
       AC_DEFINE(WITH_X11,1,[junk])
    fi
@@ -246,14 +245,14 @@ if test "$DRIVERS" = ""; then
    AC_MSG_ERROR([You should include at least one driver...])
 fi
    
-# Raster.o depends on PPM or PNG
+# Raster.$OBJEXT depends on PPM or PNG
 if test "$RASTER" = "yes"; then
-   DRIVERS="$DRIVERS Raster.o"
+   DRIVERS="$DRIVERS Raster.$OBJEXT"
 fi
 
 # parport driver
 if test "$PARPORT" = "yes"; then
-   DRIVERS="$DRIVERS parport.o"
+   DRIVERS="$DRIVERS parport.$OBJEXT"
 fi
 
 AC_SUBST(DRIVERS)