Attachment #357736 for bug #476000




AC_DEFINE(HAVE__GMTOFF__) AC_MSG_RESULT(yes)
],[AC_MSG_RESULT(no)])

LD=ld

##
##
##

CXXSOFLAGS=$SOFLAGS

case "$host_os" in
irix*)    EXTCFLAGS+="-D_SGI_MP_SOURCE"
	  ;;
osf*)     EXTCFLAGS+="$CFLAGS -D_REENTRANT -DOSF"
	  LIBS="-oldstyle_liblookup -lpthread $LIBS"

	  ;;
freebsd*) EXTCFLAGS+="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
	  CXXSOFLAGS="-shared"
	  LIBS="$LEXLIB $LIBS"
	  if test "$large_files" = "yes" ; then
		## FreeBSD need no any special flags for 64bit files
		EXTCFLAGS+=" -DWITH_LARGE_FILES"
	  fi
	  if test "X$LIBGB_NAME" != "X" ; then
		LIBGB_NAME="$LIBGB_NAME -lstdc++"

          rel=`uname -r`
          case "$rel" in
            4*)
              EXTCFLAGS+=" -pthread"
              ;;
            5*)
              LIBS="-lc_r $LEXLIB $LIBS"
              ;;
            *)
              EXTCFLAGS+=" -pthread"
              LIBS="-lc_r $LEXLIB $LIBS"
              ;;
          esac
	  RPATH_OPTION="-rpath"
	  ;;
bsdi*)	  EXTCFLAGS+=" -pthread -DBSDOS"
          rel=`uname -r`
          case "$rel" in
            4*)
              EXTCFLAGS+=" -pthread"
              ;;
            5*)
              LIBS="-lc_r $LEXLIB $LIBS"
              ;;
            *)
              EXTCFLAGS+=" -pthread"
              LIBS="-lc_r $LEXLIB $LIBS"
              ;;
          esac
	  LIBS="$LEXLIB $LIBS"
	  CXX=g++
	  ;;
gnu*|linux*)   EXTCFLAGS+=" -D_REENTRANT -DLINUX"
	  CXX=g++
	  if test "$pthread_in" = "pthreads" ; then
		EXTCFLAGS+=" -D_MIT_POSIX_THREADS"
		LIBS="-lpthreads $LEXLIB -ldb $LIBS"
		echo Probably you have MIT-threads. If yes, swich to LinuxThreads.
	  else

	  if test "$large_files" = "yes" ; then
		## Linux ext2fs does'nt support large files yet.
		AC_MSG_RESULT(Warning: Linux ext2fs doesn't support large files.)
		EXTCFLAGS+=" -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
	  fi
	  RPATH_OPTION="-rpath"
	  ;;
solaris*) EXTCFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
	  if test "X$LIBDB_REAL_PATH" != "X" ; then
	  	LIBDB_NAME="-R$LIBDB_REAL_PATH $LIBDB_NAME"
	  fi

				LIBGB_NAME="$LIBGB_NAME -lstdc++"
	  		fi
			;;
		*)	EXTCFLAGS+="-mt"
			SUNPRO_CC_VER=`CC -V 2>&1 | sed 's/.*C++ //' | sed 's/\..*//'`
			if test "$SUNPRO_CC_VER" = "5" ; then
			    CXX="CC -compat=4 -w -fast -xO3 -DNO_MEMBER_TEMPLATES=1"

			;;
	  esac
	  if test "$large_files" = "yes" ; then
		EXTCFLAGS=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
	  fi
	  ;;
aix4*)    AC_DEFINE(MODULES)
	  LIBS="$LIBS -ldl $LEXLIB"
          SOFLAGS=-G
          case "$CC" in
          gcc*)   EXTCFLAGS+=" -D_THREAD_SAFE $CFLAGS"
		  CXX=g++
                  LIBS="$LIBS -lpthreads -lc_r"
                  ;;

                  ;;
	  esac
          if test "$large_files" = "yes" ; then
		EXTCFLAGS+=" -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
	  fi
	  ;;
esac

if test "X$MYSQL_PATH" != "X" ; then
    LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
    AC_DEFINE(HAVE_MYSQL)
    CFLAGS+=" -I$MYSQL_PATH/include"
    MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
fi

if test "X$PGSQL_PATH" != "X" ; then
    LIBS="$LIBS -L$PGSQL_PATH/lib -lpg"
    AC_DEFINE(HAVE_PGSQL)
    CFLAGS+="-I$PGSQL_PATH/include $LIBS"
    PGSQL_LIB="-L$PGSQL_PATH/lib -lpg"
fi


    esac
fi

EXTCFLAGS+=" $LIBDB_INCL"

AC_MSG_CHECKING(for GigaBASE)
if test "$LIBGB_PATH" = "no" ; then

    AC_DEFINE(HAVE_ZLIB)
    AC_MSG_RESULT(/usr/local/lib/libz.a)
    if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
	EXTCFLAGS+=" -I/usr/local/include"
    fi
elif test -r "/usr/lib/libz.a"; then
    LIBZ_NAME="/usr/lib/libz.a"

	res=`./confmain`
    fi
    if test "$res" = "yes"; then
	    EXTCFLAGS+=" -export-dynamic"
	    AC_MSG_RESULT(yes)
    else
	    AC_MSG_RESULT(no)

rm -f confmain*

echo $CC
echo $EXTCFLAGS
echo $LIBS

if test "${enable_oops_user+set}" != set; then

AC_SUBST(OPT_MODS)
AC_SUBST(STATIC_MODULES)
AC_SUBST(CHOWN)
AC_SUBST(LD)
AC_SUBST(LDFLAGS)
AC_SUBST(VER)
AC_SUBST(LIBGB_PATH)
AC_SUBST(LIBGB_NAME)

AC_SUBST(LIBZ_NAME)
AC_SUBST(EXTRASRC)
AC_SUBST(EXTLDFLAGS)
AC_SUBST(EXTCFLAGS)

AC_DEFINE_UNQUOTED(OOPS_HOME, "$oops_prefix/oops")
AC_DEFINE_UNQUOTED(OOPS_SBINDIR, "$oops_sbindir")




EXTCFLAGS = @EXTCFLAGS@
CXX = @CXX@
LDFLAGS = @LDFLAGS@
EXTLDFLAGS = @EXTLDFLAGS@
INSTALL = @INSTALL@ @SETOWNER@
INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@


#CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS

CFLAGS += -fPIE @DEFS@

VER=@VER@
OOPSPATH=@prefix@/oops

.c.o:
	${CC} -c ${CFLAGS} ${EXTCFLAGS} ${CDEFS} $<

all:	extras modules oops


	cd modules; $(MAKE)

oops:	${OBJS}
	${CXX} ${CFLAGS} ${EXTCFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops

mkinstalldirs:
	../mkinstalldirs ${OOPSPATH} \

		echo "#define VERSION \""`cat version`"\""> version.h

lex.yy.o: lex.yy.c y.tab.h oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c lex.yy.c

lex.yy.c: parser.l
	@LEX@ parser.l

	@YACC@ -d parser.y

y.tab.o: y.tab.c oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c y.tab.c

malloc.o: malloc.c
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -DEBUG -c malloc.c

gnu_regex.o: gnu_regex.c
	${CC} ${CFLAGS} ${EXTCFLAGS} -DREGEX -c gnu_regex.c

clean:
	rm -f *o lex.yy.c  y.tab.[ch] version.h oops DEADJOE




CC = @CC@
CXX = @CXX@
LIBS = @LIBS@
CFLAGS = @CFLAGS@ -fPIC @DEFS@
LDFLAGS = @LDFLAGS@
LD = @LD@
SOFLAGS = @SOFLAGS@
OPT_MODS = @OPT_MODS@
CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@

MYSQL_LIB = @MYSQL_LIB@
PGSQL_LIB = @PGSQL_LIB@
EXTRASRC = @EXTRASRC@
EXTCFLAGS = @EXTCFLAGS@

CFLAGS += -fPIC @DEFS@

.SUFFIXES:	.c .cpp .o .so

EXTRAOBJS = $(EXTRASRC:%c=../%o)

.c.o:
	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
#
.o.so:
	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)

.c.so:
	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $(<:.c=.o) $(LIBS)

.cpp.o:
	${CXX} ${CFLAGS} ${EXTCFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
	mv $*.a $*.o

.cpp.so:
	${CXX} ${CFLAGS} ${EXTCFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@

all:	log_dummy.@MOD_EXT@ \
	err.@MOD_EXT@ \

#berkeley_db_api.@MOD_EXT@:	berkeley_db_api.c ../modules.h ../oops.h

berkeley_db_api.o:	berkeley_db_api.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o

berkeley_db_api.so: berkeley_db_api.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
	${LD} $(SOFLAGS) $(LDFLAGS) -L $(LIBDB_PATH)/lib berkeley_db_api.o -o berkeley_db_api.so $(LIBS) $(LIBDB_NAME) 

gigabase_db_api.@MOD_EXT@:	gigabase_db_api.cpp ../modules.h ../oops.h

oopsctl: oopsctl.c ../modules.h ../config.h  ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl

passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)

passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)

passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o

passwd_mysql.o: passwd_sql.c ../modules.h ../oops.h
	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o


clean:

Return to bug 476000

Lines 204-211 tm.__tm_gmtoff__ = tm.__tm_gmtoff__*2; Link Here

(-)a/configure.in (-28 / +24 lines)
204	AC_DEFINE(HAVE__GMTOFF__) AC_MSG_RESULT(yes)	204	AC_DEFINE(HAVE__GMTOFF__) AC_MSG_RESULT(yes)
205	],[AC_MSG_RESULT(no)])	205	],[AC_MSG_RESULT(no)])
206		206
207	LD=ld
208
209	##	207	##
210	##	208	##
211	##	209	##
Lines 309-326 CXXCOMPFLAGS=-c Link Here
309	CXXSOFLAGS=$SOFLAGS	307	CXXSOFLAGS=$SOFLAGS
310		308
311	case "$host_os" in	309	case "$host_os" in
312	irix*) CFLAGS="-D_SGI_MP_SOURCE"	310	irix*) EXTCFLAGS+="-D_SGI_MP_SOURCE"
313	;;	311	;;
314	osf*) CFLAGS="$CFLAGS -D_REENTRANT -DOSF"	312	osf*) EXTCFLAGS+="$CFLAGS -D_REENTRANT -DOSF"
315	LIBS="-oldstyle_liblookup -lpthread $LIBS"	313	LIBS="-oldstyle_liblookup -lpthread $LIBS"
316		314
317	;;	315	;;
318	freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."	316	freebsd*) EXTCFLAGS+="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
319	CXXSOFLAGS="-shared"	317	CXXSOFLAGS="-shared"
320	LIBS="$LEXLIB $LIBS"	318	LIBS="$LEXLIB $LIBS"
321	if test "$large_files" = "yes" ; then	319	if test "$large_files" = "yes" ; then
322	## FreeBSD need no any special flags for 64bit files	320	## FreeBSD need no any special flags for 64bit files
323	CFLAGS="$CFLAGS -DWITH_LARGE_FILES"	321	EXTCFLAGS+=" -DWITH_LARGE_FILES"
324	fi	322	fi
325	if test "X$LIBGB_NAME" != "X" ; then	323	if test "X$LIBGB_NAME" != "X" ; then
326	LIBGB_NAME="$LIBGB_NAME -lstdc++"	324	LIBGB_NAME="$LIBGB_NAME -lstdc++"
Lines 328-366 freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=204 Link Here
328	rel=`uname -r`	326	rel=`uname -r`
329	case "$rel" in	327	case "$rel" in
330	4*)	328	4*)
331	CFLAGS="$CFLAGS -pthread"	329	EXTCFLAGS+=" -pthread"
332	;;	330	;;
333	5*)	331	5*)
334	LIBS="-lc_r $LEXLIB $LIBS"	332	LIBS="-lc_r $LEXLIB $LIBS"
335	;;	333	;;
336	*)	334	*)
337	CFLAGS="$CFLAGS -pthread"	335	EXTCFLAGS+=" -pthread"
338	LIBS="-lc_r $LEXLIB $LIBS"	336	LIBS="-lc_r $LEXLIB $LIBS"
339	;;	337	;;
340	esac	338	esac
341	RPATH_OPTION="-rpath"	339	RPATH_OPTION="-rpath"
342	;;	340	;;
343	bsdi*) CFLAGS="$CFLAGS -pthread -DBSDOS"	341	bsdi*) EXTCFLAGS+=" -pthread -DBSDOS"
344	rel=`uname -r`	342	rel=`uname -r`
345	case "$rel" in	343	case "$rel" in
346	4*)	344	4*)
347	CFLAGS="$CFLAGS -pthread"	345	EXTCFLAGS+=" -pthread"
348	;;	346	;;
349	5*)	347	5*)
350	LIBS="-lc_r $LEXLIB $LIBS"	348	LIBS="-lc_r $LEXLIB $LIBS"
351	;;	349	;;
352	*)	350	*)
353	CFLAGS="$CFLAGS -pthread"	351	EXTCFLAGS+=" -pthread"
354	LIBS="-lc_r $LEXLIB $LIBS"	352	LIBS="-lc_r $LEXLIB $LIBS"
355	;;	353	;;
356	esac	354	esac
357	LIBS="$LEXLIB $LIBS"	355	LIBS="$LEXLIB $LIBS"
358	CXX=g++	356	CXX=g++
359	;;	357	;;
360	gnu\|linux) CFLAGS="$CFLAGS -D_REENTRANT -DLINUX"	358	gnu\|linux) EXTCFLAGS+=" -D_REENTRANT -DLINUX"
361	CXX=g++
362	if test "$pthread_in" = "pthreads" ; then	359	if test "$pthread_in" = "pthreads" ; then
363	CFLAGS="$CFLAGS -D_MIT_POSIX_THREADS"	360	EXTCFLAGS+=" -D_MIT_POSIX_THREADS"
364	LIBS="-lpthreads $LEXLIB -ldb $LIBS"	361	LIBS="-lpthreads $LEXLIB -ldb $LIBS"
365	echo Probably you have MIT-threads. If yes, swich to LinuxThreads.	362	echo Probably you have MIT-threads. If yes, swich to LinuxThreads.
366	else	363	else
Lines 369-379 gnu\|linux) CFLAGS="$CFLAGS -D_REENTRANT -DLINUX" Link Here
369	if test "$large_files" = "yes" ; then	366	if test "$large_files" = "yes" ; then
370	## Linux ext2fs does'nt support large files yet.	367	## Linux ext2fs does'nt support large files yet.
371	AC_MSG_RESULT(Warning: Linux ext2fs doesn't support large files.)	368	AC_MSG_RESULT(Warning: Linux ext2fs doesn't support large files.)
372	CFLAGS="$CFLAGS -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"	369	EXTCFLAGS+=" -DWITH_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_FILE_OFFSET64"
373	fi	370	fi
374	RPATH_OPTION="-rpath"	371	RPATH_OPTION="-rpath"
375	;;	372	;;
376	solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"	373	solaris*) EXTCFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS"
377	if test "X$LIBDB_REAL_PATH" != "X" ; then	374	if test "X$LIBDB_REAL_PATH" != "X" ; then
378	LIBDB_NAME="-R$LIBDB_REAL_PATH $LIBDB_NAME"	375	LIBDB_NAME="-R$LIBDB_REAL_PATH $LIBDB_NAME"
379	fi	376	fi
Lines 390-396 solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS" Link Here
390	LIBGB_NAME="$LIBGB_NAME -lstdc++"	387	LIBGB_NAME="$LIBGB_NAME -lstdc++"
391	fi	388	fi
392	;;	389	;;
393	*) CFLAGS="$CFLAGS -mt"	390	*) EXTCFLAGS+="-mt"
394	SUNPRO_CC_VER=`CC -V 2>&1 \| sed 's/.C++ //' \| sed 's/\..//'`	391	SUNPRO_CC_VER=`CC -V 2>&1 \| sed 's/.C++ //' \| sed 's/\..//'`
395	if test "$SUNPRO_CC_VER" = "5" ; then	392	if test "$SUNPRO_CC_VER" = "5" ; then
396	CXX="CC -compat=4 -w -fast -xO3 -DNO_MEMBER_TEMPLATES=1"	393	CXX="CC -compat=4 -w -fast -xO3 -DNO_MEMBER_TEMPLATES=1"
Lines 407-420 solaris*) CFLAGS="$CFLAGS -D_REENTRANT -DSOLARIS" Link Here
407	;;	404	;;
408	esac	405	esac
409	if test "$large_files" = "yes" ; then	406	if test "$large_files" = "yes" ; then
410	CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"	407	EXTCFLAGS=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DWITH_LARGE_FILES"
411	fi	408	fi
412	;;	409	;;
413	aix4*) AC_DEFINE(MODULES)	410	aix4*) AC_DEFINE(MODULES)
414	LIBS="$LIBS -ldl $LEXLIB"	411	LIBS="$LIBS -ldl $LEXLIB"
415	SOFLAGS=-G	412	SOFLAGS=-G
416	case "$CC" in	413	case "$CC" in
417	gcc*) CFLAGS="-D_THREAD_SAFE $CFLAGS"	414	gcc*) EXTCFLAGS+=" -D_THREAD_SAFE $CFLAGS"
418	CXX=g++	415	CXX=g++
419	LIBS="$LIBS -lpthreads -lc_r"	416	LIBS="$LIBS -lpthreads -lc_r"
420	;;	417	;;
Lines 424-430 aix4*) AC_DEFINE(MODULES) Link Here
424	;;	421	;;
425	esac	422	esac
426	if test "$large_files" = "yes" ; then	423	if test "$large_files" = "yes" ; then
427	CFLAGS="$CFLAGS -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"	424	EXTCFLAGS+=" -D_LARGE_FILES -D_LARGE_FILE_API -DWITH_LARGE_FILES"
428	fi	425	fi
429	;;	426	;;
430	esac	427	esac
Lines 432-445 esac Link Here
432	if test "X$MYSQL_PATH" != "X" ; then	429	if test "X$MYSQL_PATH" != "X" ; then
433	LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"	430	LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
434	AC_DEFINE(HAVE_MYSQL)	431	AC_DEFINE(HAVE_MYSQL)
435	CFLAGS="$CFLAGS -I$MYSQL_PATH/include"	432	CFLAGS+=" -I$MYSQL_PATH/include"
436	MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"	433	MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
437	fi	434	fi
438		435
439	if test "X$PGSQL_PATH" != "X" ; then	436	if test "X$PGSQL_PATH" != "X" ; then
440	LIBS="$LIBS -L$PGSQL_PATH/lib -lpg"	437	LIBS="$LIBS -L$PGSQL_PATH/lib -lpg"
441	AC_DEFINE(HAVE_PGSQL)	438	AC_DEFINE(HAVE_PGSQL)
442	CFLAGS="-I$PGSQL_PATH/include $LIBS"	439	CFLAGS+="-I$PGSQL_PATH/include $LIBS"
443	PGSQL_LIB="-L$PGSQL_PATH/lib -lpg"	440	PGSQL_LIB="-L$PGSQL_PATH/lib -lpg"
444	fi	441	fi
445		442
Lines 601-607 if test "X$LIBDB_PATH" != "X" ; then Link Here
601	esac	598	esac
602	fi	599	fi
603		600
604	CFLAGS="$CFLAGS $LIBDB_INCL"	601	EXTCFLAGS+=" $LIBDB_INCL"
605		602
606	AC_MSG_CHECKING(for GigaBASE)	603	AC_MSG_CHECKING(for GigaBASE)
607	if test "$LIBGB_PATH" = "no" ; then	604	if test "$LIBGB_PATH" = "no" ; then
Lines 653-659 elif test -r "/usr/local/lib/libz.a"; then Link Here
653	AC_DEFINE(HAVE_ZLIB)	650	AC_DEFINE(HAVE_ZLIB)
654	AC_MSG_RESULT(/usr/local/lib/libz.a)	651	AC_MSG_RESULT(/usr/local/lib/libz.a)
655	if test "X`echo $CFLAGS \| grep '\-I/usr/local/include'`" = "X"; then	652	if test "X`echo $CFLAGS \| grep '\-I/usr/local/include'`" = "X"; then
656	CFLAGS="$CFLAGS -I/usr/local/include"	653	EXTCFLAGS+=" -I/usr/local/include"
657	fi	654	fi
658	elif test -r "/usr/lib/libz.a"; then	655	elif test -r "/usr/lib/libz.a"; then
659	LIBZ_NAME="/usr/lib/libz.a"	656	LIBZ_NAME="/usr/lib/libz.a"
Lines 689-695 EOF Link Here
689	res=`./confmain`	686	res=`./confmain`
690	fi	687	fi
691	if test "$res" = "yes"; then	688	if test "$res" = "yes"; then
692	CFLAGS="$CFLAGS -export-dynamic"	689	EXTCFLAGS+=" -export-dynamic"
693	AC_MSG_RESULT(yes)	690	AC_MSG_RESULT(yes)
694	else	691	else
695	AC_MSG_RESULT(no)	692	AC_MSG_RESULT(no)
Lines 698-704 fi Link Here
698	rm -f confmain*	695	rm -f confmain*
699		696
700	echo $CC	697	echo $CC
701	echo $CFLAGS	698	echo $EXTCFLAGS
702	echo $LIBS	699	echo $LIBS
703		700
704	if test "${enable_oops_user+set}" != set; then	701	if test "${enable_oops_user+set}" != set; then
Lines 728-735 AC_SUBST(MOD_EXT) Link Here
728	AC_SUBST(OPT_MODS)	725	AC_SUBST(OPT_MODS)
729	AC_SUBST(STATIC_MODULES)	726	AC_SUBST(STATIC_MODULES)
730	AC_SUBST(CHOWN)	727	AC_SUBST(CHOWN)
731	AC_SUBST(LD)
732	AC_SUBST(LDFLAGS)
733	AC_SUBST(VER)	728	AC_SUBST(VER)
734	AC_SUBST(LIBGB_PATH)	729	AC_SUBST(LIBGB_PATH)
735	AC_SUBST(LIBGB_NAME)	730	AC_SUBST(LIBGB_NAME)
Lines 795-800 AC_SUBST(LIBDB_INCL) Link Here
795	AC_SUBST(LIBZ_NAME)	790	AC_SUBST(LIBZ_NAME)
796	AC_SUBST(EXTRASRC)	791	AC_SUBST(EXTRASRC)
797	AC_SUBST(EXTLDFLAGS)	792	AC_SUBST(EXTLDFLAGS)
		793	AC_SUBST(EXTCFLAGS)
798		794
799	AC_DEFINE_UNQUOTED(OOPS_HOME, "$oops_prefix/oops")	795	AC_DEFINE_UNQUOTED(OOPS_HOME, "$oops_prefix/oops")
800	AC_DEFINE_UNQUOTED(OOPS_SBINDIR, "$oops_sbindir")	796	AC_DEFINE_UNQUOTED(OOPS_SBINDIR, "$oops_sbindir")

Lines 1-6 Link Here

(-)a/src/Makefile.in (-10 / +8 lines)
1	CC = @CC@	1	EXTCFLAGS = @EXTCFLAGS@
2	CXX = @CXX@
3	LDFLAGS = @LDFLAGS@
4	EXTLDFLAGS = @EXTLDFLAGS@	2	EXTLDFLAGS = @EXTLDFLAGS@
5	INSTALL = @INSTALL@ @SETOWNER@	3	INSTALL = @INSTALL@ @SETOWNER@
6	INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@	4	INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@
Lines 29-41 EXTRAOBJS = $(EXTRASRC:.c=.o) Link Here
29		27
30	#CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS	28	#CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
31		29
32	CFLAGS = @CFLAGS@ -fPIE @DEFS@	30	CFLAGS += -fPIE @DEFS@
33		31
34	VER=@VER@	32	VER=@VER@
35	OOPSPATH=@prefix@/oops	33	OOPSPATH=@prefix@/oops
36		34
37	.c.o:	35	.c.o:
38	${CC} -c ${CFLAGS} ${CDEFS} $<	36	${CC} -c ${CFLAGS} ${EXTCFLAGS} ${CDEFS} $<
39		37
40	all: extras modules oops	38	all: extras modules oops
41		39
Lines 45-51 modules:: Link Here
45	cd modules; $(MAKE)	43	cd modules; $(MAKE)
46		44
47	oops: ${OBJS}	45	oops: ${OBJS}
48	${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops	46	${CXX} ${CFLAGS} ${EXTCFLAGS} ${OBJS} ${EXTLDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
49		47
50	mkinstalldirs:	48	mkinstalldirs:
51	../mkinstalldirs ${OOPSPATH} \	49	../mkinstalldirs ${OOPSPATH} \
Lines 150-156 version.h: version Link Here
150	echo "#define VERSION \""`cat version`"\""> version.h	148	echo "#define VERSION \""`cat version`"\""> version.h
151		149
152	lex.yy.o: lex.yy.c y.tab.h oops.h	150	lex.yy.o: lex.yy.c y.tab.h oops.h
153	${CC} ${CFLAGS} ${CDEFS} -c lex.yy.c	151	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c lex.yy.c
154		152
155	lex.yy.c: parser.l	153	lex.yy.c: parser.l
156	@LEX@ parser.l	154	@LEX@ parser.l
Lines 159-171 y.tab.c: parser.y Link Here
159	@YACC@ -d parser.y	157	@YACC@ -d parser.y
160		158
161	y.tab.o: y.tab.c oops.h	159	y.tab.o: y.tab.c oops.h
162	${CC} ${CFLAGS} ${CDEFS} -c y.tab.c	160	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -c y.tab.c
163		161
164	malloc.o: malloc.c	162	malloc.o: malloc.c
165	${CC} ${CFLAGS} ${CDEFS} -DEBUG -c malloc.c	163	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -DEBUG -c malloc.c
166		164
167	gnu_regex.o: gnu_regex.c	165	gnu_regex.o: gnu_regex.c
168	${CC} ${CFLAGS} -DREGEX -c gnu_regex.c	166	${CC} ${CFLAGS} ${EXTCFLAGS} -DREGEX -c gnu_regex.c
169		167
170	clean:	168	clean:
171	rm -f *o lex.yy.c y.tab.[ch] version.h oops DEADJOE	169	rm -f *o lex.yy.c y.tab.[ch] version.h oops DEADJOE

Lines 1-9 Link Here

(-)a/src/modules/Makefile.in (-16 / +14 lines)
1	CC = @CC@
2	CXX = @CXX@
3	LIBS = @LIBS@	1	LIBS = @LIBS@
4	CFLAGS = @CFLAGS@ -fPIC @DEFS@
5	LDFLAGS = @LDFLAGS@
6	LD = @LD@
7	SOFLAGS = @SOFLAGS@	2	SOFLAGS = @SOFLAGS@
8	OPT_MODS = @OPT_MODS@	3	OPT_MODS = @OPT_MODS@
9	CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@	4	CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@
Lines 15-41 LIBDB_NAME = @LIBDB_NAME@ Link Here
15	MYSQL_LIB = @MYSQL_LIB@	10	MYSQL_LIB = @MYSQL_LIB@
16	PGSQL_LIB = @PGSQL_LIB@	11	PGSQL_LIB = @PGSQL_LIB@
17	EXTRASRC = @EXTRASRC@	12	EXTRASRC = @EXTRASRC@
		13	EXTCFLAGS = @EXTCFLAGS@
		14
		15	CFLAGS += -fPIC @DEFS@
18		16
19	.SUFFIXES: .c .cpp .o .so	17	.SUFFIXES: .c .cpp .o .so
20		18
21	EXTRAOBJS = $(EXTRASRC:%c=../%o)	19	EXTRAOBJS = $(EXTRASRC:%c=../%o)
22		20
23	.c.o:	21	.c.o:
24	${CC} ${CFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<	22	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${CDEFS} -c $<
25	#	23	#
26	.o.so:	24	.o.so:
27	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)	25	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
28		26
29	.c.so:	27	.c.so:
30	${CC} ${CFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<	28	${CC} ${CFLAGS} ${EXTCFLAGS} ${LIBDB_INCL} ${SOFLAGS} ${CDEFS} -c $<
31	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $(<:.c=.o) $(LIBS)	29	${LD} $(SOFLAGS) $(LDFLAGS) -o $@ $(<:.c=.o) $(LIBS)
32		30
33	.cpp.o:	31	.cpp.o:
34	${CXX} ${CFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a	32	${CXX} ${CFLAGS} ${EXTCFLAGS} ${SOFLAGS} ${CDEFS} $(CXXCOMPFLAGS) $< -o $*.a
35	mv $.a $.o	33	mv $.a $.o
36		34
37	.cpp.so:	35	.cpp.so:
38	${CXX} ${CFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@	36	${CXX} ${CFLAGS} ${EXTCFLAGS} ${CXXSOFLAGS} ${CDEFS} $< @LIBGB_PATH@ @LIBGB_NAME@ $(LIBS) -o $@
39		37
40	all: log_dummy.@MOD_EXT@ \	38	all: log_dummy.@MOD_EXT@ \
41	err.@MOD_EXT@ \	39	err.@MOD_EXT@ \
Lines 97-126 custom_log.@MOD_EXT@: custom_log.c ../modules.h ../oops.h Link Here
97	#berkeley_db_api.@MOD_EXT@: berkeley_db_api.c ../modules.h ../oops.h	95	#berkeley_db_api.@MOD_EXT@: berkeley_db_api.c ../modules.h ../oops.h
98		96
99	berkeley_db_api.o: berkeley_db_api.c ../modules.h ../oops.h	97	berkeley_db_api.o: berkeley_db_api.c ../modules.h ../oops.h
100	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o	98	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
101		99
102	berkeley_db_api.so: berkeley_db_api.c ../modules.h ../oops.h	100	berkeley_db_api.so: berkeley_db_api.c ../modules.h ../oops.h
103	${CC} ${CFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o	101	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} ${LIBDB_INCL} -c berkeley_db_api.c -o berkeley_db_api.o
104	${LD} $(SOFLAGS) $(LDFLAGS) -L $(LIBDB_PATH)/lib berkeley_db_api.o -o berkeley_db_api.so $(LIBS) $(LIBDB_NAME)	102	${LD} $(SOFLAGS) $(LDFLAGS) -L $(LIBDB_PATH)/lib berkeley_db_api.o -o berkeley_db_api.so $(LIBS) $(LIBDB_NAME)
105		103
106	gigabase_db_api.@MOD_EXT@: gigabase_db_api.cpp ../modules.h ../oops.h	104	gigabase_db_api.@MOD_EXT@: gigabase_db_api.cpp ../modules.h ../oops.h
107		105
108	oopsctl: oopsctl.c ../modules.h ../config.h ../oops.h	106	oopsctl: oopsctl.c ../modules.h ../config.h ../oops.h
109	${CC} ${CFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl	107	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} oopsctl.c ${EXTRAOBJS} ${LIBS} -o oopsctl
110		108
111	passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h	109	passwd_pgsql.so: passwd_sql.c ../modules.h ../oops.h
112	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o	110	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
113	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)	111	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_pgsql.so passwd_pgsql.o $(LIBS) $(PGSQL_LIB)
114		112
115	passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h	113	passwd_mysql.so: passwd_sql.c ../modules.h ../oops.h
116	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o	114	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
117	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)	115	${LD} $(SOFLAGS) $(LDFLAGS) -o passwd_mysql.so passwd_mysql.o $(LIBS) $(MYSQL_LIB)
118		116
119	passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h	117	passwd_pgsql.o: passwd_sql.c ../modules.h ../oops.h
120	${CC} ${CFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o	118	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__PGSQL -c passwd_sql.c -o passwd_pgsql.o
121		119
122	passwd_mysql.o: passwd_sql.c ../modules.h ../oops.h	120	passwd_mysql.o: passwd_sql.c ../modules.h ../oops.h
123	${CC} ${CFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o	121	${CC} ${CFLAGS} ${EXTCFLAGS} ${CDEFS} -D__MYSQL -c passwd_sql.c -o passwd_mysql.o
124		122
125		123
126	clean:	124	clean: